sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-09-28 16:12:24 +01:00
Code Issues Releases Wiki Activity

Merge branch 'integration' into memory_api

Browse Source
This commit is contained in:
J. Nick Koston
2025-09-26 15:00:59 -05:00
parent 71f35c849d e94b3321c8
commit f4134f21ba
2 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
esphome/components/esp32_improv/esp32_improv_component.cpp
View File

@@ -195,6 +195,7 @@ void ESP32ImprovComponent::set_status_indicator_state_(bool state) {
#endif #endif
} }
#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_DEBUG
const char *ESP32ImprovComponent::state_to_string_(improv::State state) { const char *ESP32ImprovComponent::state_to_string_(improv::State state) {
switch (state) { switch (state) {
case improv::STATE_STOPPED: case improv::STATE_STOPPED:
@@ -211,6 +212,7 @@ const char *ESP32ImprovComponent::state_to_string_(improv::State state) {
return "UNKNOWN"; return "UNKNOWN";
} }
} }
#endif
bool ESP32ImprovComponent::check_identify_() { bool ESP32ImprovComponent::check_identify_() {
uint32_t now = millis(); uint32_t now = millis();
@@ -225,10 +227,12 @@ bool ESP32ImprovComponent::check_identify_() {
} }
void ESP32ImprovComponent::set_state_(improv::State state) { void ESP32ImprovComponent::set_state_(improv::State state) {
#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_DEBUG
if (this->state_ != state) { if (this->state_ != state) {
ESP_LOGD(TAG, "State transition: %s (0x%02X) -> %s (0x%02X)", this->state_to_string_(this->state_), this->state_, ESP_LOGD(TAG, "State transition: %s (0x%02X) -> %s (0x%02X)", this->state_to_string_(this->state_), this->state_,
this->state_to_string_(state), state); this->state_to_string_(state), state);
} }
#endif
this->state_ = state; this->state_ = state;
if (this->status_ != nullptr && (this->status_->get_value().empty() || this->status_->get_value()[0] != state)) { if (this->status_ != nullptr && (this->status_->get_value().empty() || this->status_->get_value()[0] != state)) {
this->status_->set_value(ByteBuffer::wrap(static_cast<uint8_t>(state))); this->status_->set_value(ByteBuffer::wrap(static_cast<uint8_t>(state)));

2
esphome/components/esp32_improv/esp32_improv_component.h
View File

@@ -108,7 +108,9 @@ class ESP32ImprovComponent : public Component {
void process_incoming_data_(); void process_incoming_data_();
void on_wifi_connect_timeout_(); void on_wifi_connect_timeout_();
bool check_identify_(); bool check_identify_();
#if ESPHOME_LOG_LEVEL >= ESPHOME_LOG_LEVEL_DEBUG
const char *state_to_string_(improv::State state); const char *state_to_string_(improv::State state);
#endif
}; };
// NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables) // NOLINTNEXTLINE(cppcoreguidelines-avoid-non-const-global-variables)