DTux/moha
1
0
Fork 0
Code Activity

- changed webserver to apiserver

Browse Source 
- added webserver
- a lot of debugging
- install shell script
This commit is contained in:
daniel Tartavel
2022-04-07 01:44:17 +02:00
parent 0d35b1ff3f
commit f8fc3f63ec
28 changed files with 463 additions and 223 deletions
Download Patch File Download Diff File Expand all files Collapse all files

37
events.php
View File

@@ -46,6 +46,7 @@ function checkEvents()
{
logger(DEBUG, sprintf(_("sending command set %s => %s for %s"), $event->param ,bool2string($event->value), $event->device->friendlyName), __FILE__ . ":" . __LINE__);
publish(mktopic($event->device), array($event->param => $event->value), "set");
if ($event->method !== null) $event->device->properties[$event->param]["method"] = $event->method;
if (($event->dateTimeEvent->add($event->recurrenceInterval)) === false)
{
logger(ERROR, _("Error in adding interval to event recurrence. event: ") . $key, __FILE__ . ":" . __LINE__);
@@ -56,8 +57,12 @@ function checkEvents()
}elseif (!empty($event->dateTimeEvent) and $event->dateTimeEvent < now())
{
logger(DEBUG, sprintf(_("Sending command set %s => %s to %s"),$event->param, bool2string($event->value), $event->device->friendlyName), __FILE__ . ":" . __LINE__);
$mid = publish(mktopic($event->device), array($event->param => $event->value), "set"); //, $key);
$mid = publish(mktopic($event->device), array($event->param => $event->value), "set"); //, $key);null
$event->published = $now;
if ($event->method !== null)
{
$event->device->properties[$event->param]["method"] = $event->method;
}
//echo "#################################\nUnsetting event $key \n###########################" . EOL;
unset($events[$key]);
}
@@ -66,7 +71,7 @@ function checkEvents()
$logLevel = $oldLevel;
}
function setOneshotEvent(&$deviceObject, $datetime, $property, $value, $replace=false)
function setOneshotEvent(&$deviceObject, $datetime, $property, $value, $replace=false, $method=null)
{
global $events;
$events[] = new event;
@@ -77,9 +82,10 @@ function setOneshotEvent(&$deviceObject, $datetime, $property, $value, $replace=
$events[$key]->param = $property;
$events[$key]->value = $value;
$events[$key]->device = & $deviceObject;
if ($method !==null) $events[$key]->method =$method;
}
function setRecurrentEvent(&$deviceObject, $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, $method = null)
{
global $events;
$string = "P";
@@ -108,9 +114,10 @@ function setRecurrentEvent(&$deviceObject, $property, $value, $startDatetime, $s
logger(ERROR, _("Error in event recurrence. event: ") . $key, __FILE__ . ":" . __LINE__);
}
if ($method !== null) $event->method = $method;
}
function setDelay(&$deviceObject, $delay, $unit, $property, $value, $replace=false)
function setDelay(&$deviceObject, $delay, $unit, $property, $value, $replace=false, $method = null)
{
global $events, $logLevel;
$oldLevel = $logLevel;
@@ -153,7 +160,7 @@ function setDelay(&$deviceObject, $delay, $unit, $property, $value, $replace=fal
if ($replace)
{
$eventKey = searchEvent($deviceObject, $property, $value);
if ($eventKey !== false) deleteEvent($eventKey);
if ($eventKey !== false) deleteEvent($events[$eventKey]);
}
//$dt = $datetime->format("Y-m-d\TH:i:s\Z");
$events[] = new event;
@@ -164,16 +171,19 @@ function setDelay(&$deviceObject, $delay, $unit, $property, $value, $replace=fal
$events[$key]->param = $property;
$events[$key]->value = $value;
$events[$key]->device = & $deviceObject;
if ($method !== null) $events[$key]->method = $method;
logger (DEBUG, _('Setting new delay in $events[]'), __FILE__ . ":" . __LINE__);
//print_r($events[$key]);
$logLevel = $oldLevel;
}
function removeEvent($deviceObject, $property , $value)
function removeEvent($deviceObject, $property , $value, $method = null)
{
global $events;
$eventKey = searchEvent($deviceObject, $property , $value);
if ($eventKey !== false)
{
if ($method !== null) $events[$eventKey]->device->method = $method;
deleteEvent($eventKey);
}
}
@@ -188,24 +198,27 @@ function searchEvent($deviceObject, $property , $value)
//echo "===>";print_r($event); echo EOL;
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;
}
}
return false;
}
// warning delete event does not manage method of the device (IDLE, )
function deleteEvent($eventKey)
{
global $events;
if ($eventKey !== false)
{
unset ($events[$eventKey]);
logger(INFO, _("delete event key =") . $eventKey, __FILE__ . ":" . __LINE__);
}else
{
//try to delete an flase event
logger(WARNING, _("Try to delete event with key = ") . var_export($eventKey, true), __FILE__ . ":" . __LINE__);
if (array_key_exists($eventKey, $events))
{
unset ($events[$eventKey]);
}else
{
logger(ERROR, _("event key does not exists: ") . $eventKey, __FILE__ . ":" . __LINE__);
}
}
}