From bb1704ed7ab3cc7f26dcc1ecf96bd829c70b7c0f Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Mon, 2 Jan 2023 15:06:56 +0100 Subject: [PATCH] auxMaxTemp, pvRaise/Lower to Kelvin --- src/devices/boiler.cpp | 4 ++-- src/devices/thermostat.cpp | 8 ++++---- 2 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index ba22c6b5c..d5f517d09 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -489,7 +489,7 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const DeviceValueType::UINT, DeviceValueNumOp::DV_NUMOP_MUL10, FL_(auxMaxTemp), - DeviceValueUOM::DEGREES, + DeviceValueUOM::K, MAKE_CF_CB(set_auxMaxTemp), 0, 10); @@ -2290,7 +2290,7 @@ bool Boiler::set_auxHeatMode(const char * value, const int8_t id) { bool Boiler::set_auxMaxTemp(const char * value, const int8_t id) { float v; - if (Helpers::value2temperature(value, v)) { + if (Helpers::value2float(value, v)) { write_command(0x491, 14, (uint8_t)(v * 10), 0x491); return true; } diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index 70775a87e..d706f3d3e 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -1512,7 +1512,7 @@ bool Thermostat::set_tempDiffBoiler(const char * value, const int8_t id) { bool Thermostat::set_pvRaiseHeat(const char * value, const int8_t id) { int v; - if (Helpers::value2temperature(value, v, true)) { + if (Helpers::value2number(value, v)) { write_command(0x23E, 0, v, 0x23E); return true; } @@ -1521,7 +1521,7 @@ bool Thermostat::set_pvRaiseHeat(const char * value, const int8_t id) { bool Thermostat::set_pvLowerCool(const char * value, const int8_t id) { int v; - if (Helpers::value2temperature(value, v, true)) { + if (Helpers::value2number(value, v)) { write_command(0x23E, 5, v, 0x23E); return true; } @@ -3565,7 +3565,7 @@ void Thermostat::register_device_values() { &pvRaiseHeat_, DeviceValueType::INT, FL_(pvRaiseHeat), - DeviceValueUOM::DEGREES_R, + DeviceValueUOM::K, MAKE_CF_CB(set_pvRaiseHeat), 0, 5); @@ -3573,7 +3573,7 @@ void Thermostat::register_device_values() { &pvLowerCool_, DeviceValueType::INT, FL_(pvLowerCool), - DeviceValueUOM::DEGREES_R, + DeviceValueUOM::K, MAKE_CF_CB(set_pvLowerCool), -5, 0);