Merge remote-tracking branch 'origin/dev' into ezo_pmp-tables-progmem

esphome/components/ezo_pmp/ezo_pmp.cpp

@@ -1,6 +1,7 @@
 #include "ezo_pmp.h"
 #include "esphome/core/log.h"
 #include "esphome/core/hal.h"
+#include "esphome/core/progmem.h"
 
 namespace esphome::ezo_pmp {
 
@@ -31,11 +32,24 @@ static const uint16_t EZO_PMP_COMMAND_READ_ABSOLUTE_TOTAL_VOLUME_DOSED = 65;
 static const uint16_t EZO_PMP_COMMAND_READ_CALIBRATION_STATUS = 129;
 static const uint16_t EZO_PMP_COMMAND_READ_PUMP_VOLTAGE = 257;
 
-static const std::string DOSING_MODE_NONE = "None";
-static const std::string DOSING_MODE_VOLUME = "Volume";
-static const std::string DOSING_MODE_VOLUME_OVER_TIME = "Volume/Time";
-static const std::string DOSING_MODE_CONSTANT_FLOW_RATE = "Constant Flow Rate";
-static const std::string DOSING_MODE_CONTINUOUS = "Continuous";
+enum DosingMode : uint8_t {
+  DOSING_MODE_NONE,
+  DOSING_MODE_VOLUME,
+  DOSING_MODE_VOLUME_OVER_TIME,
+  DOSING_MODE_CONSTANT_FLOW_RATE,
+  DOSING_MODE_CONTINUOUS,
+};
+PROGMEM_STRING_TABLE(DosingModeStrings, "None", "Volume", "Volume/Time", "Constant Flow Rate", "Continuous");
+
+static void publish_dosing_mode(text_sensor::TextSensor *sensor, DosingMode mode) {
+  if (sensor == nullptr)
+    return;
+  char text[DosingModeStrings::MAX_LENGTH + 1];
+  ESPHOME_strncpy_P(text, reinterpret_cast<ESPHOME_PGM_P>(DosingModeStrings::get_progmem_str(mode, DOSING_MODE_NONE)),
+                    sizeof(text));
+  if (sensor->state != text)
+    sensor->publish_state(text);
+}
 
 void EzoPMP::dump_config() {
   LOG_I2C_DEVICE(this);
@@ -202,8 +216,7 @@ void EzoPMP::read_command_result_() {
 
       if (!this->is_dosing_flag_ && !this->is_paused_flag_) {
         // If pump is not paused and not dispensing
-        if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_NONE)
-          this->dosing_mode_->publish_state(DOSING_MODE_NONE);
+        publish_dosing_mode(this->dosing_mode_, DOSING_MODE_NONE);
       }
 
       break;
@@ -259,31 +272,26 @@ void EzoPMP::read_command_result_() {
       // Non-Read Commands
 
     case EZO_PMP_COMMAND_DOSE_VOLUME:  // Volume Dispensing (page 55)
-      if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_VOLUME)
-        this->dosing_mode_->publish_state(DOSING_MODE_VOLUME);
+      publish_dosing_mode(this->dosing_mode_, DOSING_MODE_VOLUME);
       break;
 
     case EZO_PMP_COMMAND_DOSE_VOLUME_OVER_TIME:  // Dose over time (page 56)
-      if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_VOLUME_OVER_TIME)
-        this->dosing_mode_->publish_state(DOSING_MODE_VOLUME_OVER_TIME);
+      publish_dosing_mode(this->dosing_mode_, DOSING_MODE_VOLUME_OVER_TIME);
       break;
 
     case EZO_PMP_COMMAND_DOSE_WITH_CONSTANT_FLOW_RATE:  // Constant Flow Rate (page 57)
-      if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_CONSTANT_FLOW_RATE)
-        this->dosing_mode_->publish_state(DOSING_MODE_CONSTANT_FLOW_RATE);
+      publish_dosing_mode(this->dosing_mode_, DOSING_MODE_CONSTANT_FLOW_RATE);
       break;
 
     case EZO_PMP_COMMAND_DOSE_CONTINUOUSLY:  // Continuous Dispensing (page 54)
-      if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_CONTINUOUS)
-        this->dosing_mode_->publish_state(DOSING_MODE_CONTINUOUS);
+      publish_dosing_mode(this->dosing_mode_, DOSING_MODE_CONTINUOUS);
       break;
 
     case EZO_PMP_COMMAND_STOP_DOSING:  // Stop (page 62)
       this->is_paused_flag_ = false;
       if (this->is_paused_)
         this->is_paused_->publish_state(this->is_paused_flag_);
-      if (this->dosing_mode_ && this->dosing_mode_->state != DOSING_MODE_NONE)
-        this->dosing_mode_->publish_state(DOSING_MODE_NONE);
+      publish_dosing_mode(this->dosing_mode_, DOSING_MODE_NONE);
       break;
 
     case EZO_PMP_COMMAND_EXEC_ARBITRARY_COMMAND_ADDRESS: