From 64341d1d1887f16df87b88266402c15a109ac4e1 Mon Sep 17 00:00:00 2001
From: Paul Monigatti <paulmonigatti@users.noreply.github.com>
Date: Mon, 20 Sep 2021 04:30:41 +1200
Subject: [PATCH] Fix MQTT discovery for sensor state_class (#2331)

---
 esphome/components/sensor/sensor.cpp | 8 ++++----
 esphome/components/sensor/sensor.h   | 4 ++--
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/esphome/components/sensor/sensor.cpp b/esphome/components/sensor/sensor.cpp
index 128f36fc93..0dc0275715 100644
--- a/esphome/components/sensor/sensor.cpp
+++ b/esphome/components/sensor/sensor.cpp
@@ -6,15 +6,15 @@ namespace sensor {
 
 static const char *const TAG = "sensor";
 
-const LogString *state_class_to_string(StateClass state_class) {
+std::string state_class_to_string(StateClass state_class) {
   switch (state_class) {
     case STATE_CLASS_MEASUREMENT:
-      return LOG_STR("measurement");
+      return "measurement";
     case STATE_CLASS_TOTAL_INCREASING:
-      return LOG_STR("total_increasing");
+      return "total_increasing";
     case STATE_CLASS_NONE:
     default:
-      return LOG_STR("");
+      return "";
   }
 }
 
diff --git a/esphome/components/sensor/sensor.h b/esphome/components/sensor/sensor.h
index 3fc993cb2c..d284f931b1 100644
--- a/esphome/components/sensor/sensor.h
+++ b/esphome/components/sensor/sensor.h
@@ -14,7 +14,7 @@ namespace sensor {
     if (!(obj)->get_device_class().empty()) { \
       ESP_LOGCONFIG(TAG, "%s  Device Class: '%s'", prefix, (obj)->get_device_class().c_str()); \
     } \
-    ESP_LOGCONFIG(TAG, "%s  State Class: '%s'", prefix, LOG_STR_ARG(state_class_to_string((obj)->get_state_class()))); \
+    ESP_LOGCONFIG(TAG, "%s  State Class: '%s'", prefix, state_class_to_string((obj)->get_state_class()).c_str()); \
     ESP_LOGCONFIG(TAG, "%s  Unit of Measurement: '%s'", prefix, (obj)->get_unit_of_measurement().c_str()); \
     ESP_LOGCONFIG(TAG, "%s  Accuracy Decimals: %d", prefix, (obj)->get_accuracy_decimals()); \
     if (!(obj)->get_icon().empty()) { \
@@ -37,7 +37,7 @@ enum StateClass : uint8_t {
   STATE_CLASS_TOTAL_INCREASING = 2,
 };
 
-const LogString *state_class_to_string(StateClass state_class);
+std::string state_class_to_string(StateClass state_class);
 
 /** Base-class for all sensors.
  *