namespace

esphome/components/cover/cover.cpp

@@ -1,11 +1,11 @@
 #include "cover.h"
 #include "esphome/core/defines.h"
 #include "esphome/core/controller_registry.h"
-#include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 
 #include <strings.h>
 
+#include "esphome/core/log.h"
+
 namespace esphome::cover {
 
 static const char *const TAG = "cover";
@@ -39,13 +39,13 @@ Cover::Cover() : position{COVER_OPEN} {}
 
 CoverCall::CoverCall(Cover *parent) : parent_(parent) {}
 CoverCall &CoverCall::set_command(const char *command) {
-  if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("OPEN")) == 0) {
+  if (strcasecmp(command, "OPEN") == 0) {
     this->set_command_open();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("CLOSE")) == 0) {
+  } else if (strcasecmp(command, "CLOSE") == 0) {
     this->set_command_close();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("STOP")) == 0) {
+  } else if (strcasecmp(command, "STOP") == 0) {
     this->set_command_stop();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("TOGGLE")) == 0) {
+  } else if (strcasecmp(command, "TOGGLE") == 0) {
     this->set_command_toggle();
   } else {
     ESP_LOGW(TAG, "'%s' - Unrecognized command %s", this->parent_->get_name().c_str(), command);

esphome/components/mqtt/mqtt_alarm_control_panel.cpp

@@ -1,6 +1,5 @@
 #include "mqtt_alarm_control_panel.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 
 #include "mqtt_const.h"
 
@@ -19,21 +18,21 @@ void MQTTAlarmControlPanelComponent::setup() {
   this->alarm_control_panel_->add_on_state_callback([this]() { this->publish_state(); });
   this->subscribe(this->get_command_topic_(), [this](const std::string &topic, const std::string &payload) {
     auto call = this->alarm_control_panel_->make_call();
-    if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("ARM_AWAY")) == 0) {
+    if (strcasecmp(payload.c_str(), "ARM_AWAY") == 0) {
       call.arm_away();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("ARM_HOME")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "ARM_HOME") == 0) {
       call.arm_home();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("ARM_NIGHT")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "ARM_NIGHT") == 0) {
       call.arm_night();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("ARM_VACATION")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "ARM_VACATION") == 0) {
       call.arm_vacation();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("ARM_CUSTOM_BYPASS")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "ARM_CUSTOM_BYPASS") == 0) {
       call.arm_custom_bypass();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("DISARM")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "DISARM") == 0) {
       call.disarm();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("PENDING")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "PENDING") == 0) {
       call.pending();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("TRIGGERED")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "TRIGGERED") == 0) {
       call.triggered();
     } else {
       ESP_LOGW(TAG, "'%s': Received unknown command payload %s", this->friendly_name_().c_str(), payload.c_str());

esphome/components/mqtt/mqtt_lock.cpp

@@ -1,6 +1,5 @@
 #include "mqtt_lock.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 
 #include "mqtt_const.h"
 
@@ -17,11 +16,11 @@ MQTTLockComponent::MQTTLockComponent(lock::Lock *a_lock) : lock_(a_lock) {}
 
 void MQTTLockComponent::setup() {
   this->subscribe(this->get_command_topic_(), [this](const std::string &topic, const std::string &payload) {
-    if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("LOCK")) == 0) {
+    if (strcasecmp(payload.c_str(), "LOCK") == 0) {
       this->lock_->lock();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("UNLOCK")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "UNLOCK") == 0) {
       this->lock_->unlock();
-    } else if (ESPHOME_strcasecmp_P(payload.c_str(), ESPHOME_PSTR("OPEN")) == 0) {
+    } else if (strcasecmp(payload.c_str(), "OPEN") == 0) {
       this->lock_->open();
     } else {
       ESP_LOGW(TAG, "'%s': Received unknown status payload: %s", this->friendly_name_().c_str(), payload.c_str());

esphome/components/uln2003/uln2003.cpp

@@ -1,11 +1,23 @@
 #include "uln2003.h"
 #include "esphome/core/log.h"
 
-namespace esphome {
-namespace uln2003 {
+namespace esphome::uln2003 {
 
 static const char *const TAG = "uln2003.stepper";
 
+static const LogString *step_mode_to_log_string(ULN2003StepMode mode) {
+  switch (mode) {
+    case ULN2003_STEP_MODE_FULL_STEP:
+      return LOG_STR("FULL STEP");
+    case ULN2003_STEP_MODE_HALF_STEP:
+      return LOG_STR("HALF STEP");
+    case ULN2003_STEP_MODE_WAVE_DRIVE:
+      return LOG_STR("WAVE DRIVE");
+    default:
+      return LOG_STR("UNKNOWN");
+  }
+}
+
 void ULN2003::setup() {
   this->pin_a_->setup();
   this->pin_b_->setup();
@@ -42,22 +54,7 @@ void ULN2003::dump_config() {
   LOG_PIN("  Pin B: ", this->pin_b_);
   LOG_PIN("  Pin C: ", this->pin_c_);
   LOG_PIN("  Pin D: ", this->pin_d_);
-  const char *step_mode_s;
-  switch (this->step_mode_) {
-    case ULN2003_STEP_MODE_FULL_STEP:
-      step_mode_s = "FULL STEP";
-      break;
-    case ULN2003_STEP_MODE_HALF_STEP:
-      step_mode_s = "HALF STEP";
-      break;
-    case ULN2003_STEP_MODE_WAVE_DRIVE:
-      step_mode_s = "WAVE DRIVE";
-      break;
-    default:
-      step_mode_s = "UNKNOWN";
-      break;
-  }
-  ESP_LOGCONFIG(TAG, "  Step Mode: %s", step_mode_s);
+  ESP_LOGCONFIG(TAG, "  Step Mode: %s", LOG_STR_ARG(step_mode_to_log_string(this->step_mode_)));
 }
 void ULN2003::write_step_(int32_t step) {
   int32_t n = this->step_mode_ == ULN2003_STEP_MODE_HALF_STEP ? 8 : 4;
@@ -90,5 +87,4 @@ void ULN2003::write_step_(int32_t step) {
   this->pin_d_->digital_write((res >> 3) & 1);
 }
 
-}  // namespace uln2003
-}  // namespace esphome
+}  // namespace esphome::uln2003

esphome/components/uln2003/uln2003.h

@@ -4,8 +4,7 @@
 #include "esphome/core/hal.h"
 #include "esphome/components/stepper/stepper.h"
 
-namespace esphome {
-namespace uln2003 {
+namespace esphome::uln2003 {
 
 enum ULN2003StepMode {
   ULN2003_STEP_MODE_FULL_STEP,
@@ -40,5 +39,4 @@ class ULN2003 : public stepper::Stepper, public Component {
   int32_t current_uln_pos_{0};
 };
 
-}  // namespace uln2003
-}  // namespace esphome
+}  // namespace esphome::uln2003

esphome/components/valve/valve.cpp

@@ -2,8 +2,6 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/controller_registry.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
-
 #include <strings.h>
 
 namespace esphome {
@@ -40,13 +38,13 @@ Valve::Valve() : position{VALVE_OPEN} {}
 
 ValveCall::ValveCall(Valve *parent) : parent_(parent) {}
 ValveCall &ValveCall::set_command(const char *command) {
-  if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("OPEN")) == 0) {
+  if (strcasecmp(command, "OPEN") == 0) {
     this->set_command_open();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("CLOSE")) == 0) {
+  } else if (strcasecmp(command, "CLOSE") == 0) {
     this->set_command_close();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("STOP")) == 0) {
+  } else if (strcasecmp(command, "STOP") == 0) {
     this->set_command_stop();
-  } else if (ESPHOME_strcasecmp_P(command, ESPHOME_PSTR("TOGGLE")) == 0) {
+  } else if (strcasecmp(command, "TOGGLE") == 0) {
     this->set_command_toggle();
   } else {
     ESP_LOGW(TAG, "'%s' - Unrecognized command %s", this->parent_->get_name().c_str(), command);

esphome/core/helpers.cpp

@@ -3,7 +3,6 @@
 #include "esphome/core/defines.h"
 #include "esphome/core/hal.h"
 #include "esphome/core/log.h"
-#include "esphome/core/progmem.h"
 #include "esphome/core/string_ref.h"
 
 #include <strings.h>
@@ -452,15 +451,15 @@ std::string format_bin(const uint8_t *data, size_t length) {
 }
 
 ParseOnOffState parse_on_off(const char *str, const char *on, const char *off) {
-  if (on == nullptr && ESPHOME_strcasecmp_P(str, ESPHOME_PSTR("on")) == 0)
+  if (on == nullptr && strcasecmp(str, "on") == 0)
     return PARSE_ON;
   if (on != nullptr && strcasecmp(str, on) == 0)
     return PARSE_ON;
-  if (off == nullptr && ESPHOME_strcasecmp_P(str, ESPHOME_PSTR("off")) == 0)
+  if (off == nullptr && strcasecmp(str, "off") == 0)
     return PARSE_OFF;
   if (off != nullptr && strcasecmp(str, off) == 0)
     return PARSE_OFF;
-  if (ESPHOME_strcasecmp_P(str, ESPHOME_PSTR("toggle")) == 0)
+  if (strcasecmp(str, "toggle") == 0)
     return PARSE_TOGGLE;
 
   return PARSE_NONE;

esphome/core/progmem.h

@@ -12,10 +12,6 @@
 #define ESPHOME_strncpy_P strncpy_P
 #define ESPHOME_strncat_P strncat_P
 #define ESPHOME_snprintf_P snprintf_P
-#define ESPHOME_strcmp_P strcmp_P
-#define ESPHOME_strcasecmp_P strcasecmp_P
-#define ESPHOME_strncmp_P strncmp_P
-#define ESPHOME_strncasecmp_P strncasecmp_P
 // Type for pointers to PROGMEM strings (for use with ESPHOME_F return values)
 using ProgmemStr = const __FlashStringHelper *;
 #else
@@ -25,10 +21,6 @@ using ProgmemStr = const __FlashStringHelper *;
 #define ESPHOME_strncpy_P strncpy
 #define ESPHOME_strncat_P strncat
 #define ESPHOME_snprintf_P snprintf
-#define ESPHOME_strcmp_P strcmp
-#define ESPHOME_strcasecmp_P strcasecmp
-#define ESPHOME_strncmp_P strncmp
-#define ESPHOME_strncasecmp_P strncasecmp
 // Type for pointers to strings (no PROGMEM on non-ESP8266 platforms)
 using ProgmemStr = const char *;
 #endif