diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.cpp b/esphome/components/dynamic_lamp/dynamic_lamp.cpp index 5fea079baa..fc0d1b200a 100644 --- a/esphome/components/dynamic_lamp/dynamic_lamp.cpp +++ b/esphome/components/dynamic_lamp/dynamic_lamp.cpp @@ -95,13 +95,10 @@ void DynamicLamp::set_available_outputs(std::string output_list) { { std::string id_string; id_string = static_cast(this->trim_(s.c_str())); - this->available_outputs_[counter] = id_string; + this->available_outputs_[counter] = static_cast({true, id_string, 0, 0, 1.0, false}); counter++; } } -void DynamicLamp::set_lamp_count(uint8_t lamp_count) { - -} void DynamicLamp::set_lamp_values_(uint8_t lamp_number, bool active, uint16_t selected_outputs, uint8_t mode, uint8_t mode_value) { diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.h b/esphome/components/dynamic_lamp/dynamic_lamp.h index 78b3ed3ca5..b37b1c83af 100644 --- a/esphome/components/dynamic_lamp/dynamic_lamp.h +++ b/esphome/components/dynamic_lamp/dynamic_lamp.h @@ -19,7 +19,7 @@ enum LinkedOutputModeIdx : uint8_t { struct LinkedOutput { bool active = false; - std::string output_id = ""; + std::string output_id; uint8_t mode = 0; optional min_value; optional max_value; @@ -28,7 +28,6 @@ struct LinkedOutput { struct CombinedLamp { bool active = false; - LinkedOutput used_outputs[16]; }; class DynamicLamp : public Component { @@ -36,7 +35,6 @@ class DynamicLamp : public Component { void setup() override; void loop() override; void dump_config() override; - void set_lamp_count(uint8_t lamp_count); void set_available_outputs(std::string output_list); void set_save_mode(uint8_t save_mode); @@ -48,8 +46,7 @@ class DynamicLamp : public Component { std::string_view trim_(std::string_view str); CombinedLamp active_lamps_[16]; - std::string available_outputs_[16] = { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }; - uint8_t lamp_count_; + LinkedOutput available_outputs_[16]; uint8_t save_mode_; };