ETM-Schurig
/
powersync-plugins-modbus
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fixes for Idm plugin 

Hopefully reading room temperature and outside temperature correctly
now.
master
Hermann Detz 2020-10-16 14:01:30 +02:00 committed by Michael Zanetti
parent 470eb64317
commit ad70d1d254
4 changed files with 8 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
idm/idm.cpp
View File

@ -60,7 +60,7 @@ void Idm::onReceivedHoldingRegister(int slaveAddress, int modbusRegister, const
switch (modbusRegister) { switch (modbusRegister) {
case Idm::OutsideTemperature: case Idm::OutsideTemperature:
if (value.length() == 2) { if (value.length() == 2) {
m_info->m_roomTemperature = ModbusHelpers::convertRegisterToFloat(&value[RegisterList::OutsideTemperature - modbusRegister]); m_info->m_outsideTemperature = ModbusHelpers::convertRegisterToFloat(&value[RegisterList::OutsideTemperature - modbusRegister]);
} }
m_modbusMaster->readHoldingRegister(Idm::ModbusUnitID, Idm::CurrentFaultNumber, 1); m_modbusMaster->readHoldingRegister(Idm::ModbusUnitID, Idm::CurrentFaultNumber, 1);
break; break;
@ -90,11 +90,11 @@ void Idm::onReceivedHoldingRegister(int slaveAddress, int modbusRegister, const
if (value.length() == 1) { if (value.length() == 1) {
m_info->m_mode = heatPumpOperationModeToString((Idm::IdmHeatPumpMode)value[RegisterList::HeatPumpOperatingMode-modbusRegister]); m_info->m_mode = heatPumpOperationModeToString((Idm::IdmHeatPumpMode)value[RegisterList::HeatPumpOperatingMode-modbusRegister]);
} }
m_modbusMaster->readHoldingRegister(Idm::ModbusUnitID, Idm::ExternalOutsideTemperature, 2); m_modbusMaster->readHoldingRegister(Idm::ModbusUnitID, Idm::RoomTemperatureHKA, 2);
break; break;
case Idm::ExternalOutsideTemperature: case Idm::RoomTemperatureHKA:
if (value.length() == 2) { if (value.length() == 2) {
m_info->m_outsideTemperature = ModbusHelpers::convertRegisterToFloat(&value[RegisterList::ExternalOutsideTemperature - modbusRegister]); m_info->m_roomTemperature = ModbusHelpers::convertRegisterToFloat(&value[RegisterList::ExternalOutsideTemperature - modbusRegister]);
} }
emit statusUpdated(m_info); emit statusUpdated(m_info);

1
idm/idm.h
View File

@ -102,6 +102,7 @@ private:
TargetHotWaterTemperature = 1032, // Warmwasser-Solltemperatur TargetHotWaterTemperature = 1032, // Warmwasser-Solltemperatur
HeatPumpOperatingMode = 1090, // Betriebsart Wärmepumpe HeatPumpOperatingMode = 1090, // Betriebsart Wärmepumpe
SummationFaultHeatPump = 1099, // Summenstörung Wärepumpe SummationFaultHeatPump = 1099, // Summenstörung Wärepumpe
RoomTemperatureHKA = 1364, // Heizkreis A Raumtemperature (B61)
Humiditysensor = 1392, // Feuchtesensor Humiditysensor = 1392, // Feuchtesensor
RoomTemperatureTargetHeatingHKA = 1401, // Raumsolltemperatur Heizen Normal HK A RoomTemperatureTargetHeatingHKA = 1401, // Raumsolltemperatur Heizen Normal HK A
ExternalOutsideTemperature = 1690, // Externe Außentemperatur ExternalOutsideTemperature = 1690, // Externe Außentemperatur

1
modbus/modbustcpmaster.cpp
View File

@ -29,6 +29,7 @@
* * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
#include "modbustcpmaster.h" #include "modbustcpmaster.h"
#include <loggingcategories.h> #include <loggingcategories.h>
NYMEA_LOGGING_CATEGORY(dcModbusTCP, "ModbusTCP") NYMEA_LOGGING_CATEGORY(dcModbusTCP, "ModbusTCP")

2
modbus/modbustcpmaster.h
View File

@ -37,6 +37,8 @@
#include <QTimer> #include <QTimer>
#include <QUuid> #include <QUuid>
Q_DECLARE_LOGGING_CATEGORY(dcModbus)
class ModbusTCPMaster : public QObject class ModbusTCPMaster : public QObject
{ {
Q_OBJECT Q_OBJECT