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

fix: update add_available_output method to use pointer for FloatOutput and rename add_lamp method

Browse Source
This commit is contained in:
Oliver Kleinecke
2025-02-15 11:31:01 +01:00
parent dd065a12f5
commit ff8c45a529
2 changed files with 5 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -93,7 +93,7 @@ void DynamicLamp::set_save_mode(uint8_t save_mode) {
this->save_mode_ = 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; uint8_t counter = 0;
while (this->available_outputs_[counter].active) { while (this->available_outputs_[counter].active) {
counter++; counter++;
@@ -106,7 +106,7 @@ void DynamicLamp::add_available_output(FloatOutput &output) {
counter++; counter++;
} }
uint8_t DynamicLamp::add_lamp() { uint8_t DynamicLamp::add_lamp_() {
uint8_t i = 0; uint8_t i = 0;
while (i < 16) { while (i < 16) {
if (!this->active_lamps_[i].active) { if (!this->active_lamps_[i].active) {

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

@@ -20,7 +20,7 @@ enum LinkedOutputModeIdx : uint8_t {
struct LinkedOutput { struct LinkedOutput {
bool active = false; bool active = false;
FloatOutput &output; output::FloatOutput *output;
uint8_t output_index; uint8_t output_index;
uint8_t mode = 0; uint8_t mode = 0;
optional<float> min_value; optional<float> min_value;
@@ -38,11 +38,11 @@ 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 add_available_output(FloatOutput &output); void add_available_output(output::FloatOutput * output);
void set_save_mode(uint8_t save_mode); void set_save_mode(uint8_t save_mode);
protected: protected:
uint8_t add_lamp(); uint8_t add_lamp_();
std::array<bool, 16> get_lamp_outputs_(uint8_t lamp_number); std::array<bool, 16> get_lamp_outputs_(uint8_t lamp_number);
void add_lamp_output_(uint8_t lamp_number, LinkedOutput output); void add_lamp_output_(uint8_t lamp_number, LinkedOutput output);
void restore_lamp_values_(uint8_t lamp_number); void restore_lamp_values_(uint8_t lamp_number);