Hannes/SeMonitoring
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Enhance MQTT publishing logic in SendTopic and ForceSendTopic methods to improve handling of child variables and update conditions; update library version to 2.9.

Browse Source
This commit is contained in:
jhartworks
2026-03-04 10:05:34 +01:00
parent 4264452e60
commit fd9d075786
2 changed files with 54 additions and 35 deletions
Download Patch File Download Diff File Expand all files Collapse all files
Monitoring Client/module.php
+35 -16
View File
@@ -121,6 +121,7 @@ class MonitoringClient extends IPSModule {
} // MQTT_Publish } // MQTT_Publish
public function SendTopic() { public function SendTopic() {
$mqttId = $this->ReadPropertyInteger("MqttCLientID"); $mqttId = $this->ReadPropertyInteger("MqttCLientID");
$projectyear = $this->ReadPropertyInteger("Projectyear"); $projectyear = $this->ReadPropertyInteger("Projectyear");
$projectnumber = $this->ReadPropertyInteger("Projectnumber"); $projectnumber = $this->ReadPropertyInteger("Projectnumber");
@@ -147,9 +148,11 @@ class MonitoringClient extends IPSModule {
$parname = IPS_GetName($catChild); $parname = IPS_GetName($catChild);
$parname = str_replace("/","_", $parname); if (IPS_VariableExists($catChild) != 1 && IPS_LinkExists($catChild) != 1){
foreach ($childids as $childid){
IPS_SetName($catChild, $parname);
foreach ($childids as $childid){ foreach ($childids as $childid){
if (IPS_VariableExists($childid) != 1){ if (IPS_VariableExists($childid) != 1){
@@ -158,36 +161,52 @@ class MonitoringClient extends IPSModule {
$linkInfo = IPS_GetLink($childid); $linkInfo = IPS_GetLink($childid);
$linkTarget = $linkInfo["TargetID"]; $linkTarget = $linkInfo["TargetID"];
$childid = $linkTarget; $childid = $linkTarget;
$varInfo = IPS_GetVariable($childid);
} }
} }
$varInfo = IPS_GetVariable($childid); $varInfo = IPS_GetVariable($childid);
$changedtime = $varInfo["VariableChanged"];
$varname = IPS_GetName($childid); $varname = IPS_GetName($childid);
$varname = str_replace("/","_", $varname);
IPS_SetName($childid, $varname);
$topic = $catId["top"]. $parname."_".$varname; $topic = $catId["top"]. $parname."_".$varname;
$time = time();
$payload = round(getvalue($childid), 2); $payload = round(getvalue($childid), 2);
if($changedtime > $time - $updatetime){ if($changedtime > $time - $updatetime){
SEMC_MqttPublish($this->InstanceID,$mqttId, $topic, $payload, false); $this->MqttPublish($mqttId, $topic, $payload, false);
} }
// IPS_LogMessage("Monitoring Client", "Force Update with Parent: " . $topic . " mit Payload: " . $payload);
} }
} }
}else{
$childid = $catChild;
if (IPS_VariableExists($childid) != 1){
if(IPS_LinkExists($childid) == 1){
$linkInfo = IPS_GetLink($childid);
$linkTarget = $linkInfo["TargetID"];
$childid = $linkTarget;
$varInfo = IPS_GetVariable($childid);
} }
} }
$varInfo = IPS_GetVariable($childid);
$varname = IPS_GetName($childid);
$topic = $catId["top"].$varname;
$payload = round(getvalue($childid), 2);
if($changedtime > $time - $updatetime){
$this->MqttPublish($mqttId, $topic, $payload, false);
}
// IPS_LogMessage("Monitoring Client", "Force Update none Parent: " . $topic . " mit Payload: " . $payload);
}
}
}
$topic = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Name";
$this->MqttPublish($mqttId, $topic, $projectname, false);
}
public function ForceSendTopic() { public function ForceSendTopic() {
$mqttId = $this->ReadPropertyInteger("MqttCLientID"); $mqttId = $this->ReadPropertyInteger("MqttCLientID");
@@ -239,7 +258,7 @@ class MonitoringClient extends IPSModule {
$payload = round(getvalue($childid), 2); $payload = round(getvalue($childid), 2);
$this->MqttPublish($mqttId, $topic, $payload, false); $this->MqttPublish($mqttId, $topic, $payload, false);
IPS_LogMessage("Monitoring Client", "Force Update with Parent: " . $topic . " mit Payload: " . $payload); // IPS_LogMessage("Monitoring Client", "Force Update with Parent: " . $topic . " mit Payload: " . $payload);
} }
@@ -262,7 +281,7 @@ class MonitoringClient extends IPSModule {
$payload = round(getvalue($childid), 2); $payload = round(getvalue($childid), 2);
$this->MqttPublish($mqttId, $topic, $payload, false); $this->MqttPublish($mqttId, $topic, $payload, false);
IPS_LogMessage("Monitoring Client", "Force Update none Parent: " . $topic . " mit Payload: " . $payload); // IPS_LogMessage("Monitoring Client", "Force Update none Parent: " . $topic . " mit Payload: " . $payload);
} }
} }
library.json
+2 -2
View File
@@ -7,7 +7,7 @@
"version": "6.0", "version": "6.0",
"date": 1491343200 "date": 1491343200
}, },
"version": "2.8", "version": "2.9",
"build": 2, "build": 1,
"date": 0 "date": 0
} }