DTux/moha
1
0
Fork 0
Code Activity

debugage

Browse Source
This commit is contained in:
daniel Tartavel
2022-02-23 10:23:16 +01:00
parent 7d1dd25f2a
commit 34dca81ba5
21 changed files with 738 additions and 533 deletions
Download Patch File Download Diff File Expand all files Collapse all files

38
events.php
View File

@@ -56,20 +56,20 @@ function checkEvents()
$logLevel = $oldLevel;
}
function setOneshotEvent(&$device, $datetime, $property, $value, $replace=false)
function setOneshotEvent(&$deviceObject, $datetime, $property, $value, $replace=false)
{
global $events;
$events[] = new event;
$key = key($events);
$events[$key]->dateTimeEvent = new dateTime($datetime);
$events[$key]->ieeeAddress = $device->ieeeAddress;
$events[$key]->topic = $device->topic;
$events[$key]->ieeeAddress = $deviceObject->ieeeAddress;
$events[$key]->topic = $deviceObject->topic;
$events[$key]->param = $property;
$events[$key]->value = $value;
$events[$key]->device = & $device;
$events[$key]->device = & $deviceObject;
}
function setRecurrentEvent(&$device, $property, $value, $startDatetime, $stopDatetime, $hours, $minutes, $seconds, $days, $weeks, $months, $years)
function setRecurrentEvent(&$deviceObject, $property, $value, $startDatetime, $stopDatetime, $hours, $minutes, $seconds, $days, $weeks, $months, $years)
{
global $events;
$string = "P";
@@ -87,9 +87,9 @@ function setRecurrentEvent(&$device, $property, $value, $startDatetime, $stopDat
$event->recurrenceInterval = new DateInterval($string);
$event->startDatetime = new datetime($startDatetime);
$event->stopDatetime = new datetime($stopDatetime);
$event->ieee_address = $device->ieeeAddress;
$event->topic = $device->topic;
$event->device = & $device;
$event->ieee_address = $deviceObject->ieeeAddress;
$event->topic = $deviceObject->topic;
$event->device = & $deviceObject;
$event->param = $property;
$event->value = $value;
$event->dateTimeEvent = $event->startDatetime;
@@ -100,7 +100,7 @@ function setRecurrentEvent(&$device, $property, $value, $startDatetime, $stopDat
}
}
function setDelay(&$device, $delay, $unit="second", $property, $value, $replace=false)
function setDelay(&$deviceObject, $delay, $unit, $property, $value, $replace=false)
{
global $events, $logLevel;
$oldLevel = $logLevel;
@@ -142,40 +142,40 @@ function setDelay(&$device, $delay, $unit="second", $property, $value, $replace=
//print_r($datetime);
if ($replace)
{
$eventKey = searchEvent($device, $property, $value);
$eventKey = searchEvent($deviceObject, $property, $value);
if ($eventKey !== false) deleteEvent($eventKey);
}
//$dt = $datetime->format("Y-m-d\TH:i:s\Z");
$events[] = new event;
$key = array_key_last($events);
$events[$key]->dateTimeEvent = $datetime;
$events[$key]->ieeeAddress = $device->ieeeAddress;
$events[$key]->topic = $device->topic;
$events[$key]->ieeeAddress = $deviceObject->ieeeAddress;
$events[$key]->topic = $deviceObject->topic;
$events[$key]->param = $property;
$events[$key]->value = $value;
$events[$key]->device = & $device;
$events[$key]->device = & $deviceObject;
logger (DEBUG, _('Setting new delay in $events[]'), __FILE__ . ":" . __LINE__);
print_r($events[$key]);
//print_r($events[$key]);
$loglevel = $oldLevel;
}
function removeEvent($device, $property , $value)
function removeEvent($deviceObject, $property , $value)
{
if (($eventKey = searchEvent($device, $property , $value)) === true)
if (($eventKey = searchEvent($deviceObject, $property , $value)) === true)
{
deleteEvent($eventKey);
}
}
function searchEvent($device, $property , $value)
function searchEvent($deviceObject, $property , $value)
{
global $events;
logger(DEBUG, sprintf(_("searching event for device %s, property %s and value %s"), $device->friendlyName, $property, bool2string($value)), __FILE__ . ":" . __LINE__);
logger(DEBUG, sprintf(_("searching event for device %s, property %s and value %s"), $deviceObject->friendlyName, $property, bool2string($value)), __FILE__ . ":" . __LINE__);
foreach($events as $key => $event)
{
//echo "Event : $event => $value" . EOL;
//echo "===>";print_r($event); echo EOL;
if($event->topic == $device->topic and $event->param == $property and $event->value == $value and $event->ieeeAddress == $device->ieeeAddress)
if($event->topic == $deviceObject->topic and $event->param == $property and $event->value == $value and $event->ieeeAddress == $deviceObject->ieeeAddress)
{
//echo "==============================\nfound " . $key . "\n=================================" . EOL;
return $key;