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

Merge branch 'log_sensor' into integration

Browse Source
This commit is contained in:
J. Nick Koston
2025-08-18 18:33:15 -05:00
parent aa608f3a92 59c93cf3f1
commit deadb8d9be
8 changed files with 49 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -153,8 +153,8 @@ void CCS811Component::dump_config() {
ESP_LOGCONFIG(TAG, "CCS811"); ESP_LOGCONFIG(TAG, "CCS811");
LOG_I2C_DEVICE(this) LOG_I2C_DEVICE(this)
LOG_UPDATE_INTERVAL(this) LOG_UPDATE_INTERVAL(this)
LOG_SENSOR(" ", "CO2 Sensor", this->co2_) LOG_SENSOR(" ", "CO2 Sensor", this->co2_);
LOG_SENSOR(" ", "TVOC Sensor", this->tvoc_) LOG_SENSOR(" ", "TVOC Sensor", this->tvoc_);
LOG_TEXT_SENSOR(" ", "Firmware Version Sensor", this->version_) LOG_TEXT_SENSOR(" ", "Firmware Version Sensor", this->version_)
if (this->baseline_) { if (this->baseline_) {
ESP_LOGCONFIG(TAG, " Baseline: %04X", *this->baseline_); ESP_LOGCONFIG(TAG, " Baseline: %04X", *this->baseline_);

8
esphome/components/grove_gas_mc_v2/grove_gas_mc_v2.cpp
View File

@@ -58,10 +58,10 @@ void GroveGasMultichannelV2Component::dump_config() {
ESP_LOGCONFIG(TAG, "Grove Multichannel Gas Sensor V2"); ESP_LOGCONFIG(TAG, "Grove Multichannel Gas Sensor V2");
LOG_I2C_DEVICE(this) LOG_I2C_DEVICE(this)
LOG_UPDATE_INTERVAL(this) LOG_UPDATE_INTERVAL(this)
LOG_SENSOR(" ", "Nitrogen Dioxide", this->nitrogen_dioxide_sensor_) LOG_SENSOR(" ", "Nitrogen Dioxide", this->nitrogen_dioxide_sensor_);
LOG_SENSOR(" ", "Ethanol", this->ethanol_sensor_) LOG_SENSOR(" ", "Ethanol", this->ethanol_sensor_);
LOG_SENSOR(" ", "Carbon Monoxide", this->carbon_monoxide_sensor_) LOG_SENSOR(" ", "Carbon Monoxide", this->carbon_monoxide_sensor_);
LOG_SENSOR(" ", "TVOC", this->tvoc_sensor_) LOG_SENSOR(" ", "TVOC", this->tvoc_sensor_);
if (this->is_failed()) { if (this->is_failed()) {
switch (this->error_code_) { switch (this->error_code_) {

8
esphome/components/hlw8012/hlw8012.cpp
View File

@@ -43,10 +43,10 @@ void HLW8012Component::dump_config() {
" Voltage Divider: %.1f", " Voltage Divider: %.1f",
this->change_mode_every_, this->current_resistor_ * 1000.0f, this->voltage_divider_); this->change_mode_every_, this->current_resistor_ * 1000.0f, this->voltage_divider_);
LOG_UPDATE_INTERVAL(this) LOG_UPDATE_INTERVAL(this)
LOG_SENSOR(" ", "Voltage", this->voltage_sensor_) LOG_SENSOR(" ", "Voltage", this->voltage_sensor_);
LOG_SENSOR(" ", "Current", this->current_sensor_) LOG_SENSOR(" ", "Current", this->current_sensor_);
LOG_SENSOR(" ", "Power", this->power_sensor_) LOG_SENSOR(" ", "Power", this->power_sensor_);
LOG_SENSOR(" ", "Energy", this->energy_sensor_) LOG_SENSOR(" ", "Energy", this->energy_sensor_);
} }
float HLW8012Component::get_setup_priority() const { return setup_priority::DATA; } float HLW8012Component::get_setup_priority() const { return setup_priority::DATA; }
void HLW8012Component::update() { void HLW8012Component::update() {

2
esphome/components/pulse_width/pulse_width.cpp
View File

@@ -17,7 +17,7 @@ void IRAM_ATTR PulseWidthSensorStore::gpio_intr(PulseWidthSensorStore *arg) {
} }
void PulseWidthSensor::dump_config() { void PulseWidthSensor::dump_config() {
LOG_SENSOR("", "Pulse Width", this) LOG_SENSOR("", "Pulse Width", this);
LOG_UPDATE_INTERVAL(this) LOG_UPDATE_INTERVAL(this)
LOG_PIN(" Pin: ", this->pin_); LOG_PIN(" Pin: ", this->pin_);
} }

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

@@ -6,6 +6,33 @@ namespace sensor {
static const char *const TAG = "sensor"; static const char *const TAG = "sensor";
// Function implementation of LOG_SENSOR macro to reduce code size
void log_sensor(const char *tag, const char *prefix, const char *type, Sensor *obj) {
if (obj == nullptr) {
return;
}
ESP_LOGCONFIG(tag,
"%s%s '%s'\n"
"%s State Class: '%s'\n"
"%s Unit of Measurement: '%s'\n"
"%s Accuracy Decimals: %d",
prefix, type, obj->get_name().c_str(), prefix, state_class_to_string(obj->get_state_class()).c_str(),
prefix, obj->get_unit_of_measurement().c_str(), prefix, obj->get_accuracy_decimals());
if (!obj->get_device_class().empty()) {
ESP_LOGCONFIG(tag, "%s Device Class: '%s'", prefix, obj->get_device_class().c_str());
}
if (!obj->get_icon().empty()) {
ESP_LOGCONFIG(tag, "%s Icon: '%s'", prefix, obj->get_icon().c_str());
}
if (obj->get_force_update()) {
ESP_LOGV(tag, "%s Force Update: YES", prefix);
}
}
std::string state_class_to_string(StateClass state_class) { std::string state_class_to_string(StateClass state_class) {
switch (state_class) { switch (state_class) {
case STATE_CLASS_MEASUREMENT: case STATE_CLASS_MEASUREMENT:

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

@@ -12,26 +12,11 @@
namespace esphome { namespace esphome {
namespace sensor { namespace sensor {
#define LOG_SENSOR(prefix, type, obj) \ // Forward declaration
if ((obj) != nullptr) { \ void log_sensor(const char *tag, const char *prefix, const char *type, Sensor *obj);
ESP_LOGCONFIG(TAG, \
"%s%s '%s'\n" \ // Macro that calls the function - kept for backward compatibility
"%s State Class: '%s'\n" \ #define LOG_SENSOR(prefix, type, obj) log_sensor(TAG, prefix, LOG_STR_LITERAL(type), obj)
"%s Unit of Measurement: '%s'\n" \
"%s Accuracy Decimals: %d", \
prefix, LOG_STR_LITERAL(type), (obj)->get_name().c_str(), prefix, \
state_class_to_string((obj)->get_state_class()).c_str(), prefix, \
(obj)->get_unit_of_measurement().c_str(), prefix, (obj)->get_accuracy_decimals()); \
if (!(obj)->get_device_class().empty()) { \
ESP_LOGCONFIG(TAG, "%s Device Class: '%s'", prefix, (obj)->get_device_class().c_str()); \
} \
if (!(obj)->get_icon().empty()) { \
ESP_LOGCONFIG(TAG, "%s Icon: '%s'", prefix, (obj)->get_icon().c_str()); \
} \
if ((obj)->get_force_update()) { \
ESP_LOGV(TAG, "%s Force Update: YES", prefix); \
} \
}
#define SUB_SENSOR(name) \ #define SUB_SENSOR(name) \
protected: \ protected: \

6
esphome/components/ufire_ec/ufire_ec.cpp
View File

@@ -105,9 +105,9 @@ void UFireECComponent::dump_config() {
ESP_LOGCONFIG(TAG, "uFire-EC"); ESP_LOGCONFIG(TAG, "uFire-EC");
LOG_I2C_DEVICE(this) LOG_I2C_DEVICE(this)
LOG_UPDATE_INTERVAL(this) LOG_UPDATE_INTERVAL(this)
LOG_SENSOR(" ", "EC Sensor", this->ec_sensor_) LOG_SENSOR(" ", "EC Sensor", this->ec_sensor_);
LOG_SENSOR(" ", "Temperature Sensor", this->temperature_sensor_) LOG_SENSOR(" ", "Temperature Sensor", this->temperature_sensor_);
LOG_SENSOR(" ", "Temperature Sensor external", this->temperature_sensor_external_) LOG_SENSOR(" ", "Temperature Sensor external", this->temperature_sensor_external_);
ESP_LOGCONFIG(TAG, ESP_LOGCONFIG(TAG,
" Temperature Compensation: %f\n" " Temperature Compensation: %f\n"
" Temperature Coefficient: %f", " Temperature Coefficient: %f",

6
esphome/components/ufire_ise/ufire_ise.cpp
View File

@@ -142,9 +142,9 @@ void UFireISEComponent::dump_config() {
ESP_LOGCONFIG(TAG, "uFire-ISE"); ESP_LOGCONFIG(TAG, "uFire-ISE");
LOG_I2C_DEVICE(this) LOG_I2C_DEVICE(this)
LOG_UPDATE_INTERVAL(this) LOG_UPDATE_INTERVAL(this)
LOG_SENSOR(" ", "PH Sensor", this->ph_sensor_) LOG_SENSOR(" ", "PH Sensor", this->ph_sensor_);
LOG_SENSOR(" ", "Temperature Sensor", this->temperature_sensor_) LOG_SENSOR(" ", "Temperature Sensor", this->temperature_sensor_);
LOG_SENSOR(" ", "Temperature Sensor external", this->temperature_sensor_external_) LOG_SENSOR(" ", "Temperature Sensor external", this->temperature_sensor_external_);
} }
} // namespace ufire_ise } // namespace ufire_ise