version 1.7.4
This commit is contained in:
Johannes Holzwarth | SE-Inno GmbH
@@ -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" }
|
||||
|
||||
@@ -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/";
|
||||
|
||||
|
||||
|
||||
|
||||
@@ -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":
|
||||
|
||||
@@ -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);
|
||||
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
?>
|
||||
+1
-1
@@ -8,6 +8,6 @@
|
||||
"date": 1491343200
|
||||
},
|
||||
"version": "1.7",
|
||||
"build": 3,
|
||||
"build": 4,
|
||||
"date": 0
|
||||
}
|
||||
Reference in New Issue
Block a user