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

fixed register to double conversion

Browse Source
This commit is contained in:
Boernsman 2021-05-10 01:19:56 +02:00 committed by Michael Zanetti
parent 6bfcefcc34
commit 616cd85554
1 changed files with 57 additions and 50 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

107
drexelundweiss/integrationplugindrexelundweiss.cpp
View File

@ -245,12 +245,16 @@ void IntegrationPluginDrexelUndWeiss::sendWriteRequest(ThingActionInfo *info, ui
ModbusRtuReply *reply = modbus->writeHoldingRegisters(slaveAddress, modbusRegister, QVector<uint16_t>() << value); ModbusRtuReply *reply = modbus->writeHoldingRegisters(slaveAddress, modbusRegister, QVector<uint16_t>() << value);
connect(reply, &ModbusRtuReply::finished, reply, &ModbusRtuReply::deleteLater); connect(reply, &ModbusRtuReply::finished, reply, &ModbusRtuReply::deleteLater);
connect(reply, &ModbusRtuReply::finished, info, [info, reply] { connect(reply, &ModbusRtuReply::finished, info, [info, reply, this] {
if (info->isFinished()) {
return;
}
if (reply->error() != ModbusRtuReply::Error::NoError) { if (reply->error() != ModbusRtuReply::Error::NoError) {
return info->finish(Thing::ThingErrorHardwareFailure); return info->finish(Thing::ThingErrorHardwareFailure);
} }
//TODO update thing state after successfull write requests updateStates(info->thing());
info->finish(Thing::ThingErrorNoError); info->finish(Thing::ThingErrorNoError);
}); });
} }
@ -330,34 +334,37 @@ void IntegrationPluginDrexelUndWeiss::readHoldingRegister(Thing *thing, ModbusRt
return; return;
} }
thing->setStateValue(m_connectedStateTypeIds.value(thing->thingClassId()), true); thing->setStateValue(m_connectedStateTypeIds.value(thing->thingClassId()), true);
QVector<uint16_t> values = reply->result(); if (reply->result().length() != 2) {
return;
}
uint32_t value = (static_cast<uint32_t>(reply->result()[0])<<16 | reply->result()[1]);
if (thing->thingClassId() == x2luThingClassId) { if (thing->thingClassId() == x2wpThingClassId) {
switch (reply->registerAddress()) { switch (reply->registerAddress()) {
case ModbusRegisterX2::Waermepumpe: case ModbusRegisterX2::Waermepumpe:
thing->setStateValue(x2wpPowerStateTypeId, values[1]); thing->setStateValue(x2wpPowerStateTypeId, value);
break; break;
case ModbusRegisterX2::RaumSoll: case ModbusRegisterX2::RaumSoll:
thing->setStateValue(x2wpTargetTemperatureStateTypeId, (static_cast<uint32_t>(values[0])<<16 | values[1])/1000.00); thing->setStateValue(x2wpTargetTemperatureStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::Raum: case ModbusRegisterX2::Raum:
thing->setStateValue(x2wpTemperatureStateTypeId, (static_cast<uint32_t>(values[0])<<16 | values[1])/1000.00); thing->setStateValue(x2wpTemperatureStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::TemperaturWarmwasserspeicherUnten: case ModbusRegisterX2::TemperaturWarmwasserspeicherUnten:
thing->setStateValue(x2wpWaterTemperatureStateTypeId, (static_cast<uint32_t>(values[0])<<16 | values[1])/1000.00); thing->setStateValue(x2wpWaterTemperatureStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::BrauchwasserSolltermperatur: case ModbusRegisterX2::BrauchwasserSolltermperatur:
thing->setStateValue(x2wpTargetWaterTemperatureStateTypeId, (static_cast<uint32_t>(values[0])<<16 | values[1])/1000.00); thing->setStateValue(x2wpTargetWaterTemperatureStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::Auszenluft: case ModbusRegisterX2::Auszenluft:
thing->setStateValue(x2wpOutsideAirTemperatureStateTypeId, (static_cast<uint32_t>(values[0])<<16 | values[1])/1000.00); thing->setStateValue(x2wpOutsideAirTemperatureStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::Summenstoerung: case ModbusRegisterX2::Summenstoerung:
if (values[0] != 0) { if (value != 0) {
//get actual error //get actual error
} else { } else {
thing->setStateValue(x2wpErrorStateTypeId, "No Error"); thing->setStateValue(x2wpErrorStateTypeId, "No Error");
@ -365,171 +372,171 @@ void IntegrationPluginDrexelUndWeiss::readHoldingRegister(Thing *thing, ModbusRt
break; break;
case ModbusRegisterX2::StoerungAbluftventilator: case ModbusRegisterX2::StoerungAbluftventilator:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Exhaust fan"); thing->setStateValue(x2wpErrorStateTypeId, "Exhaust fan");
break; break;
case ModbusRegisterX2::StoerungBoilerfuehlerElektroheizstab: case ModbusRegisterX2::StoerungBoilerfuehlerElektroheizstab:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Boiler sensor electric heating element"); thing->setStateValue(x2wpErrorStateTypeId, "Boiler sensor electric heating element");
break; break;
case ModbusRegisterX2::StoerungBoilerfuehlerSolar: case ModbusRegisterX2::StoerungBoilerfuehlerSolar:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Boiler sensor solar"); thing->setStateValue(x2wpErrorStateTypeId, "Boiler sensor solar");
break; break;
case ModbusRegisterX2::StoerungBoilerfuehlerWaermepumpe: case ModbusRegisterX2::StoerungBoilerfuehlerWaermepumpe:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Boiler sensor heat pump"); thing->setStateValue(x2wpErrorStateTypeId, "Boiler sensor heat pump");
break; break;
case ModbusRegisterX2::StoerungBoileruebertemperatur: case ModbusRegisterX2::StoerungBoileruebertemperatur:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Boiler overtemperature"); thing->setStateValue(x2wpErrorStateTypeId, "Boiler overtemperature");
break; break;
case ModbusRegisterX2::StoerungCO2Sensor: case ModbusRegisterX2::StoerungCO2Sensor:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "CO2-Sensor"); thing->setStateValue(x2wpErrorStateTypeId, "CO2-Sensor");
break; break;
case ModbusRegisterX2::StoerungDruckverlustAbluftZuGrosz: case ModbusRegisterX2::StoerungDruckverlustAbluftZuGrosz:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Pressure loss exhaust air too big"); thing->setStateValue(x2wpErrorStateTypeId, "Pressure loss exhaust air too big");
break; break;
case ModbusRegisterX2::StoerungDruckverlustZuluftZuGrosz: case ModbusRegisterX2::StoerungDruckverlustZuluftZuGrosz:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Pressure loss supply air too large"); thing->setStateValue(x2wpErrorStateTypeId, "Pressure loss supply air too large");
break; break;
case ModbusRegisterX2::StoerungDurchflussmengeHeizgkreis: case ModbusRegisterX2::StoerungDurchflussmengeHeizgkreis:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Flow rate of heating circuit"); thing->setStateValue(x2wpErrorStateTypeId, "Flow rate of heating circuit");
break; break;
case ModbusRegisterX2::StoerungDurchflussmengeSolekreis: case ModbusRegisterX2::StoerungDurchflussmengeSolekreis:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Flow rate brine circuit"); thing->setStateValue(x2wpErrorStateTypeId, "Flow rate brine circuit");
break; break;
case ModbusRegisterX2::StoerungTeilnehmerNichtErreichbar: case ModbusRegisterX2::StoerungTeilnehmerNichtErreichbar:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Participant not available"); thing->setStateValue(x2wpErrorStateTypeId, "Participant not available");
break; break;
case ModbusRegisterX2::StoerungTemperaturfuehlerAuszenluft: case ModbusRegisterX2::StoerungTemperaturfuehlerAuszenluft:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor outside air"); thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor outside air");
break; break;
case ModbusRegisterX2::StoerungTemperaturfuehlerHeizkreisVorlauf: case ModbusRegisterX2::StoerungTemperaturfuehlerHeizkreisVorlauf:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor heating circuit flow"); thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor heating circuit flow");
break; break;
case ModbusRegisterX2::StoerungTemperaturfuehlerRaum: case ModbusRegisterX2::StoerungTemperaturfuehlerRaum:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor room"); thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor room");
break; break;
case ModbusRegisterX2::StoerungTemperaturfuehlerSolarkollektor: case ModbusRegisterX2::StoerungTemperaturfuehlerSolarkollektor:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor solar collector"); thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor solar collector");
break; break;
case ModbusRegisterX2::StoerungTemperaturfuehlerSole: case ModbusRegisterX2::StoerungTemperaturfuehlerSole:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor brine"); thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor brine");
break; break;
case ModbusRegisterX2::StoerungTemperaturfuehlerSoleAuszenluft: case ModbusRegisterX2::StoerungTemperaturfuehlerSoleAuszenluft:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor brine outside air"); thing->setStateValue(x2wpErrorStateTypeId, "Temperature sensor brine outside air");
break; break;
case ModbusRegisterX2::StoerungWaermepumpeHochdruck: case ModbusRegisterX2::StoerungWaermepumpeHochdruck:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Heat pump high pressure"); thing->setStateValue(x2wpErrorStateTypeId, "Heat pump high pressure");
break; break;
case ModbusRegisterX2::StoerungWaermepumpeNiederdruck: case ModbusRegisterX2::StoerungWaermepumpeNiederdruck:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Heat pump low pressure"); thing->setStateValue(x2wpErrorStateTypeId, "Heat pump low pressure");
break; break;
case ModbusRegisterX2::StoerungWertNichtZulaessig: case ModbusRegisterX2::StoerungWertNichtZulaessig:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Value not allowed"); thing->setStateValue(x2wpErrorStateTypeId, "Value not allowed");
break; break;
case ModbusRegisterX2::StoerungZuluftventilator: case ModbusRegisterX2::StoerungZuluftventilator:
if (values[0] != 0) if (value != 0)
thing->setStateValue(x2wpErrorStateTypeId, "Supply air fan"); thing->setStateValue(x2wpErrorStateTypeId, "Supply air fan");
break; break;
case ModbusRegisterX2::LeistungKompressor: case ModbusRegisterX2::LeistungKompressor:
thing->setStateValue(x2wpPowerCompressorStateTypeId, values[0]/1000.00); thing->setStateValue(x2wpPowerCompressorStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::LeistungWarmwasser: case ModbusRegisterX2::LeistungWarmwasser:
thing->setStateValue(x2wpPowerWaterHeatingStateTypeId, values[0]/1000.00); thing->setStateValue(x2wpPowerWaterHeatingStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::LeistungRaumheizung: case ModbusRegisterX2::LeistungRaumheizung:
thing->setStateValue(x2wpPowerRoomHeatingStateTypeId, values[0]/1000.00); thing->setStateValue(x2wpPowerRoomHeatingStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::LeistungLuftvorwaermung: case ModbusRegisterX2::LeistungLuftvorwaermung:
thing->setStateValue(x2wpPowerAirPreheatingStateTypeId, values[0]/1000.00); thing->setStateValue(x2wpPowerAirPreheatingStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::EnergieKompressor: case ModbusRegisterX2::EnergieKompressor:
thing->setStateValue(x2wpEnergyCompressorStateTypeId, values[0]/1000.00); thing->setStateValue(x2wpEnergyCompressorStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::EnergieWarmwasser: case ModbusRegisterX2::EnergieWarmwasser:
thing->setStateValue(x2wpEnergyWaterHeatingStateTypeId, values[0]/1000.00); thing->setStateValue(x2wpEnergyWaterHeatingStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::EnergieRaumheizung: case ModbusRegisterX2::EnergieRaumheizung:
thing->setStateValue(x2wpEnergyRoomHeatingStateTypeId, values[0]/1000.00); thing->setStateValue(x2wpEnergyRoomHeatingStateTypeId, value/1000.00);
break; break;
case ModbusRegisterX2::EnergieLuftvorerwarrmung: case ModbusRegisterX2::EnergieLuftvorerwarrmung:
thing->setStateValue(x2wpEnergyAirPreheatingStateTypeId, values[0]/1000.00); thing->setStateValue(x2wpEnergyAirPreheatingStateTypeId, value/1000.00);
break; break;
default: default:
break; break;
} }
} else if (thing->thingClassId() == x2wpThingClassId) { } else if (thing->thingClassId() == x2luThingClassId) {
switch (reply->registerAddress()) { switch (reply->registerAddress()) {
case ModbusRegisterX2::Betriebsart: case ModbusRegisterX2::Betriebsart:
if (values[0] == VentilationMode::ManuellStufe0) { if (value == VentilationMode::ManuellStufe0) {
thing->setStateValue(x2luVentilationModeStateTypeId, "Manual level 0"); thing->setStateValue(x2luVentilationModeStateTypeId, "Manual level 0");
} else if (values[0] == VentilationMode::ManuellStufe1) { } else if (value == VentilationMode::ManuellStufe1) {
thing->setStateValue(x2luVentilationModeStateTypeId, "Manual level 1"); thing->setStateValue(x2luVentilationModeStateTypeId, "Manual level 1");
} else if (values[0] == VentilationMode::ManuellStufe2) { } else if (value == VentilationMode::ManuellStufe2) {
thing->setStateValue(x2luVentilationModeStateTypeId, "Manual level 2"); thing->setStateValue(x2luVentilationModeStateTypeId, "Manual level 2");
} else if (values[0] == VentilationMode::ManuellStufe3) { } else if (value == VentilationMode::ManuellStufe3) {
thing->setStateValue(x2luVentilationModeStateTypeId, "Manual level 3"); thing->setStateValue(x2luVentilationModeStateTypeId, "Manual level 3");
} else if (values[0] == VentilationMode::Automatikbetrieb) { } else if (value == VentilationMode::Automatikbetrieb) {
thing->setStateValue(x2luVentilationModeStateTypeId, "Automatic"); thing->setStateValue(x2luVentilationModeStateTypeId, "Automatic");
} else if (values[0] == VentilationMode::Party) { } else if (value == VentilationMode::Party) {
thing->setStateValue(x2luVentilationModeStateTypeId, "Party"); thing->setStateValue(x2luVentilationModeStateTypeId, "Party");
} }
if (values[0] == VentilationMode::ManuellStufe0) { if (value == VentilationMode::ManuellStufe0) {
thing->setStateValue(x2luPowerStateTypeId, false); thing->setStateValue(x2luPowerStateTypeId, false);
} else { } else {
thing->setStateValue(x2luPowerStateTypeId, true); thing->setStateValue(x2luPowerStateTypeId, true);
} }
break; break;
case ModbusRegisterX2::AktiveLuefterstufe: case ModbusRegisterX2::AktiveLuefterstufe:
thing->setStateValue(x2luActiveVentilationLevelStateTypeId, values[0]); thing->setStateValue(x2luActiveVentilationLevelStateTypeId, value);
break; break;
case ModbusRegisterX2::CO2: case ModbusRegisterX2::CO2:
thing->setStateValue(x2luCo2StateTypeId, values[0]); thing->setStateValue(x2luCo2StateTypeId, value);
break; break;
} }
} }