From 47252ca067fa7930de8b2d288c1dd0412236a8d1 Mon Sep 17 00:00:00 2001 From: Oliver Kleinecke Date: Fri, 14 Feb 2025 15:56:45 +0100 Subject: [PATCH] fix: update output logging to use active status and output_id in DynamicLamp --- esphome/components/dynamic_lamp/dynamic_lamp.cpp | 4 ++-- esphome/components/dynamic_lamp/dynamic_lamp.h | 2 +- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.cpp b/esphome/components/dynamic_lamp/dynamic_lamp.cpp index 8067993951..16d1ec4518 100644 --- a/esphome/components/dynamic_lamp/dynamic_lamp.cpp +++ b/esphome/components/dynamic_lamp/dynamic_lamp.cpp @@ -76,8 +76,8 @@ void DynamicLamp::dump_config() { this->save_mode_ = 0; } for (uint8_t i = 0; i < 16; i++) { - if (this->available_outputs_[i] != "") { - ESP_LOGCONFIG(TAG, "Using output with id %s as output number %" PRIu8 "", this->available_outputs_[i].c_str(), i); + if (this->available_outputs_[i].active) { + ESP_LOGCONFIG(TAG, "Using output with id %s as output number %" PRIu8 "", this->available_outputs_[i].output_id, i); } } } diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.h b/esphome/components/dynamic_lamp/dynamic_lamp.h index 09f72a5978..ee6fab65da 100644 --- a/esphome/components/dynamic_lamp/dynamic_lamp.h +++ b/esphome/components/dynamic_lamp/dynamic_lamp.h @@ -44,7 +44,7 @@ class DynamicLamp : public Component { void add_lamp_output_(uint8_t lamp_number, LinkedOutput output); void restore_lamp_values_(uint8_t lamp_number); void set_lamp_values_(uint8_t lamp_number, bool active, uint16_t selected_outputs, uint8_t mode, uint8_t mode_value); - size_t index_of_(Iter first, Iter last, typename const std::iterator_traits::value_type& x) + size_t index_of_(Iter first, Iter last, typename const std::iterator_traits::value_type& x); std::string_view ltrim_(std::string_view str); std::string_view rtrim_(std::string_view str); std::string_view trim_(std::string_view str);