DTux/moha
1
0
Fork 0
Code

some adjustments

Browse Source
This commit is contained in:
Daniel Tartavel 2022-08-27 00:02:24 +02:00
parent df94a6becf
commit f42df97c5c
10 changed files with 122 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
apiserver/cmd_functions.php
View File

@ -570,9 +570,20 @@ function apiDisplayByType($argList)
function test() function test()
{ {
global $hooks; global $hooks;
$portes = array();
$msg = "";
logger(DEBUG, _("Testing doors") , __FILE__ . ":" . __LINE__); logger(DEBUG, _("Testing doors") , __FILE__ . ":" . __LINE__);
echo "testing doors"; echo "testing doors";
return $hooks["alerte_intrusion"]->testPortes(); $portes = $hooks["alerte_intrusion"]->testPortes();
if (!empty($portes))
{
foreach($portes as $value)
{
$msg .= $value . _(" is open") . EOL;
}
}
return nl2br($msg);
} }
?> ?>

1
config/properties2log.php
View File

@ -5,7 +5,6 @@
// superior or inferior at value +/- x% // superior or inferior at value +/- x%
$properties2log = array( $properties2log = array(
"availability" => null,
"action" => null, "action" => null,
"state" =>null, "state" =>null,
"contact" => null, "contact" => null,

2
hooks/scripts/availability.php
View File

@ -18,7 +18,7 @@ class availability extends hook
global $indexDevices; global $indexDevices;
foreach ($indexDevices as $ieeeAddress => $value) foreach ($indexDevices as $ieeeAddress => $value)
{ {
$deviceList[] = array( $ieeeAdress => "availability"); $deviceList[] = array( $ieeeAddress => "availability");
} }
$this->installHooksFunction($indexDevices); $this->installHooksFunction($indexDevices);
} }

22
hooks/scripts/rdc_portes_ouvertes.php
View File

@ -28,30 +28,38 @@ class alerte_intrusion extends hook
case "contact": case "contact":
if ($value == false) if ($value == false)
{ {
logger(ALERT, sprintf(_("%s est ouverte alors que personne n'est présent"), $device->friendlyName), __FILE__ . ":" . __LINE__); logger(ALERT, sprintf(_("%s vient de s'ouvrir alors que personne n'est présent"), $device->friendlyName), __FILE__ . ":" . __LINE__);
}else
{
logger(ALERT, sprintf(_("%s vient de se fermer alors que personne n'est présent"), $device->friendlyName), __FILE__ . ":" . __LINE__);
} }
break; break;
} }
} }
public function testPortes() public function testPortes($send=true) :array
{ {
global $indexDevices; global $indexDevices;
$portes = array();
logger(DEBUG, _("Function alerte_intrusion->testPorte"), __FILE__ . ":" . __LINE__); logger(DEBUG, _("Function alerte_intrusion->testPorte"), __FILE__ . ":" . __LINE__);
$msg = ""; $msg = "";
foreach ($this->devicelist as $device => $property) foreach ($this->devicelist as $device => $property)
{ {
if($indexDevices[$device]->properties[$property] != false) if($indexDevices[$device]->properties[$property] == false)
{ {
$msg .= $indexDevices[$device]->friendlyName . " is open" . EOL; $portes[] = $indexDevices[$device]->friendlyName;
$msg .= $indexDevices[$device]->friendlyName . "\n";
} }
} }
if (!empty($msg)) if ($send)
{ {
logger(ALERT, $msg, __FILE__ . ":" . __LINE__); logger(ALERT, _("doors opened :") . $msg, null ,$device);
} }
return nl2br($msg); return $portes;
} }
} }

59
hooks/scripts/rdc_salon_eclairage.php
View File

