From d150b017e3033afde6d941993d1d1bde519e401a Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Mon, 17 Oct 2022 18:56:54 +0200 Subject: [PATCH 1/2] DIV10 for solarTemp --- src/devices/boiler.cpp | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 58fda22fc..4461c852f 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -577,7 +577,7 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const FL_(wwSelTempSingle), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_ww_temp_single)); - register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, &wwSolarTemp_, DeviceValueType::USHORT, FL_(wwSolarTemp), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, &wwSolarTemp_, DeviceValueType::USHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(wwSolarTemp), DeviceValueUOM::DEGREES); register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, &wwType_, DeviceValueType::ENUM, FL_(enum_flow), FL_(wwType), DeviceValueUOM::NONE); register_device_value(DeviceValueTAG::TAG_BOILER_DATA_WW, &wwComfort_, From b859ab9d78259d5b053c2471eda5deb68cfa8367 Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Tue, 18 Oct 2022 09:17:45 +0200 Subject: [PATCH 2/2] fix switch commands #692 --- src/emsdevice.cpp | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/src/emsdevice.cpp b/src/emsdevice.cpp index 29104e414..fd6b32e39 100644 --- a/src/emsdevice.cpp +++ b/src/emsdevice.cpp @@ -157,6 +157,14 @@ uint8_t EMSdevice::device_name_2_device_type(const char * topic) { return DeviceType::ANALOGSENSOR; } + if (!strcmp(lowtopic, F_(switch))) { + return DeviceType::SWITCH; + } + + if (!strcmp(lowtopic, F_(gateway))) { + return DeviceType::GATEWAY; + } + return DeviceType::UNKNOWN; }