sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-17 18:52:19 +01:00
Code Issues Releases Wiki Activity

Merge branch 'state_class_to_string_flash' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-05 11:34:06 -05:00
parent ed7cbb9111 4248cbc596
commit ba2f6027fb
6 changed files with 20 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/i2c/i2c.cpp
View File

@@ -44,7 +44,7 @@ ErrorCode I2CDevice::write_register(uint8_t a_register, const uint8_t *data, siz
buffer[0] = a_register; buffer[0] = a_register;
std::copy(data, data + len, buffer + 1); std::copy(data, data + len, buffer + 1);
return bus_->write_readv(this->address_, buffer, len + 1, nullptr, 0); return this->bus_->write_readv(this->address_, buffer, len + 1, nullptr, 0);
} }
ErrorCode I2CDevice::write_register16(uint16_t a_register, const uint8_t *data, size_t len) const { ErrorCode I2CDevice::write_register16(uint16_t a_register, const uint8_t *data, size_t len) const {
@@ -54,7 +54,7 @@ ErrorCode I2CDevice::write_register16(uint16_t a_register, const uint8_t *data,
buffer[0] = a_register >> 8; buffer[0] = a_register >> 8;
buffer[1] = a_register; buffer[1] = a_register;
std::copy(data, data + len, buffer + 2); std::copy(data, data + len, buffer + 2);
return bus_->write_readv(this->address_, buffer, len + 2, nullptr, 0); return this->bus_->write_readv(this->address_, buffer, len + 2, nullptr, 0);
} }
bool I2CDevice::read_bytes_16(uint8_t a_register, uint16_t *data, uint8_t len) { bool I2CDevice::read_bytes_16(uint8_t a_register, uint16_t *data, uint8_t len) {

6
esphome/components/i2c/i2c_bus.h
View File

@@ -16,10 +16,10 @@ template<size_t STACK_SIZE> class SmallBufferWithHeapFallback {
public: public:
uint8_t *get(size_t size) { uint8_t *get(size_t size) {
if (size <= STACK_SIZE) { if (size <= STACK_SIZE) {
return stack_buffer_; return this->stack_buffer_;
} }
heap_buffer_ = std::unique_ptr<uint8_t[]>(new uint8_t[size]); this->heap_buffer_ = std::unique_ptr<uint8_t[]>(new uint8_t[size]);
return heap_buffer_.get(); return this->heap_buffer_.get();
} }
private: private:

7
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) {
#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] = state_class_to_string(this->sensor_->get_state_class()); root[MQTT_STATE_CLASS] = state_class_to_string(this->sensor_->get_state_class());
#endif
}
config.command_topic = false; config.command_topic = false;
} }

1
esphome/components/sen5x/sen5x.cpp
View File

@@ -38,6 +38,7 @@ void SEN5XComponent::setup() {
this->mark_failed(); this->mark_failed();
return; return;
} }
delay(20); // per datasheet
uint16_t raw_read_status; uint16_t raw_read_status;
if (!this->read_data(raw_read_status)) { if (!this->read_data(raw_read_status)) {

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.
* *