diff --git a/Monitoring Client/form.json b/Monitoring Client/form.json index 5acbdf8..eab3d98 100644 --- a/Monitoring Client/form.json +++ b/Monitoring Client/form.json @@ -7,7 +7,7 @@ { "type": "SelectObject", "name": "MqttCLientID", "caption": "MQTT-Client" }, { "type": "NumberSpinner", "name": "Projectyear", "caption": "Projectyear" }, - { "type": "ValidationTextBox", "name": "Projectnumber", "caption": "Projectnumber" }, + { "type": "NumberSpinner", "name": "Projectnumber", "caption": "Projectnumber" }, { "type": "ValidationTextBox", "name": "Projectname", "caption": "Projectname" }, { "type": "NumberSpinner", "name": "ISP", "caption": "ISP-Number" }, { "type": "NumberSpinner", "name": "Updatetime", "caption": "Updatetime","suffix": "seconds","minimum ": "10" } diff --git a/Monitoring Client/module.php b/Monitoring Client/module.php index 80e8cd9..32dfa90 100644 --- a/Monitoring Client/module.php +++ b/Monitoring Client/module.php @@ -11,7 +11,7 @@ class MonitoringClient extends IPSModule { $this->RegisterPropertyInteger("ParseAnalogCategoryID","0"); $this->RegisterPropertyInteger("MqttCLientID","0"); - $this->RegisterPropertyString("Projectnumber",""); + $this->RegisterPropertyInteger("Projectnumber","230001"); $this->RegisterPropertyString("Projectname",""); $this->RegisterPropertyInteger("ISP","1"); $this->RegisterPropertyInteger("Projectyear","2023"); @@ -91,7 +91,7 @@ class MonitoringClient extends IPSModule { } // name object to help with debugging - IPS_SetName($id, "Temporary MQTT Server Device for topic " . $topic); + IPS_SetName($id, "Temporary MQTT Device for: " . $topic); // configure temporary device $config_arr = array( @@ -101,6 +101,7 @@ class MonitoringClient extends IPSModule { ); $config_str = json_encode($config_arr); IPS_SetConfiguration($id, $config_str); + IPS_SetHidden($id,true); IPS_ApplyChanges($id); // get Value variable and use it to publish the payload @@ -118,17 +119,17 @@ class MonitoringClient extends IPSModule { public function SendTopic() { $mqttId = $this->ReadPropertyInteger("MqttCLientID"); $projectyear = $this->ReadPropertyInteger("Projectyear"); - $projectnumber = $this->ReadPropertyString("Projectnumber"); + $projectnumber = $this->ReadPropertyInteger("Projectnumber"); $projectname = $this->ReadPropertyString("Projectname"); $ispnumber = $this->ReadPropertyInteger("ISP"); $updatetime = $this->ReadPropertyInteger("Updatetime"); $catIds[0]["id"] = $this->ReadPropertyInteger("ParseNotifyCategoryID"); - $catIds[0]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Notify/"; + $catIds[0]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Notify/"; $catIds[1]["id"] = $this->ReadPropertyInteger("ParseAlarmCategoryID"); - $catIds[1]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Alarm/"; + $catIds[1]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Alarm/"; $catIds[2]["id"] = $this->ReadPropertyInteger("ParseAnalogCategoryID"); - $catIds[2]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Analog/"; + $catIds[2]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Analog/"; @@ -166,17 +167,17 @@ class MonitoringClient extends IPSModule { $mqttId = $this->ReadPropertyInteger("MqttCLientID"); $projectyear = $this->ReadPropertyInteger("Projectyear"); - $projectnumber = $this->ReadPropertyString("Projectnumber"); + $projectnumber = $this->ReadPropertyInteger("Projectnumber"); $projectname = $this->ReadPropertyString("Projectname"); $ispnumber = $this->ReadPropertyInteger("ISP"); $updatetime = $this->ReadPropertyInteger("Updatetime"); $catIds[0]["id"] = $this->ReadPropertyInteger("ParseNotifyCategoryID"); - $catIds[0]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Notify/"; + $catIds[0]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Notify/"; $catIds[1]["id"] = $this->ReadPropertyInteger("ParseAlarmCategoryID"); - $catIds[1]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Alarm/"; + $catIds[1]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Alarm/"; $catIds[2]["id"] = $this->ReadPropertyInteger("ParseAnalogCategoryID"); - $catIds[2]["top"] = "Projekte". $projectyear."/".$projectnumber. "/ISP" .$ispnumber. "/Analog/"; + $catIds[2]["top"] = "Projekte". $projectyear."/P".$projectnumber. "/ISP" .$ispnumber. "/Analog/"; diff --git a/Monitoring Server Influx V1/form.json b/Monitoring Server Influx V1/form.json index 8f44200..8ca7502 100644 --- a/Monitoring Server Influx V1/form.json +++ b/Monitoring Server Influx V1/form.json @@ -24,7 +24,8 @@ { "type": "ValidationTextBox", "name": "InfluxDatabase", "caption": "Influx Database" }, { "type": "NumberSpinner", "name": "UpdateintervallValues", "caption": "Updateintervall Values in Seconds" }, - { "type": "NumberSpinner", "name": "UpdateintervallAlarms", "caption": "Updateintervall Alarms in Seconds" } + { "type": "NumberSpinner", "name": "UpdateintervallAlarms", "caption": "Updateintervall Alarms in Seconds" }, + { "type": "CheckBox", "name": "Debug", "caption": "Debug" } ], "actions": diff --git a/Monitoring Server Influx V1/module.php b/Monitoring Server Influx V1/module.php index 7b938a8..d48ce4c 100644 --- a/Monitoring Server Influx V1/module.php +++ b/Monitoring Server Influx V1/module.php @@ -38,8 +38,6 @@ class MonitoringServer extends IPSModule { $this->RegisterVariableInteger("AlarmActiveCount", "Number of Values in Alarmstate", "", 1); $this->RegisterVariableInteger("AnalogVarCount", "Number of Analogvalues", "", 2); $this->RegisterVariableInteger("DigitalVarCount", "Number of DigitalValues", "", 3); - $this->RegisterVariableString("InfluxState", "Influx-DB State", "", 4); - $this->RegisterVariableString("InfluxMessage", "Influx-DB Message", "", 5); } @@ -182,6 +180,7 @@ class MonitoringServer extends IPSModule { $ispnumber = $this->ReadPropertyInteger("ISP"); $logit = $this->ReadPropertyBoolean("LogValues"); + $logit = $this->ReadPropertyBoolean("LogValues"); $numberofvalues = 0; @@ -240,6 +239,7 @@ class MonitoringServer extends IPSModule { $system = "P".$projectnumber."_ISP".$ispnumber; $category = $system."_Analog"; $valuename = $parname."".$varname; + //IPS_LogMessage ("Analog Var-Logger", "Ready: ".$system."/".$category."/".$valuename." with Value: ".$payload); if($this->checkInfluxState() > -1){ @@ -384,16 +384,27 @@ class MonitoringServer extends IPSModule { $catChilds = IPS_GetChildrenIDs($catAlarmId); foreach ($catChilds as $catChild) { //for each object in category - + $this->createAlarmprofile(); $objchildids = IPS_GetChildrenIDs($catChild); //get variables of objects $parname = IPS_GetName($catChild); IPS_SetName($catChild,$this->getTextAfterLastSlash($parname)); + IPS_SetVariableCustomProfile($catChild, "Alarm"); } } } + public function createAlarmprofile(){ + if(!IPS_VariableProfileExists ("Alarm") ){ + + IPS_CreateVariableProfile("Alarm", 0); + IPS_SetVariableProfileAssociation("Alarm", true, "Störung", "Alert", 0xFF0000); + IPS_SetVariableProfileAssociation("Alarm", false, "OK", "Ok", 0x00FF00); + + } + } + } ?> \ No newline at end of file diff --git a/library.json b/library.json index b136f14..2e5c091 100644 --- a/library.json +++ b/library.json @@ -8,6 +8,6 @@ "date": 1491343200 }, "version": "1.7", - "build": 3, + "build": 4, "date": 0 } \ No newline at end of file