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

feat: added polling of min modulation and max boiler power; added sensor for current boiler power

Browse Source
This commit is contained in:
Yurii
2024-10-14 19:54:26 +03:00
parent 05ff426b28
commit dc62f99b7d
8 changed files with 115 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

48
src/OpenThermTask.h
View File

@@ -253,6 +253,19 @@ protected:
// These parameters will be updated every minute
if (millis() - this->prevUpdateNonEssentialVars > 60000) {
if (this->updateMinModulationLevel()) {
Log.straceln(FPSTR(L_OT), F("Min modulation: %u%%, boiler max power: %u kW"), vars.parameters.minModulation, vars.sensors.maxPower);
if (vars.parameters.minModulation > settings.heating.maxModulation) {
settings.heating.maxModulation = vars.parameters.minModulation;
fsSettings.update();
Log.snoticeln(FPSTR(L_OT_DHW), F("Updated min modulation: %hhu"), settings.heating.maxModulation);
}
} else {
Log.swarningln(FPSTR(L_OT), F("Failed get min modulation & max power"));
}
if (!heatingEnabled && settings.opentherm.modulationSyncWithHeating) {
if (this->setMaxModulationLevel(0)) {
Log.snoticeln(FPSTR(L_OT_HEATING), F("Set max modulation 0% (off)"));
@@ -363,11 +376,22 @@ protected:
// Get current modulation level (if necessary)
if (vars.states.flame) {
this->updateModulationLevel();
if (vars.states.flame && this->updateModulationLevel()) {
vars.sensors.currentPower = vars.sensors.maxPower > 0
? vars.sensors.maxPower * (vars.sensors.modulation / 100)
: 0;
Log.sverboseln(
FPSTR(L_OT_DHW),
F("Current modulation level: %.2f%%, power: %.2f of %hhu kW"),
vars.sensors.modulation,
vars.sensors.currentPower,
vars.sensors.maxPower
);
} else {
vars.sensors.modulation = 0;
vars.sensors.currentPower = 0;
}
// Update DHW sensors (if necessary)
@@ -1045,6 +1069,26 @@ protected:
return true;
}
bool updateMinModulationLevel() {
unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
OpenThermRequestType::READ_DATA,
OpenThermMessageID::MaxCapacityMinModLevel,
0
));
if (!CustomOpenTherm::isValidResponse(response)) {
return false;
}
byte minModulation = response & 0xFF;
byte maxPower = (response & 0xFFFF) >> 8;
vars.parameters.minModulation = minModulation;
vars.sensors.maxPower = maxPower;
return true;
}
bool updatePressure() {
unsigned long response = this->instance->sendRequest(CustomOpenTherm::buildRequest(
OpenThermRequestType::READ_DATA,