rename publish_ha* functions

emsesp · Nov 15, 2021 · c0bf623 · c0bf623
1 parent 18f22d3
commit c0bf623
Show file tree

Hide file tree

Showing 20 changed files with 31 additions and 36 deletions.
diff --git 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<EMSESP_JSON_SIZE_HA_CONFIG> 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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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
@@ -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<EMSESP_JSON_SIZE_HA_CONFIG> doc;
     doc["uniq_id"] = F_(heatpump);
     doc["ic"]      = F_(icondevice);

diff --git 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
@@ -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
@@ -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
@@ -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<EMSESP_JSON_SIZE_HA_CONFIG> doc;
     doc["uniq_id"] = F_(solar);
     doc["ic"]      = F_(icondevice);

diff --git 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
@@ -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
@@ -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
@@ -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<EMSESP_JSON_SIZE_HA_CONFIG> doc;
     doc["uniq_id"] = F_(thermostat);
     doc["ic"]      = F_(icondevice);
@@ -384,7 +384,7 @@ std::shared_ptr<Thermostat::HeatingCircuit> 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<Thermostat::HeatingCircuit> hc) {
-    uint8_t hc_num = hc->hc_num();
+    uint8_t                                        hc_num = hc->hc_num();
     StaticJsonDocument<EMSESP_JSON_SIZE_HA_CONFIG> doc;
 
     char str1[20];
@@ -437,7 +437,7 @@ void Thermostat::publish_ha_config_hc(std::shared_ptr<Thermostat::HeatingCircuit
 
     // the HA climate component only responds to auto, heat and off
     JsonArray modes = doc.createNestedArray("modes");
-    if (hc->get_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
@@ -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_;