sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-27 05:03:48 +00:00
Code Issues Releases Wiki Activity

[sensor] ESP8266: Use LogString for state_class_to_string() to save RAM (#10617)

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-05 17:51:35 -05:00
committed by GitHub
parent 1340665ac7
commit 5b283d6d38
3 changed files with 15 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
esphome/components/mqtt/mqtt_sensor.cpp
View File

@@ -58,8 +58,13 @@ void MQTTSensorComponent::send_discovery(JsonObject root, mqtt::SendDiscoveryCon
if (this->sensor_->get_force_update()) if (this->sensor_->get_force_update())
root[MQTT_FORCE_UPDATE] = true; root[MQTT_FORCE_UPDATE] = true;
if (this->sensor_->get_state_class() != STATE_CLASS_NONE) if (this->sensor_->get_state_class() != STATE_CLASS_NONE) {
root[MQTT_STATE_CLASS] = state_class_to_string(this->sensor_->get_state_class()); #ifdef USE_STORE_LOG_STR_IN_FLASH
root[MQTT_STATE_CLASS] = (const __FlashStringHelper *) state_class_to_string(this->sensor_->get_state_class());
#else
root[MQTT_STATE_CLASS] = LOG_STR_ARG(state_class_to_string(this->sensor_->get_state_class()));
#endif
}
config.command_topic = false; config.command_topic = false;
} }

13
esphome/components/sensor/sensor.cpp
View File

@@ -17,7 +17,8 @@ void log_sensor(const char *tag, const char *prefix, const char *type, Sensor *o
"%s State Class: '%s'\n" "%s State Class: '%s'\n"
"%s Unit of Measurement: '%s'\n" "%s Unit of Measurement: '%s'\n"
"%s Accuracy Decimals: %d", "%s Accuracy Decimals: %d",
prefix, type, obj->get_name().c_str(), prefix, state_class_to_string(obj->get_state_class()), prefix, prefix, type, obj->get_name().c_str(), prefix,
LOG_STR_ARG(state_class_to_string(obj->get_state_class())), prefix,
obj->get_unit_of_measurement_ref().c_str(), prefix, obj->get_accuracy_decimals()); obj->get_unit_of_measurement_ref().c_str(), prefix, obj->get_accuracy_decimals());
if (!obj->get_device_class_ref().empty()) { if (!obj->get_device_class_ref().empty()) {
@@ -33,17 +34,17 @@ void log_sensor(const char *tag, const char *prefix, const char *type, Sensor *o
} }
} }
const char *state_class_to_string(StateClass state_class) { const LogString *state_class_to_string(StateClass state_class) {
switch (state_class) { switch (state_class) {
case STATE_CLASS_MEASUREMENT: case STATE_CLASS_MEASUREMENT:
return "measurement"; return LOG_STR("measurement");
case STATE_CLASS_TOTAL_INCREASING: case STATE_CLASS_TOTAL_INCREASING:
return "total_increasing"; return LOG_STR("total_increasing");
case STATE_CLASS_TOTAL: case STATE_CLASS_TOTAL:
return "total"; return LOG_STR("total");
case STATE_CLASS_NONE: case STATE_CLASS_NONE:
default: default:
return ""; return LOG_STR("");
} }
} }

2
esphome/components/sensor/sensor.h
View File

@@ -33,7 +33,7 @@ enum StateClass : uint8_t {
STATE_CLASS_TOTAL = 3, STATE_CLASS_TOTAL = 3,
}; };
const char *state_class_to_string(StateClass state_class); const LogString *state_class_to_string(StateClass state_class);
/** Base-class for all sensors. /** Base-class for all sensors.
* *