@ -9,7 +9,8 @@ class rdc_salon_eclairage extends hook
RDC_SALON_MVMT => "occupancy", RDC_SALON_MVMT => "occupancy",
RDC_SALON_MVMT2 => "occupancy", RDC_SALON_MVMT2 => "occupancy",
RDC_ENTREE_PORTE => "contact", RDC_ENTREE_PORTE => "contact",
RDC_SALON_LUMINOSITE => "illuminance_lux" RDC_SALON_LUMINOSITE => "illuminance_lux",
RDC_SALON_ECLAIRAGE_PANNEAU => "state"
); );
protected $actionneurs = array( protected $actionneurs = array(
array(RDC_SALON_MVMT, "occupancy", 1), array(RDC_SALON_MVMT, "occupancy", 1),
@ -34,15 +35,17 @@ class rdc_salon_eclairage extends hook
$lux = $indexDevices[RDC_SALON_LUMINOSITE]; $lux = $indexDevices[RDC_SALON_LUMINOSITE];
$mvmt = $indexDevices[RDC_SALON_MVMT]; $mvmt = $indexDevices[RDC_SALON_MVMT];
$mvmt2 = $indexDevices[RDC_SALON_MVMT2]; $mvmt2 = $indexDevices[RDC_SALON_MVMT2];
$method;
$illuminance = getValue(RDC_SALON_LUMINOSITE, "illuminance_lux"); $illuminance = getValue(RDC_SALON_LUMINOSITE, "illuminance_lux");
logger (INFO, _("property => ") . $param . _("value =>") . bool2string($value), __FILE__ . ":" . __LINE__); logger (INFO, _("property => ") . $param . _("value =>") . bool2string($value), __FILE__ . ":" . __LINE__);
switch($param) switch($param)
{ {
case "occupancy": case "occupancy":
$method = $deviceTarget->properties["state"]["method"];
logger(INFO, _("CASE: Occupancy => ") . bool2string($value), __FILE__ . ":" . __LINE__); logger(INFO, _("CASE: Occupancy => ") . bool2string($value), __FILE__ . ":" . __LINE__);
//print_r(getValue(RDC_SALON_LUMINOSITE, "illuminance_lux")); //print_r(getValue(RDC_SALON_LUMINOSITE, "illuminance_lux"));
if ($value == ON) if ($value == ON and $method == IDLE)
{ {
logger(INFO, _("illuminance value : ") . $illuminance, __FILE__ . ":" . __LINE__); logger(INFO, _("illuminance value : ") . $illuminance, __FILE__ . ":" . __LINE__);
if ($illuminance <= $this->luminance_min) if ($illuminance <= $this->luminance_min)
@ -54,22 +57,24 @@ class rdc_salon_eclairage extends hook
}else }else
{ {
logger(INFO, _("Value is OFF"), __FILE__ . ":" . __LINE__); logger(INFO, _("Value is OFF"), __FILE__ . ":" . __LINE__);
if (getValue(RDC_SALON_MVMT, "occupancy") == OFF and (getValue(RDC_SALON_MVMT2, "occupancy") == OFF)) if ((getValue(RDC_SALON_MVMT, "occupancy") == OFF) and (getValue(RDC_SALON_MVMT2, "occupancy") == OFF) and $method == AUTO)
{ {
logger(INFO, _("Setting to OFF"), __FILE__ . ":" . __LINE__); logger(INFO, _("Setting to OFF"), __FILE__ . ":" . __LINE__);
setDelay($deviceTarget, $this->delay, $this->timeUnit, "state", "OFF", true); $this->send($deviceTarget, "OFF", false, IDLE);
//$this->send($deviceTarget, "OFF", false, IDLE); removeEvent($deviceTarget, "state", "OFF");
} }
} }
break; break;
case "contact": case "contact":
$method = $deviceTarget->properties["state"]["method"];
logger(INFO, _("CASE: Contact Door"), __FILE__ . ":" . __LINE__); logger(INFO, _("CASE: Contact Door"), __FILE__ . ":" . __LINE__);
if ($value == false and $illuminance <= $this->luminance_min) if ($value == false and $illuminance <= $this->luminance_min and $method == IDLE)
{ {
logger(INFO, _("Door is open and illumance < min and method =>") . $deviceTarget->properties["state"]["method"], __FILE__ . ":" . __LINE__); logger(INFO, _("Door is open and illumance < min and method =>") . $deviceTarget->properties["state"]["method"], __FILE__ . ":" . __LINE__);
if ($deviceTarget->properties["state"]["method"] == IDLE) if ($method == IDLE)
{ {
$this->send($deviceTarget, "ON", "OFF", AUTO); $this->send($deviceTarget, "ON", false, AUTO);
removeEvent($deviceTarget, "state", "OFF");
} }
} }
break; break;
@ -78,17 +83,21 @@ class rdc_salon_eclairage extends hook
if ($value >= $this->luminance_max and $deviceTarget->properties["state"]["value"] == "ON") if ($value >= $this->luminance_max and $deviceTarget->properties["state"]["value"] == "ON")
{ {
logger(INFO, _("illuminace is > to max"), __FILE__ . ":" . __LINE__); logger(INFO, _("illuminace is > to max"), __FILE__ . ":" . __LINE__);
//$this->send($deviceTarget, "OFF", null, AUTO); $this->send($deviceTarget, "OFF", false, IDLE);
//removeEvent($indexDevices[RDC_SALON_ECLAIRAGE_PANNEAU], "state", "OFF"); removeEvent($deviceTarget, "state", "OFF");
if (searchEvent($deviceTarget, "state", "OFF") === false) }
{ break;
setDelay($deviceTarget, $this->delay, $this->timeUnit, "state", "OFF", true, IDLE); case "state":
} logger(INFO, _("CASE : State"), __FILE__ . ":" . __LINE__);
}/*elseif ($value <= $this->luminance_min and (getValue(RDC_SALON_MVMT, "occupancy") == ON || getValue(RDC_SALON_MVMT2,"occupancy") == ON)) $method = $deviceTarget->properties["state"]["method"];
if($value == "ON" and $method == IDLE)
{ {
logger(INFO, _("illuminance < min and movement detected"), __FILE__ . ":" . __LINE__); $deviceTarget->properties["state"]["method"] = MANUAL;
$this->send($deviceTarget, "ON", false, AUTO); removeEvent($deviceTarget, "state", "OFF");
}*/ }else
{
$deviceTarget->properties["state"]["method"] = IDLE;
}
break; break;
} }
logger (INFO, sprintf(_("%s: notification received from MQTT from %s => parameter: %s value: %s"), $this->hookName, $device->friendlyName, $param, bool2string($value)), __FILE__ . ":" . __LINE__); logger (INFO, sprintf(_("%s: notification received from MQTT from %s => parameter: %s value: %s"), $this->hookName, $device->friendlyName, $param, bool2string($value)), __FILE__ . ":" . __LINE__);
@ -99,17 +108,9 @@ class rdc_salon_eclairage extends hook
global $indexDevices; global $indexDevices;
$msg = array("state" => $state); $msg = array("state" => $state);
//if ($deviceTarget->properties["state"]["value"] != $state) logger(INFO, sprintf(_("publishing message: %s to %s"), json_encode($msg), $deviceTarget->friendlyName), __FILE__ . ":" . __LINE__);
//{ $deviceTarget->payload = $msg;
logger(INFO, sprintf(_("publishing message: %s to %s"), json_encode($msg), $deviceTarget->friendlyName), __FILE__ . ":" . __LINE__); $deviceTarget->set("state", $method);
$deviceTarget->payload = $msg;
$deviceTarget->set("state", $method);
//$deviceTarget->properties["state"]["method"] = $method;
/*}else
{
logger(INFO, sprintf(_("not publishing message: %s to %s, already set"), json_encode($msg), $deviceTarget->friendlyName), __FILE__ . ":" . __LINE__);
}*/
//echo 'delaystate = ' . var_dump($delayState);
if ($delayState !== false) setDelay($deviceTarget, $this->delay, $this->timeUnit, "state", $delayState, true); if ($delayState !== false) setDelay($deviceTarget, $this->delay, $this->timeUnit, "state", $delayState, true);
} }
} }

