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

refactor: update available_outputs to use LinkedOutput struct in DynamicLamp

Browse Source
This commit is contained in:
Oliver Kleinecke
2025-02-14 15:17:15 +01:00
parent 40bf321ce0
commit 1a73a7de01
2 changed files with 3 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
esphome/components/dynamic_lamp/dynamic_lamp.cpp
View File

@@ -95,13 +95,10 @@ void DynamicLamp::set_available_outputs(std::string output_list) {
{ {
std::string id_string; std::string id_string;
id_string = static_cast<std::string>(this->trim_(s.c_str())); id_string = static_cast<std::string>(this->trim_(s.c_str()));
this->available_outputs_[counter] = id_string; this->available_outputs_[counter] = static_cast<LinkedOutput>({true, id_string, 0, 0, 1.0, false});
counter++; 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) { void DynamicLamp::set_lamp_values_(uint8_t lamp_number, bool active, uint16_t selected_outputs, uint8_t mode, uint8_t mode_value) {

7
esphome/components/dynamic_lamp/dynamic_lamp.h
View File

@@ -19,7 +19,7 @@ enum LinkedOutputModeIdx : uint8_t {
struct LinkedOutput { struct LinkedOutput {
bool active = false; bool active = false;
std::string output_id = ""; std::string output_id;
uint8_t mode = 0; uint8_t mode = 0;
optional<float> min_value; optional<float> min_value;
optional<float> max_value; optional<float> max_value;
@@ -28,7 +28,6 @@ struct LinkedOutput {
struct CombinedLamp { struct CombinedLamp {
bool active = false; bool active = false;
LinkedOutput used_outputs[16];
}; };
class DynamicLamp : public Component { class DynamicLamp : public Component {
@@ -36,7 +35,6 @@ class DynamicLamp : public Component {
void setup() override; void setup() override;
void loop() override; void loop() override;
void dump_config() override; void dump_config() override;
void set_lamp_count(uint8_t lamp_count);
void set_available_outputs(std::string output_list); void set_available_outputs(std::string output_list);
void set_save_mode(uint8_t save_mode); void set_save_mode(uint8_t save_mode);
@@ -48,8 +46,7 @@ class DynamicLamp : public Component {
std::string_view trim_(std::string_view str); std::string_view trim_(std::string_view str);
CombinedLamp active_lamps_[16]; CombinedLamp active_lamps_[16];
std::string available_outputs_[16] = { "", "", "", "", "", "", "", "", "", "", "", "", "", "", "", "" }; LinkedOutput available_outputs_[16];
uint8_t lamp_count_;
uint8_t save_mode_; uint8_t save_mode_;
}; };