From 105a79f72c6a2ba64eb4d25b03cfa159a31bc352 Mon Sep 17 00:00:00 2001 From: Yurii Date: Wed, 4 Dec 2024 05:55:01 +0300 Subject: [PATCH] refactor: optimization of OT requests for CH2 --- src/OpenThermTask.h | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/src/OpenThermTask.h b/src/OpenThermTask.h index f3feb0e..7d3d583 100644 --- a/src/OpenThermTask.h +++ b/src/OpenThermTask.h @@ -1038,25 +1038,27 @@ protected: } // Set CH2 temp - if (vars.master.ch2.enabled && !settings.opentherm.nativeHeatingControl) { - // Converted target CH2 temp - float convertedTemp = convertTemp( - vars.master.ch2.targetTemp, - settings.system.unitSystem, - settings.opentherm.unitSystem - ); + if (!settings.opentherm.nativeHeatingControl && vars.master.ch2.enabled) { + if (settings.opentherm.heatingCh1ToCh2 || settings.opentherm.dhwToCh2) { + // Converted target CH2 temp + float convertedTemp = convertTemp( + vars.master.ch2.targetTemp, + settings.system.unitSystem, + settings.opentherm.unitSystem + ); - if (this->needSetCh2Temp(convertedTemp)) { - if (this->setCh2Temp(convertedTemp)) { - this->ch2SetTempTime = millis(); + if (this->needSetCh2Temp(convertedTemp)) { + if (this->setCh2Temp(convertedTemp)) { + this->ch2SetTempTime = millis(); - Log.sinfoln( - FPSTR(L_OT_CH2), F("Set temp: %.2f (converted: %.2f, response: %.2f)"), - vars.master.ch2.targetTemp, convertedTemp, vars.slave.ch2.targetTemp - ); + Log.sinfoln( + FPSTR(L_OT_CH2), F("Set temp: %.2f (converted: %.2f, response: %.2f)"), + vars.master.ch2.targetTemp, convertedTemp, vars.slave.ch2.targetTemp + ); - } else { - Log.swarningln(FPSTR(L_OT_CH2), F("Failed set temp")); + } else { + Log.swarningln(FPSTR(L_OT_CH2), F("Failed set temp")); + } } } }