19
hooks/scripts/rdc_sdb_eclairage.php
View File

@ -45,37 +45,40 @@ class rdc_sdb_eclairage extends hook
switch($property) switch($property)
{ {
case "occupancy": case "occupancy":
$method = $deviceTarget->properties["state_l1"]["method"];
logger(DEBUG, _("CASE: occupancy"), __FILE__ . ":" . __LINE__); logger(DEBUG, _("CASE: occupancy"), __FILE__ . ":" . __LINE__);
if ($value == ON) if ($value == ON)
{ {
if($deviceTarget->properties["state_l1"]["method"] == IDLE) if($method == IDLE)
{ {
logger(DEBUG, _("lighting with method auto"), __FILE__ . ":" . __LINE__); logger(DEBUG, _("lighting with method auto"), __FILE__ . ":" . __LINE__);
//$deviceTarget->properties["state_l1"]["method"] = AUTO; //$deviceTarget->properties["state_l1"]["method"] = AUTO;
$this->send("ON", AUTO); $this->send("ON", AUTO);
removeEvent($deviceTarget, "state", "OFF");
} }
}elseif (testActionneurs($this->actionneurs)) }elseif (!testActionneurs($this->actionneurs))
{ {
logger(DEBUG, _("Actionneurs are all false"), __FILE__ . ":" . __LINE__); logger(DEBUG, _("Actionneurs are all false"), __FILE__ . ":" . __LINE__);
//setDelay($deviceTarget, $this->delay, $this->timeUnit, "state_l1", "OFF", true, IDLE);
$this->send("OFF", IDLE); $this->send("OFF", IDLE);
} }
break; break;
case "state_l1": case "state_l1":
$method = $deviceTarget->properties["state_l1"]["method"];
logger(DEBUG, _("CASE: state_l1"), __FILE__ . ":" . __LINE__); logger(DEBUG, _("CASE: state_l1"), __FILE__ . ":" . __LINE__);
if ($value == "ON") if ($value == "ON")
{ {
if ($deviceTarget->properties["state_l1"]["method"] == IDLE) if ($method == IDLE)
{ {
logger(DEBUG, _("State_l1 is IDLE"), __FILE__ . ":" . __LINE__); logger(DEBUG, _("State_l1 is IDLE"), __FILE__ . ":" . __LINE__);
$deviceTarget->properties["state_l1"]["method"] = MANUAL; removeEvent($deviceTarget, "state_l1", "OFF", MANUAL);
setDelay($deviceTarget, $this->delayManual, $this->timeUnit, "state_l1", "OFF", true, IDLE); //setDelay($deviceTarget, $this->delayManual, $this->timeUnit, "state_l1", "OFF", true, IDLE);
} }
}elseif ($value == "OFF") }elseif ($value == "OFF")
{ {
removeEvent($deviceTarget, "state_l1", "OFF", IDLE); removeEvent($deviceTarget, "state_l1", "OFF", IDLE);
$deviceTarget->properties["state_l1"]["method"] = IDLE; //$deviceTarget->properties["state_l1"]["method"] = IDLE;
logger(DEBUG, _("State_l1 is false light is off and method is ") . $deviceTarget->properties["state_l1"]["method"], __FILE__ . ":" . __LINE__); logger(DEBUG, _("State_l1 is false light is off and method is ") . $method, __FILE__ . ":" . __LINE__);
} }
break; break;
} }

