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

V1.4

Browse Source
This commit is contained in:
jhartworks
2024-12-09 09:04:27 +01:00
parent 873f390f00
commit 27a0bee822
2 changed files with 16 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
LoraMlr003/module.php
+15 -1
View File
@@ -52,7 +52,10 @@ class LoraMlr003 extends IPSModule {
$this->RegisterTimer("WriteUpdate", 0, 'MLR3_WriteSetpointvalues('.$this->InstanceID.');'); $this->RegisterTimer("WriteUpdate", 0, 'MLR3_WriteSetpointvalues('.$this->InstanceID.');');
$this->RegisterVariableString("hexOutput","HEX-Output"); $this->RegisterVariableString("hexOutput","HEX-Output");
$this->RegisterVariableString("jsonOutput","JSON-Output"); $this->RegisterVariableString("jsonOutput","JSON-Output");
$this->RegisterVariableFloat("setpointModbus","Setpoint from Modbus");
$this->RegisterVariableFloat("valvePosition","Actual Valve Position");
$this->RegisterVariableFloat("storageVoltage","Storagevoltage");
} }
// Überschreibt die intere IPS_ApplyChanges($id) Funktion // Überschreibt die intere IPS_ApplyChanges($id) Funktion
@@ -164,6 +167,9 @@ class LoraMlr003 extends IPSModule {
$temp = $this->CheckGetArrayValue($data,"Current_Valve_Position"); $temp = $this->CheckGetArrayValue($data,"Current_Valve_Position");
if ($temp != "failure") { if ($temp != "failure") {
$idFromvalvePosition = $this->GetIDForIdent("valvePosition");
SetValueFloat($idFromvalvePosition,$temp);
$adressmodCurrent_Valve_Position = $this->ReadPropertyInteger("modCurrent_Valve_Position"); $adressmodCurrent_Valve_Position = $this->ReadPropertyInteger("modCurrent_Valve_Position");
$this->ModbusPublish($devEui."Current_Valve_Position", $modGwId, $devName." Current_Valve_Position", $adressmodCurrent_Valve_Position, $temp, $modFcReadActValues, $modFcWriteActValues,5); $this->ModbusPublish($devEui."Current_Valve_Position", $modGwId, $devName." Current_Valve_Position", $adressmodCurrent_Valve_Position, $temp, $modFcReadActValues, $modFcWriteActValues,5);
$temp = "failure"; $temp = "failure";
@@ -303,6 +309,10 @@ class LoraMlr003 extends IPSModule {
$temp = $this->CheckGetArrayValue($data,"Storage_Voltage"); $temp = $this->CheckGetArrayValue($data,"Storage_Voltage");
if ($temp != "failure") { if ($temp != "failure") {
$adressmodStorage_Voltage = $this->ReadPropertyInteger("modStorage_Voltage"); $adressmodStorage_Voltage = $this->ReadPropertyInteger("modStorage_Voltage");
$idFromstorageVoltage = $this->GetIDForIdent("storageVoltage");
SetValueFloat($idFromstorageVoltage,$temp);
//echo "Storage_Voltage ".$temp; //echo "Storage_Voltage ".$temp;
$this->ModbusPublish($devEui."Storage_Voltage", $modGwId, $devName." Storage_Voltage", $adressmodStorage_Voltage, $temp, $modFcReadActValues, $modFcWriteActValues,7); $this->ModbusPublish($devEui."Storage_Voltage", $modGwId, $devName." Storage_Voltage", $adressmodStorage_Voltage, $temp, $modFcReadActValues, $modFcWriteActValues,7);
$temp = "failure"; $temp = "failure";
@@ -374,6 +384,10 @@ class LoraMlr003 extends IPSModule {
//echo $modUsermode; //echo $modUsermode;
$adressmodSetpoint = $this->ReadPropertyInteger("modSetpoint"); $adressmodSetpoint = $this->ReadPropertyInteger("modSetpoint");
$modSetpoint = $this->ModbusPublish($devEui."Setpoint", $modGwId, $devName." Setpoint", $adressmodSetpoint, $temp, $modFcReadSetpoints, 0,5); $modSetpoint = $this->ModbusPublish($devEui."Setpoint", $modGwId, $devName." Setpoint", $adressmodSetpoint, $temp, $modFcReadSetpoints, 0,5);
$idFromsetpointModbus = $this->GetIDForIdent("setpointModbus");
SetValueFloat($idFromsetpointModbus,$modSetpoint);
//echo $modSetpoint; //echo $modSetpoint;
$adressmodRoomtemp = $this->ReadPropertyInteger("modRoomtemp"); $adressmodRoomtemp = $this->ReadPropertyInteger("modRoomtemp");
$modRoomtemp = $this->ModbusPublish($devEui."Roomtemp", $modGwId, $devName." Roomtemp", $adressmodRoomtemp, $temp, $modFcReadSetpoints, 0,5); $modRoomtemp = $this->ModbusPublish($devEui."Roomtemp", $modGwId, $devName." Roomtemp", $adressmodRoomtemp, $temp, $modFcReadSetpoints, 0,5);
library.json
+1 -1
View File
@@ -7,7 +7,7 @@
"version": "6.0", "version": "6.0",
"date": 1491343200 "date": 1491343200
}, },
"version": "1.3", "version": "1.4",
"build": 1, "build": 1,
"date": 0 "date": 0
} }