jeka/OTGateway
1
0
Fork 0
mirror of https://github.com/Laxilef/OTGateway.git synced 2025-12-10 18:24:27 +05:00
Code Issues Packages Projects Releases Wiki Activity

refactor: added print to log channel 2 activity state #155

Browse Source
This commit is contained in:
Yurii
2025-06-28 20:16:19 +03:00
parent 5c4ad8cd07
commit 47696a0721
3 changed files with 9 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/CustomOpenTherm/CustomOpenTherm.h
View File

@@ -106,6 +106,11 @@ public:
return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest); return isValidResponse(response) && isValidResponseId(response, OpenThermMessageID::RemoteRequest);
} }
static bool isCh2Active(unsigned long response)
{
return response & 0x20;
}
static bool isValidResponseId(unsigned long response, OpenThermMessageID id) { static bool isValidResponseId(unsigned long response, OpenThermMessageID id) {
byte responseId = (response >> 16) & 0xFF; byte responseId = (response >> 16) & 0xFF;

5
src/OpenThermTask.h
View File

@@ -237,6 +237,7 @@ protected:
vars.slave.dhw.active = settings.opentherm.options.dhwSupport ? CustomOpenTherm::isHotWaterActive(response) : false; vars.slave.dhw.active = settings.opentherm.options.dhwSupport ? CustomOpenTherm::isHotWaterActive(response) : false;
vars.slave.flame = CustomOpenTherm::isFlameOn(response); vars.slave.flame = CustomOpenTherm::isFlameOn(response);
vars.slave.cooling = CustomOpenTherm::isCoolingActive(response); vars.slave.cooling = CustomOpenTherm::isCoolingActive(response);
vars.slave.ch2.active = CustomOpenTherm::isCh2Active(response);
vars.slave.fault.active = CustomOpenTherm::isFault(response); vars.slave.fault.active = CustomOpenTherm::isFault(response);
if (!settings.opentherm.options.ignoreDiagState) { if (!settings.opentherm.options.ignoreDiagState) {
@@ -247,9 +248,9 @@ protected:
} }
Log.snoticeln( Log.snoticeln(
FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; cooling: %hhu; fault: %hhu; diag: %hhu"), FPSTR(L_OT), F("Received boiler status. Heating: %hhu; DHW: %hhu; flame: %hhu; cooling: %hhu; channel 2: %hhu; fault: %hhu; diag: %hhu"),
vars.slave.heating.active, vars.slave.dhw.active, vars.slave.heating.active, vars.slave.dhw.active,
vars.slave.flame, vars.slave.cooling, vars.slave.fault.active, vars.slave.diag.active vars.slave.flame, vars.slave.cooling, vars.slave.ch2.active, vars.slave.fault.active, vars.slave.diag.active
); );
} }

1
src/Settings.h
View File

@@ -398,6 +398,7 @@ struct Variables {
} dhw; } dhw;
struct { struct {
bool active = false;
bool enabled = false; bool enabled = false;
float targetTemp = 0.0f; float targetTemp = 0.0f;
float currentTemp = 0.0f; float currentTemp = 0.0f;