EM100 to Alert, add first telegrams

emsesp · Oct 20, 2023 · 3fe9296 · 3fe9296
1 parent c533e91
commit 3fe9296
Show file tree

Hide file tree

Showing 3 changed files with 45 additions and 3 deletions.
diff --git a/src/device_library.h b/src/device_library.h
@@ -101,7 +101,7 @@
 {215, DeviceType::THERMOSTAT, "Comfort RF", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
 {216, DeviceType::THERMOSTAT, "CRF200S", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
 {246, DeviceType::THERMOSTAT, "Comfort+2RF", DeviceFlags::EMS_DEVICE_FLAG_CRF | DeviceFlags::EMS_DEVICE_FLAG_NO_WRITE}, // 0x18
-{253, DeviceType::THERMOSTAT, "Rego 3000/UI800", DeviceFlags::EMS_DEVICE_FLAG_RC300}, // 0x10
+{253, DeviceType::THERMOSTAT, "Rego 3000/UI800/BC400", DeviceFlags::EMS_DEVICE_FLAG_RC300}, // 0x10
 
 // Thermostat - Sieger - 0x10 / 0x17
 { 66, DeviceType::THERMOSTAT, "ES72/RC20", DeviceFlags::EMS_DEVICE_FLAG_RC20_N}, // 0x17 or remote
@@ -169,8 +169,8 @@
 // Switches - 0x11
 { 71, DeviceType::SWITCH, "WM10", DeviceFlags::EMS_DEVICE_FLAG_NONE},
 
-// PM10 Pump module - 0x15
-{ 243, DeviceType::PUMP, "PM10", DeviceFlags::EMS_DEVICE_FLAG_NONE},
+// EM10/EM100 module - 0x15
+{ 243, DeviceType::ALERT, "EM10/EM100", DeviceFlags::EMS_DEVICE_FLAG_NONE},
 
 // EM10 error contact and analog flowtemp control- 0x12
 { 74, DeviceType::ALERT, "EM10", DeviceFlags::EMS_DEVICE_FLAG_NONE},

diff --git a/src/devices/alert.cpp b/src/devices/alert.cpp
@@ -24,6 +24,36 @@ REGISTER_FACTORY(Alert, EMSdevice::DeviceType::ALERT);
 
 Alert::Alert(uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * name, uint8_t flags, uint8_t brand)
     : EMSdevice(device_type, device_id, product_id, version, name, flags, brand) {
+    register_telegram_type(0x937, "EM100TempMessage", false, MAKE_PF_CB(process_EM100TempMessage));
+    register_telegram_type(0x93A, "EM100SetMessage", false, MAKE_PF_CB(process_EM100SetMessage));
+    register_telegram_type(0x936, "EM100MonitorMessage", false, MAKE_PF_CB(process_EM100MonitorMessage));
+
+    register_device_value(DeviceValueTAG::TAG_DEVICE_DATA,
+                          &headerTemp_,
+                          DeviceValueType::SHORT,
+                          DeviceValueNumOp::DV_NUMOP_DIV10,
+                          FL_(flowTempVf),
+                          DeviceValueUOM::DEGREES);
+    register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &dip_, DeviceValueType::UINT, FL_(mode), DeviceValueUOM::NONE);
+    register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &outPower_, DeviceValueType::UINT, FL_(power), DeviceValueUOM::PERCENT);
+    register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &errorState_, DeviceValueType::BOOL, FL_(error), DeviceValueUOM::NONE);
+}
+
+
+// alert(0x15) -B-> All(0x00), ?(0x093A), data: 00 00 00 00 00 00 00 00 00 03 01
+void Alert::process_EM100SetMessage(std::shared_ptr<const Telegram> telegram) {
+    has_update(telegram, dip_, 9);
+}
+// one of 0x936, 0x937, 0x938, 0x939, 0x93A
+void Alert::process_EM100MonitorMessage(std::shared_ptr<const Telegram> telegram) {
+    has_update(telegram, errorState_, 0); // OE1
+    has_update(telegram, errorPump_, 0);  // IE0
+    has_update(telegram, outPower_, 0);   // IO1 percent
+    has_update(telegram, input_, 0);      //IO1
+}
+// alert(0x15) -B-> All(0x00), ?(0x0937), data: 80 00
+void Alert::process_EM100TempMessage(std::shared_ptr<const Telegram> telegram) {
+    has_update(telegram, headerTemp_, 0);
 }
 
 } // namespace emsesp
diff --git a/src/devices/alert.h b/src/devices/alert.h
@@ -26,6 +26,18 @@ namespace emsesp {
 class Alert : public EMSdevice {
   public:
     Alert(uint8_t device_type, uint8_t device_id, uint8_t product_id, const char * version, const char * name, uint8_t flags, uint8_t brand);
+
+  private:
+    void process_EM100SetMessage(std::shared_ptr<const Telegram> telegram);
+    void process_EM100MonitorMessage(std::shared_ptr<const Telegram> telegram);
+    void process_EM100TempMessage(std::shared_ptr<const Telegram> telegram);
+
+    int16_t headerTemp_; // T0
+    int16_t input_;      // IO1
+    uint8_t errorState_; // OE1
+    uint8_t errorPump_;  // IE0
+    uint8_t outPower_;   // IO1
+    uint8_t dip_;        // dip switch
 };
 
 } // namespace emsesp