diff --git a/src/devices/boiler.h b/src/devices/boiler.h index cfa74d4c0..4eec3c73e 100644 --- a/src/devices/boiler.h +++ b/src/devices/boiler.h @@ -295,32 +295,32 @@ class Boiler : public EMSdevice { void process_amExtraMessage(std::shared_ptr telegram); // commands - none of these use the additional id parameter - bool set_ww_mode(const char * value, const int8_t id); - bool set_ww_activated(const char * value, const int8_t id); - bool set_tapwarmwater_activated(const char * value, const int8_t id); - bool set_ww_onetime(const char * value, const int8_t id); - bool set_ww_disinfect(const char * value, const int8_t id); - bool set_ww_circulation(const char * value, const int8_t id); - bool set_ww_circulation_pump(const char * value, const int8_t id); - bool set_ww_circulation_mode(const char * value, const int8_t id); - bool set_ww_temp(const char * value, const int8_t id); - bool set_ww_temp_low(const char * value, const int8_t id); - bool set_ww_temp_single(const char * value, const int8_t id); - bool set_ww_disinfect_temp(const char * value, const int8_t id); - bool set_ww_maxpower(const char * value, const int8_t id); - bool set_ww_maxtemp(const char * value, const int8_t id); - bool set_ww_flowTempOffset(const char * value, const int8_t id); - bool set_ww_chargeOptimization(const char * value, const int8_t id); - bool set_flow_temp(const char * value, const int8_t id); - bool set_burn_power(const char * value, const int8_t id); - bool set_heating_activated(const char * value, const int8_t id); - bool set_heating_temp(const char * value, const int8_t id); - bool set_min_power(const char * value, const int8_t id); - bool set_max_power(const char * value, const int8_t id); - bool set_min_pump(const char * value, const int8_t id); - bool set_max_pump(const char * value, const int8_t id); - bool set_hyst_on(const char * value, const int8_t id); - bool set_hyst_off(const char * value, const int8_t id); + bool set_ww_mode(const char * value, const int8_t id); + bool set_ww_activated(const char * value, const int8_t id); + bool set_tapwarmwater_activated(const char * value, const int8_t id); + bool set_ww_onetime(const char * value, const int8_t id); + bool set_ww_disinfect(const char * value, const int8_t id); + bool set_ww_circulation(const char * value, const int8_t id); + bool set_ww_circulation_pump(const char * value, const int8_t id); + bool set_ww_circulation_mode(const char * value, const int8_t id); + bool set_ww_temp(const char * value, const int8_t id); + bool set_ww_temp_low(const char * value, const int8_t id); + bool set_ww_temp_single(const char * value, const int8_t id); + bool set_ww_disinfect_temp(const char * value, const int8_t id); + bool set_ww_maxpower(const char * value, const int8_t id); + bool set_ww_maxtemp(const char * value, const int8_t id); + bool set_ww_flowTempOffset(const char * value, const int8_t id); + bool set_ww_chargeOptimization(const char * value, const int8_t id); + bool set_flow_temp(const char * value, const int8_t id); + bool set_burn_power(const char * value, const int8_t id); + bool set_heating_activated(const char * value, const int8_t id); + bool set_heating_temp(const char * value, const int8_t id); + bool set_min_power(const char * value, const int8_t id); + bool set_max_power(const char * value, const int8_t id); + bool set_min_pump(const char * value, const int8_t id); + bool set_max_pump(const char * value, const int8_t id); + bool set_hyst_on(const char * value, const int8_t id); + bool set_hyst_off(const char * value, const int8_t id); inline bool set_hyst2_on(const char * value, const int8_t id) { return set_hyst_on(value, 2); } @@ -339,23 +339,23 @@ class Boiler : public EMSdevice { bool set_emergency_temp(const char * value, const int8_t id); bool set_emergency_ops(const char * value, const int8_t id); - bool set_vr2Config(const char * value, const int8_t id); // pos 12: off(00)/Keelbypass(01)/(hc1pump(02) only standalone) - bool set_ahsActivated(const char * value, const int8_t id); // pos 00: Alternate heat source activation: No(00),Yes(01) - bool set_aPumpConfig(const char * value, const int8_t id); // pos 04: Buffer primary pump->Config pump: No(00),Yes(01) - bool set_aPumpSignal(const char * value, const int8_t id); // pos 03: Output for PR1 pump: On/Off(00),PWM(01),PWM invers(02) - bool set_aPumpMin(const char * value, const int8_t id); // pos 21: Min output pump PR1 (%) - bool set_tempRise(const char * value, const int8_t id); // pos 01: AHS return temp rise: No(00),Yes(01) (mixer VR1) - bool set_setReturnTemp(const char * value, const int8_t id); // pos 06: Set temp return (°C) (VR1) - bool set_mixRuntime(const char * value, const int8_t id); // pos 10/11?: Mixer run time (s) (VR1) - bool set_setFlowTemp(const char * value, const int8_t id); // pos 07: Set flow temp AHS (°C) (Buffer) - bool set_bufBypass(const char * value, const int8_t id); // pos 02: Puffer bypass: No(00), Mischer(01), Ventil(02) (Buffer) - bool set_bufMixRuntime(const char * value, const int8_t id); // pos 8/9: Bypass mixer run time: [time] (s) (Buffer) - bool set_bufConfig(const char * value, const int8_t id); // pos 20: Konfig WW-Speicher Monovalent(01), Bivalent(02) (buffer) - bool set_blockMode(const char * value, const int8_t id); // pos 16: Config htg. blocking mode: No(00),Automatic(01),Always block02) (blocking) - bool set_blockTerm(const char * value, const int8_t id); // pos 17: Config of block terminal: NO(00), NC(01) - bool set_blockHyst(const char * value, const int8_t id); // pos 14?: Hyst. for bolier block (K) - bool set_releaseWait(const char * value, const int8_t id); // pos 15: Boiler release wait time (min) - bool set_HpInLogic(const char * value, const int8_t id); + bool set_vr2Config(const char * value, const int8_t id); // pos 12: off(00)/Keelbypass(01)/(hc1pump(02) only standalone) + bool set_ahsActivated(const char * value, const int8_t id); // pos 00: Alternate heat source activation: No(00),Yes(01) + bool set_aPumpConfig(const char * value, const int8_t id); // pos 04: Buffer primary pump->Config pump: No(00),Yes(01) + bool set_aPumpSignal(const char * value, const int8_t id); // pos 03: Output for PR1 pump: On/Off(00),PWM(01),PWM invers(02) + bool set_aPumpMin(const char * value, const int8_t id); // pos 21: Min output pump PR1 (%) + bool set_tempRise(const char * value, const int8_t id); // pos 01: AHS return temp rise: No(00),Yes(01) (mixer VR1) + bool set_setReturnTemp(const char * value, const int8_t id); // pos 06: Set temp return (°C) (VR1) + bool set_mixRuntime(const char * value, const int8_t id); // pos 10/11?: Mixer run time (s) (VR1) + bool set_setFlowTemp(const char * value, const int8_t id); // pos 07: Set flow temp AHS (°C) (Buffer) + bool set_bufBypass(const char * value, const int8_t id); // pos 02: Puffer bypass: No(00), Mischer(01), Ventil(02) (Buffer) + bool set_bufMixRuntime(const char * value, const int8_t id); // pos 8/9: Bypass mixer run time: [time] (s) (Buffer) + bool set_bufConfig(const char * value, const int8_t id); // pos 20: Konfig WW-Speicher Monovalent(01), Bivalent(02) (buffer) + bool set_blockMode(const char * value, const int8_t id); // pos 16: Config htg. blocking mode: No(00),Automatic(01),Always block02) (blocking) + bool set_blockTerm(const char * value, const int8_t id); // pos 17: Config of block terminal: NO(00), NC(01) + bool set_blockHyst(const char * value, const int8_t id); // pos 14?: Hyst. for bolier block (K) + bool set_releaseWait(const char * value, const int8_t id); // pos 15: Boiler release wait time (min) + bool set_HpInLogic(const char * value, const int8_t id); inline bool set_HpIn1Logic(const char * value, const int8_t id) { return set_HpInLogic(value, 1); } @@ -368,7 +368,7 @@ class Boiler : public EMSdevice { inline bool set_HpIn4Logic(const char * value, const int8_t id) { return set_HpInLogic(value, 4); } - bool set_maxHeat(const char * value, const int8_t id); + bool set_maxHeat(const char * value, const int8_t id); inline bool set_maxHeatComp(const char * value, const int8_t id) { return set_maxHeat(value, 2); } diff --git a/src/devices/heatpump.cpp b/src/devices/heatpump.cpp index c3e2449d4..bd986591d 100644 --- a/src/devices/heatpump.cpp +++ b/src/devices/heatpump.cpp @@ -41,16 +41,16 @@ Heatpump::Heatpump(uint8_t device_type, uint8_t device_id, uint8_t product_id, c register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &retTemp_, DeviceValueType::UINT, FL_(retTemp), DeviceValueUOM::DEGREES); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &sysRetTemp_, DeviceValueType::UINT, FL_(sysRetTemp), DeviceValueUOM::DEGREES); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTa4_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTa4), DeviceValueUOM::DEGREES); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr1_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr1), DeviceValueUOM::DEGREES); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr3_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr3), DeviceValueUOM::DEGREES); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr3_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr3), DeviceValueUOM::DEGREES); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr4_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr4), DeviceValueUOM::DEGREES); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr5_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr5), DeviceValueUOM::DEGREES); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr6_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr6), DeviceValueUOM::DEGREES); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTl2_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTl2), DeviceValueUOM::DEGREES); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpJr0_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpPl1), DeviceValueUOM::DEGREES); - register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpJr1_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpPh1), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTa4_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTa4), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr1_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr1), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr3_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr3), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr3_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr3), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr4_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr4), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr5_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr5), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTr6_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTr6), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpTl2_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpTl2), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpJr0_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpPl1), DeviceValueUOM::DEGREES); + register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &hpJr1_, DeviceValueType::SHORT, DeviceValueNumOp::DV_NUMOP_DIV10, FL_(hpPh1), DeviceValueUOM::DEGREES); register_device_value(DeviceValueTAG::TAG_DEVICE_DATA, &controlStrategy_, diff --git a/src/devices/heatpump.h b/src/devices/heatpump.h index 237843653..4af3eedd2 100644 --- a/src/devices/heatpump.h +++ b/src/devices/heatpump.h @@ -54,16 +54,16 @@ class Heatpump : public EMSdevice { int16_t flowTemp_; int16_t retTemp_; int16_t sysRetTemp_; - int16_t hpTc3_; // condenser temp. - int16_t hpTr1_; // compressor temp. - int16_t hpTr3_; // cond. temp. heating - int16_t hpTr4_; // cond. temp. clg - int16_t hpTr5_; // suction line temp. - int16_t hpTr6_; // hot gas temp. - int16_t hpTl2_; // inlet air temperature - int16_t hpTa4_; // drain pan temp. - int16_t hpJr0_; // low pressure sensor - int16_t hpJr1_; // high pressure sensor + int16_t hpTc3_; // condenser temp. + int16_t hpTr1_; // compressor temp. + int16_t hpTr3_; // cond. temp. heating + int16_t hpTr4_; // cond. temp. clg + int16_t hpTr5_; // suction line temp. + int16_t hpTr6_; // hot gas temp. + int16_t hpTl2_; // inlet air temperature + int16_t hpTa4_; // drain pan temp. + int16_t hpJr0_; // low pressure sensor + int16_t hpJr1_; // high pressure sensor void process_HPMonitor1(std::shared_ptr telegram); void process_HPMonitor2(std::shared_ptr telegram); diff --git a/src/devices/thermostat.h b/src/devices/thermostat.h index a75de3da0..d49c0926c 100644 --- a/src/devices/thermostat.h +++ b/src/devices/thermostat.h @@ -393,9 +393,9 @@ class Thermostat : public EMSdevice { bool set_switchtime(const char * value, const uint16_t type_id, char * out, size_t len); // set functions - these use the id/hc - bool set_mode(const char * value, const int8_t id); - bool set_control(const char * value, const int8_t id); - bool set_holiday(const char * value, const int8_t id, const bool vacation = false); + bool set_mode(const char * value, const int8_t id); + bool set_control(const char * value, const int8_t id); + bool set_holiday(const char * value, const int8_t id, const bool vacation = false); inline bool set_vacation(const char * value, const int8_t id) { return set_holiday(value, id, true); } @@ -440,24 +440,24 @@ class Thermostat : public EMSdevice { bool set_remoteseltemp(const char * value, const int8_t id); // set functions - these don't use the id/hc, the parameters are ignored - bool set_wwmode(const char * value, const int8_t id); - bool set_wwtemp(const char * value, const int8_t id); - bool set_wwtemplow(const char * value, const int8_t id); - bool set_wwcircmode(const char * value, const int8_t id); - bool set_wwcharge(const char * value, const int8_t id); - bool set_wwchargeduration(const char * value, const int8_t id); - bool set_wwDisinfect(const char * value, const int8_t id); - bool set_wwDisinfectDay(const char * value, const int8_t id); - bool set_wwDisinfectHour(const char * value, const int8_t id); - bool set_wwMaxTemp(const char * value, const int8_t id); - bool set_wwOneTimeKey(const char * value, const int8_t id); - bool set_wwProgMode(const char * value, const int8_t id); - bool set_wwCircProg(const char * value, const int8_t id); - bool set_wwSwitchTime(const char * value, const int8_t id); - bool set_wwCircSwitchTime(const char * value, const int8_t id); - bool set_wwDailyHeating(const char * value, const int8_t id); - bool set_wwDailyHeatTime(const char * value, const int8_t id); - bool set_wwwhenmodeoff(const char * value, const int8_t id); + bool set_wwmode(const char * value, const int8_t id); + bool set_wwtemp(const char * value, const int8_t id); + bool set_wwtemplow(const char * value, const int8_t id); + bool set_wwcircmode(const char * value, const int8_t id); + bool set_wwcharge(const char * value, const int8_t id); + bool set_wwchargeduration(const char * value, const int8_t id); + bool set_wwDisinfect(const char * value, const int8_t id); + bool set_wwDisinfectDay(const char * value, const int8_t id); + bool set_wwDisinfectHour(const char * value, const int8_t id); + bool set_wwMaxTemp(const char * value, const int8_t id); + bool set_wwOneTimeKey(const char * value, const int8_t id); + bool set_wwProgMode(const char * value, const int8_t id); + bool set_wwCircProg(const char * value, const int8_t id); + bool set_wwSwitchTime(const char * value, const int8_t id); + bool set_wwCircSwitchTime(const char * value, const int8_t id); + bool set_wwDailyHeating(const char * value, const int8_t id); + bool set_wwDailyHeatTime(const char * value, const int8_t id); + bool set_wwwhenmodeoff(const char * value, const int8_t id); inline bool set_wwVacation(const char * value, const int8_t id) { return set_holiday(value, DeviceValueTAG::TAG_WWC1, true); } diff --git a/src/mqtt.cpp b/src/mqtt.cpp index 95e5e5d35..2e8b4de4a 100644 --- a/src/mqtt.cpp +++ b/src/mqtt.cpp @@ -72,8 +72,8 @@ MAKE_PSTR(iconua, "mdi:lightning-bolt-circle") // DeviceValueUOM::UA // MAKE_PSTR(iconbar, "mdi:gauge") // DeviceValueUOM::BAR // MAKE_PSTR(iconkw, "mdi:omega") // DeviceValueUOM::KW & W // MAKE_PSTR(icondbm, "mdi:wifi-strength-2") // DeviceValueUOM::DBM -MAKE_PSTR(iconnum, "mdi:counter") // DeviceValueUOM::NONE -MAKE_PSTR(icondevice, "mdi:home-automation") // for devices in HA +MAKE_PSTR(iconnum, "mdi:counter") // DeviceValueUOM::NONE +// MAKE_PSTR(icondevice, "mdi:home-automation") // for devices in HA uuid::log::Logger Mqtt::logger_{F_(mqtt), uuid::log::Facility::DAEMON};