andry/EMS-ESP32
1
0
Fork 0
mirror of https://github.com/emsesp/EMS-ESP32.git synced 2025-12-07 16:29:51 +03:00
Code Issues Packages Projects Releases Wiki Activity

auxMaxTemp, pvRaise/Lower to Kelvin

Browse Source
This commit is contained in:
MichaelDvP
2023-01-02 15:06:56 +01:00
parent 9163fc74d4
commit bb1704ed7a
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/devices/boiler.cpp
View File

@@ -489,7 +489,7 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const
DeviceValueType::UINT, DeviceValueType::UINT,
DeviceValueNumOp::DV_NUMOP_MUL10, DeviceValueNumOp::DV_NUMOP_MUL10,
FL_(auxMaxTemp), FL_(auxMaxTemp),
DeviceValueUOM::DEGREES, DeviceValueUOM::K,
MAKE_CF_CB(set_auxMaxTemp), MAKE_CF_CB(set_auxMaxTemp),
0, 0,
10); 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) { bool Boiler::set_auxMaxTemp(const char * value, const int8_t id) {
float v; float v;
if (Helpers::value2temperature(value, v)) { if (Helpers::value2float(value, v)) {
write_command(0x491, 14, (uint8_t)(v * 10), 0x491); write_command(0x491, 14, (uint8_t)(v * 10), 0x491);
return true; return true;
} }

8
src/devices/thermostat.cpp
View File

@@ -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) { bool Thermostat::set_pvRaiseHeat(const char * value, const int8_t id) {
int v; int v;
if (Helpers::value2temperature(value, v, true)) { if (Helpers::value2number(value, v)) {
write_command(0x23E, 0, v, 0x23E); write_command(0x23E, 0, v, 0x23E);
return true; 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) { bool Thermostat::set_pvLowerCool(const char * value, const int8_t id) {
int v; int v;
if (Helpers::value2temperature(value, v, true)) { if (Helpers::value2number(value, v)) {
write_command(0x23E, 5, v, 0x23E); write_command(0x23E, 5, v, 0x23E);
return true; return true;
} }
@@ -3565,7 +3565,7 @@ void Thermostat::register_device_values() {
&pvRaiseHeat_, &pvRaiseHeat_,
DeviceValueType::INT, DeviceValueType::INT,
FL_(pvRaiseHeat), FL_(pvRaiseHeat),
DeviceValueUOM::DEGREES_R, DeviceValueUOM::K,
MAKE_CF_CB(set_pvRaiseHeat), MAKE_CF_CB(set_pvRaiseHeat),
0, 0,
5); 5);
@@ -3573,7 +3573,7 @@ void Thermostat::register_device_values() {
&pvLowerCool_, &pvLowerCool_,
DeviceValueType::INT, DeviceValueType::INT,
FL_(pvLowerCool), FL_(pvLowerCool),
DeviceValueUOM::DEGREES_R, DeviceValueUOM::K,
MAKE_CF_CB(set_pvLowerCool), MAKE_CF_CB(set_pvLowerCool),
-5, -5,
0); 0);