From c0bf623266b65180f00e73fe699f2218303f73eb Mon Sep 17 00:00:00 2001 From: proddy Date: Mon, 15 Nov 2021 14:28:14 +0100 Subject: [PATCH] rename publish_ha* functions --- src/devices/boiler.cpp | 4 ++-- src/devices/boiler.h | 2 +- src/devices/connect.cpp | 2 +- src/devices/connect.h | 2 +- src/devices/controller.cpp | 2 +- src/devices/controller.h | 2 +- src/devices/gateway.cpp | 2 +- src/devices/gateway.h | 2 +- src/devices/generic.cpp | 2 +- src/devices/generic.h | 2 +- src/devices/heatpump.cpp | 2 +- src/devices/heatpump.h | 2 +- src/devices/mixer.cpp | 2 +- src/devices/mixer.h | 2 +- src/devices/solar.cpp | 2 +- src/devices/solar.h | 2 +- src/devices/switch.cpp | 2 +- src/devices/switch.h | 2 +- src/devices/thermostat.cpp | 27 +++++++++++---------------- src/devices/thermostat.h | 2 +- 20 files changed, 31 insertions(+), 36 deletions(-) diff --git a/src/devices/boiler.cpp b/src/devices/boiler.cpp index 11e1b0c8d..5b35d0911 100644 --- a/src/devices/boiler.cpp +++ b/src/devices/boiler.cpp @@ -267,7 +267,7 @@ Boiler::Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const } // publish HA config -bool Boiler::publish_ha_config() { +bool Boiler::publish_ha_device_config() { StaticJsonDocument doc; doc["uniq_id"] = F_(boiler); doc["ic"] = F_(icondevice); @@ -1407,7 +1407,7 @@ bool Boiler::set_reset(const char * value, const int8_t id) { bool Boiler::set_maintenance(const char * value, const int8_t id) { std::string s(12, '\0'); if (Helpers::value2string(value, s)) { - if (s == Helpers::toLower(uuid::read_flash_string(F_(reset)))) { + if (s == Helpers::toLower(read_flash_string(F_(reset)))) { LOG_INFO(F("Reset boiler maintenance message")); write_command(0x05, 0x08, 0xFF, 0x1C); return true; diff --git a/src/devices/boiler.h b/src/devices/boiler.h index 3fa6e494b..7f5332c62 100644 --- a/src/devices/boiler.h +++ b/src/devices/boiler.h @@ -27,7 +27,7 @@ class Boiler : public EMSdevice { public: Boiler(uint8_t device_type, int8_t device_id, uint8_t product_id, const std::string & version, const std::string & name, uint8_t flags, uint8_t brand); - virtual bool publish_ha_config(); + virtual bool publish_ha_device_config(); private: static uuid::log::Logger logger_; diff --git a/src/devices/connect.cpp b/src/devices/connect.cpp index 2a16039d0..9ee937b90 100644 --- a/src/devices/connect.cpp +++ b/src/devices/connect.cpp @@ -29,7 +29,7 @@ Connect::Connect(uint8_t device_type, uint8_t device_id, uint8_t product_id, con } // publish HA config -bool Connect::publish_ha_config() { +bool Connect::publish_ha_device_config() { return true; } diff --git a/src/devices/connect.h b/src/devices/connect.h index 960ad61ef..87b9a39d9 100644 --- a/src/devices/connect.h +++ b/src/devices/connect.h @@ -27,7 +27,7 @@ class Connect : public EMSdevice { public: Connect(uint8_t device_type, uint8_t device_id, uint8_t product_id, const std::string & version, const std::string & name, uint8_t flags, uint8_t brand); - virtual bool publish_ha_config(); + virtual bool publish_ha_device_config(); private: static uuid::log::Logger logger_; diff --git a/src/devices/controller.cpp b/src/devices/controller.cpp index 6a50c138a..6367bb173 100644 --- a/src/devices/controller.cpp +++ b/src/devices/controller.cpp @@ -29,7 +29,7 @@ Controller::Controller(uint8_t device_type, uint8_t device_id, uint8_t product_i } // publish HA config -bool Controller::publish_ha_config() { +bool Controller::publish_ha_device_config() { return true; } diff --git a/src/devices/controller.h b/src/devices/controller.h index 67496b64b..fbd9978b3 100644 --- a/src/devices/controller.h +++ b/src/devices/controller.h @@ -27,7 +27,7 @@ class Controller : public EMSdevice { public: Controller(uint8_t device_type, uint8_t device_id, uint8_t product_id, const std::string & version, const std::string & name, uint8_t flags, uint8_t brand); - virtual bool publish_ha_config(); + virtual bool publish_ha_device_config(); private: static uuid::log::Logger logger_; diff --git a/src/devices/gateway.cpp b/src/devices/gateway.cpp index b162d9037..11d9169d9 100644 --- a/src/devices/gateway.cpp +++ b/src/devices/gateway.cpp @@ -29,7 +29,7 @@ Gateway::Gateway(uint8_t device_type, uint8_t device_id, uint8_t product_id, con } // publish HA config -bool Gateway::publish_ha_config() { +bool Gateway::publish_ha_device_config() { return true; } diff --git a/src/devices/gateway.h b/src/devices/gateway.h index df47ddeb0..97295c1c9 100644 --- a/src/devices/gateway.h +++ b/src/devices/gateway.h @@ -27,7 +27,7 @@ class Gateway : public EMSdevice { public: Gateway(uint8_t device_type, uint8_t device_id, uint8_t product_id, const std::string & version, const std::string & name, uint8_t flags, uint8_t brand); - virtual bool publish_ha_config(); + virtual bool publish_ha_device_config(); private: static uuid::log::Logger logger_; diff --git a/src/devices/generic.cpp b/src/devices/generic.cpp index 516e92fa4..9616151dd 100644 --- a/src/devices/generic.cpp +++ b/src/devices/generic.cpp @@ -34,7 +34,7 @@ Generic::Generic(uint8_t device_type, uint8_t device_id, uint8_t product_id, con } // publish HA config -bool Generic::publish_ha_config() { +bool Generic::publish_ha_device_config() { return true; } diff --git a/src/devices/generic.h b/src/devices/generic.h index 7170bedbf..19e8c0c01 100644 --- a/src/devices/generic.h +++ b/src/devices/generic.h @@ -27,7 +27,7 @@ class Generic : public EMSdevice { public: Generic(uint8_t device_type, uint8_t device_id, uint8_t product_id, const std::string & version, const std::string & name, uint8_t flags, uint8_t brand); - virtual bool publish_ha_config(); + virtual bool publish_ha_device_config(); private: static uuid::log::Logger logger_; diff --git a/src/devices/heatpump.cpp b/src/devices/heatpump.cpp index d4c064c29..de10bc9e7 100644 --- a/src/devices/heatpump.cpp +++ b/src/devices/heatpump.cpp @@ -39,7 +39,7 @@ Heatpump::Heatpump(uint8_t device_type, uint8_t device_id, uint8_t product_id, c } // publish HA config -bool Heatpump::publish_ha_config() { +bool Heatpump::publish_ha_device_config() { StaticJsonDocument doc; doc["uniq_id"] = F_(heatpump); doc["ic"] = F_(icondevice); diff --git a/src/devices/heatpump.h b/src/devices/heatpump.h index 6dc6e8237..ef69a6358 100644 --- a/src/devices/heatpump.h +++ b/src/devices/heatpump.h @@ -27,7 +27,7 @@ class Heatpump : public EMSdevice { public: Heatpump(uint8_t device_type, uint8_t device_id, uint8_t product_id, const std::string & version, const std::string & name, uint8_t flags, uint8_t brand); - virtual bool publish_ha_config(); + virtual bool publish_ha_device_config(); private: static uuid::log::Logger logger_; diff --git a/src/devices/mixer.cpp b/src/devices/mixer.cpp index 460738c72..53fbb097b 100644 --- a/src/devices/mixer.cpp +++ b/src/devices/mixer.cpp @@ -100,7 +100,7 @@ Mixer::Mixer(uint8_t device_type, uint8_t device_id, uint8_t product_id, const s } // publish HA config -bool Mixer::publish_ha_config() { +bool Mixer::publish_ha_device_config() { // if we don't have valid values for this HC don't add it ever again if (!Helpers::hasValue(pumpStatus_)) { return false; diff --git a/src/devices/mixer.h b/src/devices/mixer.h index 2583e05f7..7bb4abd18 100644 --- a/src/devices/mixer.h +++ b/src/devices/mixer.h @@ -27,7 +27,7 @@ class Mixer : public EMSdevice { public: Mixer(uint8_t device_type, uint8_t device_id, uint8_t product_id, const std::string & version, const std::string & name, uint8_t flags, uint8_t brand); - virtual bool publish_ha_config(); + virtual bool publish_ha_device_config(); private: static uuid::log::Logger logger_; diff --git a/src/devices/solar.cpp b/src/devices/solar.cpp index a6921848f..667b5ee2f 100644 --- a/src/devices/solar.cpp +++ b/src/devices/solar.cpp @@ -180,7 +180,7 @@ Solar::Solar(uint8_t device_type, uint8_t device_id, uint8_t product_id, const s } // publish HA config -bool Solar::publish_ha_config() { +bool Solar::publish_ha_device_config() { StaticJsonDocument doc; doc["uniq_id"] = F_(solar); doc["ic"] = F_(icondevice); diff --git a/src/devices/solar.h b/src/devices/solar.h index b0a68d0ea..e0a44c7de 100644 --- a/src/devices/solar.h +++ b/src/devices/solar.h @@ -27,7 +27,7 @@ class Solar : public EMSdevice { public: Solar(uint8_t device_type, uint8_t device_id, uint8_t product_id, const std::string & version, const std::string & name, uint8_t flags, uint8_t brand); - virtual bool publish_ha_config(); + virtual bool publish_ha_device_config(); private: static uuid::log::Logger logger_; diff --git a/src/devices/switch.cpp b/src/devices/switch.cpp index 0514f0a26..f424d7654 100644 --- a/src/devices/switch.cpp +++ b/src/devices/switch.cpp @@ -40,7 +40,7 @@ Switch::Switch(uint8_t device_type, uint8_t device_id, uint8_t product_id, const } // publish HA config -bool Switch::publish_ha_config() { +bool Switch::publish_ha_device_config() { // if we don't have valid values don't add it ever again if (!Helpers::hasValue(flowTempHc_)) { return false; diff --git a/src/devices/switch.h b/src/devices/switch.h index d821f1df5..3b1c9e560 100644 --- a/src/devices/switch.h +++ b/src/devices/switch.h @@ -27,7 +27,7 @@ class Switch : public EMSdevice { public: Switch(uint8_t device_type, uint8_t device_id, uint8_t product_id, const std::string & version, const std::string & name, uint8_t flags, uint8_t brand); - virtual bool publish_ha_config(); + virtual bool publish_ha_device_config(); private: static uuid::log::Logger logger_; diff --git a/src/devices/thermostat.cpp b/src/devices/thermostat.cpp index b0d139b19..5bfcfa2a0 100644 --- a/src/devices/thermostat.cpp +++ b/src/devices/thermostat.cpp @@ -192,7 +192,7 @@ Thermostat::Thermostat(uint8_t device_type, uint8_t device_id, uint8_t product_i } // publish HA config -bool Thermostat::publish_ha_config() { +bool Thermostat::publish_ha_device_config() { StaticJsonDocument doc; doc["uniq_id"] = F_(thermostat); doc["ic"] = F_(icondevice); @@ -384,7 +384,7 @@ std::shared_ptr Thermostat::heating_circuit(std::sha // publish config topic for HA MQTT Discovery for each of the heating circuit // e.g. homeassistant/climate/ems-esp/thermostat_hc1/config void Thermostat::publish_ha_config_hc(std::shared_ptr hc) { - uint8_t hc_num = hc->hc_num(); + uint8_t hc_num = hc->hc_num(); StaticJsonDocument doc; char str1[20]; @@ -437,7 +437,7 @@ void Thermostat::publish_ha_config_hc(std::shared_ptrget_model() != EMSdevice::EMS_DEVICE_FLAG_RC10){ + if (hc->get_model() != EMSdevice::EMS_DEVICE_FLAG_RC10) { modes.add("auto"); } modes.add("heat"); @@ -1798,26 +1798,26 @@ bool Thermostat::set_mode(const char * value, const int8_t id) { uint8_t num = value[0] - '0'; switch (model()) { case EMSdevice::EMS_DEVICE_FLAG_RC10: - mode = uuid::read_flash_string(FL_(enum_mode6)[num]); + mode = read_flash_string(FL_(enum_mode6)[num]); break; case EMSdevice::EMS_DEVICE_FLAG_RC20: case EMSdevice::EMS_DEVICE_FLAG_RC20_N: - mode = uuid::read_flash_string(FL_(enum_mode2)[num]); + mode = read_flash_string(FL_(enum_mode2)[num]); break; case EMSdevice::EMS_DEVICE_FLAG_RC30: case EMSdevice::EMS_DEVICE_FLAG_RC35: case EMSdevice::EMS_DEVICE_FLAG_RC30_N: - mode = uuid::read_flash_string(FL_(enum_mode3)[num]); + mode = read_flash_string(FL_(enum_mode3)[num]); break; case EMSdevice::EMS_DEVICE_FLAG_RC300: case EMSdevice::EMS_DEVICE_FLAG_RC100: - mode = uuid::read_flash_string(FL_(enum_mode)[num]); + mode = read_flash_string(FL_(enum_mode)[num]); break; case EMSdevice::EMS_DEVICE_FLAG_JUNKERS: - mode = uuid::read_flash_string(FL_(enum_mode4)[num]); + mode = read_flash_string(FL_(enum_mode4)[num]); break; case EMSdevice::EMS_DEVICE_FLAG_CRF: - mode = uuid::read_flash_string(FL_(enum_mode5)[num]); + mode = read_flash_string(FL_(enum_mode5)[num]); break; default: LOG_WARNING(F("Set mode: Invalid mode")); @@ -2673,13 +2673,8 @@ void Thermostat::register_device_values() { FL_(ibaCalIntTemperature), DeviceValueUOM::DEGREES, MAKE_CF_CB(set_calinttemp)); - register_device_value(TAG_THERMOSTAT_DATA, - &heatingpid_, - DeviceValueType::ENUM, - FL_(enum_PID), - FL_(heatingPID), - DeviceValueUOM::NONE, - MAKE_CF_CB(set_heatingpid)); + register_device_value( + TAG_THERMOSTAT_DATA, &heatingpid_, DeviceValueType::ENUM, FL_(enum_PID), FL_(heatingPID), DeviceValueUOM::NONE, MAKE_CF_CB(set_heatingpid)); register_device_value(TAG_THERMOSTAT_DATA, &backlight_, DeviceValueType::BOOL, nullptr, FL_(backlight), DeviceValueUOM::NONE, MAKE_CF_CB(set_backlight)); register_device_value(TAG_DEVICE_DATA_WW, &wwMode_, DeviceValueType::ENUM, FL_(enum_wwMode3), FL_(wwMode), DeviceValueUOM::NONE, MAKE_CF_CB(set_wwmode)); break; diff --git a/src/devices/thermostat.h b/src/devices/thermostat.h index cfad3e888..9cba96ec4 100644 --- a/src/devices/thermostat.h +++ b/src/devices/thermostat.h @@ -127,7 +127,7 @@ class Thermostat : public EMSdevice { static std::string mode_tostring(uint8_t mode); - virtual bool publish_ha_config(); + virtual bool publish_ha_device_config(); private: static uuid::log::Logger logger_;