From ff8c45a529dc86f945e91f1a0a87896974f02a7a Mon Sep 17 00:00:00 2001 From: Oliver Kleinecke Date: Sat, 15 Feb 2025 11:31:01 +0100 Subject: [PATCH] fix: update add_available_output method to use pointer for FloatOutput and rename add_lamp method --- esphome/components/dynamic_lamp/dynamic_lamp.cpp | 4 ++-- esphome/components/dynamic_lamp/dynamic_lamp.h | 6 +++--- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.cpp b/esphome/components/dynamic_lamp/dynamic_lamp.cpp index 411ae0fb94..586d1bb6ae 100644 --- a/esphome/components/dynamic_lamp/dynamic_lamp.cpp +++ b/esphome/components/dynamic_lamp/dynamic_lamp.cpp @@ -93,7 +93,7 @@ void DynamicLamp::set_save_mode(uint8_t save_mode) { this->save_mode_ = save_mode; } -void DynamicLamp::add_available_output(FloatOutput &output) { +void DynamicLamp::add_available_output(output::FloatOutput * output) { uint8_t counter = 0; while (this->available_outputs_[counter].active) { counter++; @@ -106,7 +106,7 @@ void DynamicLamp::add_available_output(FloatOutput &output) { counter++; } -uint8_t DynamicLamp::add_lamp() { +uint8_t DynamicLamp::add_lamp_() { uint8_t i = 0; while (i < 16) { if (!this->active_lamps_[i].active) { diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.h b/esphome/components/dynamic_lamp/dynamic_lamp.h index 496a56b3ce..4bf5cd50ef 100644 --- a/esphome/components/dynamic_lamp/dynamic_lamp.h +++ b/esphome/components/dynamic_lamp/dynamic_lamp.h @@ -20,7 +20,7 @@ enum LinkedOutputModeIdx : uint8_t { struct LinkedOutput { bool active = false; - FloatOutput &output; + output::FloatOutput *output; uint8_t output_index; uint8_t mode = 0; optional min_value; @@ -38,11 +38,11 @@ class DynamicLamp : public Component { void setup() override; void loop() override; void dump_config() override; - void add_available_output(FloatOutput &output); + void add_available_output(output::FloatOutput * output); void set_save_mode(uint8_t save_mode); protected: - uint8_t add_lamp(); + uint8_t add_lamp_(); std::array get_lamp_outputs_(uint8_t lamp_number); void add_lamp_output_(uint8_t lamp_number, LinkedOutput output); void restore_lamp_values_(uint8_t lamp_number);