4
hooks/scripts/rdc_store.php
View File

@ -156,9 +156,9 @@ class rdc_store extends hook
{ {
$store2level = $this->storeLevel + 15; $store2level = $this->storeLevel + 15;
} }
}elseif ($exterieurLuxMoyen < 6000 and $salon_lux < 200 and $soleil < 100) }elseif ($exterieurLuxMoyen < 5000 and $salon_lux < 200 and $soleil < 100)
{ {
logger(DEBUG, "exterieurLuxMoyen < 6000 and salon_lux < 200 and soleil < 100", __FILE__ . ":" . __LINE__); logger(DEBUG, "exterieurLuxMoyen < 5000 and salon_lux < 200 and soleil < 100", __FILE__ . ":" . __LINE__);
$this->close("Luminosité faible"); $this->close("Luminosité faible");
} }

6
hooks/scripts/rdc_store.php~
View File

@ -23,7 +23,7 @@ class rdc_store extends hook
function installHooks(&$indexDevices) function installHooks(&$indexDevices)
{ {
$this->installHooksFunction($indexDevices); return $this->installHooksFunction($indexDevices);
} }
// callback fonction. Is called with these 3 parameters // callback fonction. Is called with these 3 parameters
@ -156,9 +156,9 @@ class rdc_store extends hook
{ {
$store2level = $this->storeLevel + 15; $store2level = $this->storeLevel + 15;
} }
}elseif ($exterieurLuxMoyen < 6000 and $salon_lux < 200 and $soleil < 100) }elseif ($exterieurLuxMoyen < 5000 and $salon_lux < 100 and $soleil < 100)
{ {
logger(DEBUG, "exterieurLuxMoyen < 6000 and salon_lux < 200 and soleil < 100", __FILE__ . ":" . __LINE__); logger(DEBUG, "exterieurLuxMoyen < 5000 and salon_lux < 100 and soleil < 100", __FILE__ . ":" . __LINE__);
$this->close("Luminosité faible"); $this->close("Luminosité faible");
} }

57
hooks/scripts/rdc_temperature_int_ext.php
View File

