From b1a3d6ea200177285c3183dd5b1dee3b8d5993ed Mon Sep 17 00:00:00 2001 From: MichaelDvP Date: Fri, 27 Oct 2023 15:58:12 +0200 Subject: [PATCH] update alert module --- src/devices/alert.cpp | 116 +++++------------------------------------- src/devices/alert.h | 26 ++-------- 2 files changed, 15 insertions(+), 127 deletions(-) diff --git a/src/devices/alert.cpp b/src/devices/alert.cpp index 3f3d6b4a9..bb1ef3af3 100644 --- a/src/devices/alert.cpp +++ b/src/devices/alert.cpp @@ -24,111 +24,19 @@ 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) { - if (device_id == 0x15) { // EM100 - register_telegram_type(0x935, "EM100SetMessage", true, MAKE_PF_CB(process_EM100SetMessage)); - register_telegram_type(0x937, "EM100TempMessage", false, MAKE_PF_CB(process_EM100TempMessage)); - register_telegram_type(0x938, "EM100InputMessage", false, MAKE_PF_CB(process_EM100InputMessage)); - register_telegram_type(0x939, "EM100MonitorMessage", false, MAKE_PF_CB(process_EM100MonitorMessage)); - register_telegram_type(0x93A, "EM100ConfigMessage", false, MAKE_PF_CB(process_EM100ConfigMessage)); - 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, &input_, DeviceValueType::USHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(input), DeviceValueUOM::VOLTS); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &outPower_, DeviceValueType::BOOL, FL_(outPower), DeviceValueUOM::NONE); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &setPower_, DeviceValueType::UINT, FL_(setPower), DeviceValueUOM::PERCENT); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &setPoint_, DeviceValueType::UINT, FL_(setPoint), DeviceValueUOM::DEGREES); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, - &minV_, - DeviceValueType::UINT, - DeviceValueNumOp::DV_NUMOP_DIV10, - FL_(minV), - DeviceValueUOM::VOLTS, - MAKE_CF_CB(set_minV)); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, - &maxV_, - DeviceValueType::UINT, - DeviceValueNumOp::DV_NUMOP_DIV10, - FL_(maxV), - DeviceValueUOM::VOLTS, - MAKE_CF_CB(set_maxV)); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &minT_, DeviceValueType::UINT, FL_(minT), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_minT)); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &maxT_, DeviceValueType::UINT, FL_(maxT), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_maxT)); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &dip_, DeviceValueType::UINT, FL_(mode), DeviceValueUOM::NONE); - // register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &errorState_, DeviceValueType::BOOL, FL_(error), DeviceValueUOM::NONE); - } + // EM10, device-id 0x12, listens to error messages, measures voltage input and send 0x1A to the boiler. + // values already shown in boiler + // see https://github.com/emsesp/EMS-ESP32/issues/575 + register_telegram_type(0x1A, "UBASetPoints", false, MAKE_PF_CB(process_UBASetPoints)); + + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &setFlowTemp_, DeviceValueType::UINT, FL_(setFlowTemp), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &setBurnPow_, DeviceValueType::UINT, FL_(setBurnPow), DeviceValueUOM::PERCENT); + } - - -// 0x935 needs fetch -void Alert::process_EM100SetMessage(std::shared_ptr telegram) { - has_update(telegram, minV_, 1); // Input for off, is / 10 - has_update(telegram, maxV_, 2); // Input for 100%, is / 10 - has_update(telegram, minT_, 3); // min temp - has_update(telegram, maxT_, 4); // max temp +// UBASetPoint 0x1A +void Alert::process_UBASetPoints(std::shared_ptr telegram) { + has_update(telegram, setFlowTemp_, 0); // boiler set temp from thermostat + has_update(telegram, setBurnPow_, 1); // max burner power in % } - -// alert(0x15) -B-> All(0x00), ?(0x093A), data: 00 00 00 00 00 00 00 00 00 03 01 -void Alert::process_EM100ConfigMessage(std::shared_ptr telegram) { - has_update(telegram, dip_, 9); -} - -// alert(0x15) -B-> All(0x00), ?(0x0938), data: 01 62 -void Alert::process_EM100InputMessage(std::shared_ptr telegram) { - has_update(telegram, outPower_, 0); // IO1 - has_update(telegram, input_, 1); -} - -// alert(0x15) -B-> All(0x00), ?(0x0939), data: 64 4E 00 00 -void Alert::process_EM100MonitorMessage(std::shared_ptr telegram) { - has_update(telegram, setPower_, 0); // percent - has_update(telegram, setPoint_, 1); // °C - // has_update(telegram, errorState_, 2); // OE1 - // has_update(telegram, errorPump_, 3); // IE0 -} - -// alert(0x15) -B-> All(0x00), ?(0x0937), data: 80 00 -void Alert::process_EM100TempMessage(std::shared_ptr telegram) { - has_update(telegram, headerTemp_, 0); -} - -bool Alert::set_minV(const char * value, const int8_t id) { - float v; - if (!Helpers::value2float(value, v)) { - return false; - } - write_command(0x935, 1, (uint8_t)(v * 10)); - return true; -} - -bool Alert::set_maxV(const char * value, const int8_t id) { - float v; - if (!Helpers::value2float(value, v)) { - return false; - } - write_command(0x935, 2, (uint8_t)(v * 10)); - return true; -} - -bool Alert::set_minT(const char * value, const int8_t id) { - int v; - if (!Helpers::value2temperature(value, v)) { - return false; - } - write_command(0x935, 3, v); - return true; -} - -bool Alert::set_maxT(const char * value, const int8_t id) { - int v; - if (!Helpers::value2temperature(value, v)) { - return false; - } - write_command(0x935, 4, v); - return true; -} - } // namespace emsesp \ No newline at end of file diff --git a/src/devices/alert.h b/src/devices/alert.h index 715de712e..97d5bc521 100644 --- a/src/devices/alert.h +++ b/src/devices/alert.h @@ -28,30 +28,10 @@ class Alert : public EMSdevice { 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 telegram); - void process_EM100MonitorMessage(std::shared_ptr telegram); - void process_EM100TempMessage(std::shared_ptr telegram); - void process_EM100InputMessage(std::shared_ptr telegram); - void process_EM100ConfigMessage(std::shared_ptr telegram); + void process_UBASetPoints(std::shared_ptr telegram); - bool set_minV(const char * value, const int8_t id); - bool set_maxV(const char * value, const int8_t id); - bool set_minT(const char * value, const int8_t id); - bool set_maxT(const char * value, const int8_t id); - - - int16_t headerTemp_; // T0 - int16_t input_; // IO1 - uint8_t errorState_; // OE1 - uint8_t errorPump_; // IE0 - uint8_t outPower_; // IO1 - uint8_t setPower_; // request - uint8_t setPoint_; - uint8_t dip_; // dip switch - uint8_t minV_; - uint8_t maxV_; - uint8_t minT_; - uint8_t maxT_; + uint8_t setFlowTemp_; // boiler setpoint temp + uint8_t setBurnPow_; // Burner power % }; } // namespace emsesp