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

Merge PR #159: Huawei: Update battery behaviour depending on the battery state

master
jenkins 2023-12-15 10:21:51 +01:00
parent 9557a89b33 4a5d097a09
commit 255363117d
2 changed files with 28 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

26
huawei/huaweifusionsolar.cpp
View File

@ -448,6 +448,19 @@ void HuaweiFusionSolar::readNextRegister()
qCWarning(dcHuaweiFusionSolar()) << "<-- Received invalid values. Requested" << 1 << "but received" << unit.values(); qCWarning(dcHuaweiFusionSolar()) << "<-- Received invalid values. Requested" << 1 << "but received" << unit.values();
} else { } else {
processLunaBattery1StatusRegisterValues(unit.values()); processLunaBattery1StatusRegisterValues(unit.values());
switch (m_lunaBattery1Status) {
case HuaweiFusionSolar::BatteryDeviceStatusFault:
case HuaweiFusionSolar::BatteryDeviceStatusStandby:
case HuaweiFusionSolar::BatteryDeviceStatusOffline:
case HuaweiFusionSolar::BatteryDeviceStatusSleepMode:
m_battery1Available = false;
m_lunaBattery1Power = 0;
emit lunaBattery1PowerChanged(m_lunaBattery1Power);
break;
case HuaweiFusionSolar::BatteryDeviceStatusRunning:
m_battery1Available = true;
break;
}
} }
} }
finishRequest(); finishRequest();
@ -578,6 +591,19 @@ void HuaweiFusionSolar::readNextRegister()
qCWarning(dcHuaweiFusionSolar()) << "<-- Received invalid values count. Requested" << 1 << "but received" << unit.values(); qCWarning(dcHuaweiFusionSolar()) << "<-- Received invalid values count. Requested" << 1 << "but received" << unit.values();
} else { } else {
processLunaBattery2StatusRegisterValues(unit.values()); processLunaBattery2StatusRegisterValues(unit.values());
switch (m_lunaBattery2Status) {
case HuaweiFusionSolar::BatteryDeviceStatusFault:
case HuaweiFusionSolar::BatteryDeviceStatusStandby:
case HuaweiFusionSolar::BatteryDeviceStatusOffline:
case HuaweiFusionSolar::BatteryDeviceStatusSleepMode:
m_battery2Available = false;
m_lunaBattery2Power = 0;
emit lunaBattery2PowerChanged(m_lunaBattery2Power);
break;
case HuaweiFusionSolar::BatteryDeviceStatusRunning:
m_battery2Available = true;
break;
}
} }
} }
finishRequest(); finishRequest();

4
huawei/huaweifusionsolar.h
View File

@ -55,8 +55,8 @@ private:
int m_currentRegisterRequest = -1; int m_currentRegisterRequest = -1;
void finishRequest(); void finishRequest();
bool m_battery1Available = true; bool m_battery1Available = false;
bool m_battery2Available = true; bool m_battery2Available = false;
double m_actualInverterPower = 0; double m_actualInverterPower = 0;