@ -4,7 +4,9 @@ class rdc_temperature_int_ext extends hook
{ {
public $hookName = "rdc_wc_eclairage"; public $hookName = "rdc_wc_eclairage";
public $active = true; //enable/disable hook (true => enabled) public $active = true; //enable/disable hook (true => enabled)
public $wantedTemp = 24; public $tempSup = 25;
public $tempInf = 20;
protected $devicelist = array( protected $devicelist = array(
METEO=> "tempc", METEO=> "tempc",
@ -18,21 +20,52 @@ class rdc_temperature_int_ext extends hook
// callback fonction. Is called with these 4 parameters // callback fonction. Is called with these 4 parameters
public function callBack(&$device, $property, $value) public function callBack(&$device, $property, $value)
{ {
global $indexDevices; global $indexDevices, $hooks;
static $status = -1; static $time;
$portes = array();
$state = -1;
$msg = "";
$indoorTemp = $device->properties["indoortempc"]["value"]; $indoorTemp = $device->properties["indoortempc"]["value"];
if ( (($value > $this->wantedTemp and $indoorTemp < $this->wantedTemp) or ( $value < $this->wantedTemp and $indoorTemp >= $this->wantedTemp)) and $status === 1) $portes = $hooks["alerte_intrusion"]->testPortes(false);
foreach($portes as $value)
{ {
$status = 0; $msg .= $value . "\n";
logger(ALERT, _("Open doors to climate"), null ,$device); }
}elseif ( (($value > $this->wantedTemp and $indoorTemp >= $this->wantedTemp) or ( $value < $this->wantedTemp and $indoorTemp <= $this->wantedTemp)) and $status === 0 )
{ if ( $value > $indoorTemp)
$status = 1; {
logger(ALERT, _("Close doors to climate"), null, $device); if( ($indoorTemp <= $this->tempSup) and empty($portes))
{
$status = 1;
//logger(ALERT, _("Open doors to climate"), null ,$device);
}elseif($indoorTemp >= $this -> tempSup and ! empty($portes))
{
$status = 0;
//logger(ALERT, _("Close doors to climate"), null, $device);
}
}elseif ( $value < $indoorTemp )
{
if (($indoorTemp >= $this->tempSup) and empty($portes) )
{
$status = 1;
//logger(ALERT, _("Open doors to climate"), null ,$device);
}elseif ($indoorTemp <= $this->tempSup)
{
$status = 0;
//logger(ALERT, _("Close doors to climate"), null, $device);
}
logger (INFO, sprintf(_("%s: notification received from MQTT from %s => parameter: %s value: %s"), $this->hookName, $device->friendlyName, $property, bool2string($value)), __FILE__ . ":" . __LINE__, $device);
}
if ($status == 1)
{
//if ($time - DateTime();
//logger(ALERT, _("Open doors to climate"), null ,$device);
}else
{
//logger(ALERT, _("Close doors to climate\n") . $msg, null, $device);
} }
logger (INFO, sprintf(_("%s: notification received from MQTT from %s => parameter: %s value: %s"), $this->hookName, $device->friendlyName, $property, bool2string($value)), __FILE__ . ":" . __LINE__, $device);
} }
} }
$hooks["rdc_temperature_int_ext"] = new rdc_temperature_int_ext(); $hooks["rdc_temperature_int_ext"] = new rdc_temperature_int_ext();
?> ?>

6
utils.php
View File

@ -27,7 +27,7 @@ function checkTopicsAvailability()
logger(DEBUG, "time is " . time() . " lastSeen is " . $topic->lastSeen, __FILE__ . ":" . __LINE__ ); logger(DEBUG, "time is " . time() . " lastSeen is " . $topic->lastSeen, __FILE__ . ":" . __LINE__ );
if ((time() - $topic->lastSeen > $topic->timeOut*60) and ($topic->notificationSent == false)) if ((time() - $topic->lastSeen > $topic->timeOut*60) and ($topic->notificationSent == false))
{ {
if (logger(ALERT, $topicName . _(" is not available"), __FILE__ . ":" . __LINE__) == false); if (logger(ALERT, $topicName . _(" is not available"), __FILE__ . ":" . __LINE__) == false);
{ {
$topic->notificationSent = true; $topic->notificationSent = true;
@ -37,7 +37,7 @@ function checkTopicsAvailability()
} }
} }
function testActionneurs(array $actionneurs) function testActionneurs(array $actionneurs) //return 0 for no actionneurs and 1 if one actionneur is on
{ {
global $indexDevices; global $indexDevices;
$r = 0; $r = 0;
@ -59,7 +59,7 @@ function testActionneurs(array $actionneurs)
logger(ERROR, _("no device : ") . $device[0] . bool2string($r), __FILE__ . ":" . __LINE__ ); logger(ERROR, _("no device : ") . $device[0] . bool2string($r), __FILE__ . ":" . __LINE__ );
} }
} }
return !$r; return $r;
} }
function htmlGetFriendlyNames($ieeeAddress = '') function htmlGetFriendlyNames($ieeeAddress = '')