sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-10-30 22:53:59 +00:00
Code Issues Releases Wiki Activity

refactor: rename add_lamp_output to add_output_to_lamp and add remove_output_from_lamp method for improved lamp management

Browse Source
This commit is contained in:
Oliver Kleinecke
2025-02-15 14:14:20 +01:00
parent d9629d8d7a
commit ffdcaeeb30
2 changed files with 36 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -92,10 +92,10 @@ void DynamicLamp::dump_config() {
} }
} }
this->add_lamp("First Lamp"); this->add_lamp("First Lamp");
this->add_lamp_output("First Lamp", &this->available_outputs_[0]); this->add_output_to_lamp("First Lamp", &this->available_outputs_[0]);
this->add_lamp_output("First Lamp", &this->available_outputs_[1]); this->add_output_to_lamp("First Lamp", &this->available_outputs_[1]);
this->add_lamp_output("First Lamp", &this->available_outputs_[2]); this->add_output_to_lamp("First Lamp", &this->available_outputs_[2]);
this->add_lamp_output("First Lamp", &this->available_outputs_[3]); this->add_output_to_lamp("First Lamp", &this->available_outputs_[3]);
} }
void DynamicLamp::set_save_mode(uint8_t save_mode) { void DynamicLamp::set_save_mode(uint8_t save_mode) {
@@ -149,7 +149,7 @@ void DynamicLamp::remove_lamp(std::string lamp_name) {
ESP_LOGW(TAG, "No lamp with name %s defined !", lamp_name.c_str()); ESP_LOGW(TAG, "No lamp with name %s defined !", lamp_name.c_str());
} }
void DynamicLamp::add_lamp_output(std::string lamp_name, LinkedOutput *output) { void DynamicLamp::add_output_to_lamp(std::string lamp_name, LinkedOutput *output) {
uint8_t i = 0; uint8_t i = 0;
while (i < 16) { while (i < 16) {
if (this->active_lamps_[i].name == lamp_name) { if (this->active_lamps_[i].name == lamp_name) {
@@ -164,7 +164,22 @@ void DynamicLamp::add_lamp_output(std::string lamp_name, LinkedOutput *output) {
ESP_LOGW(TAG, "No lamp with name %s defined !", lamp_name.c_str()); ESP_LOGW(TAG, "No lamp with name %s defined !", lamp_name.c_str());
} }
std::array<bool, 16> DynamicLamp::get_lamp_outputs_(uint8_t lamp_number) { void DynamicLamp::remove_output_from_lamp(std::string lamp_name, LinkedOutput *output) {
uint8_t i = 0;
while (i < 16) {
if (this->active_lamps_[i].name == lamp_name) {
this->active_lamps_[i].used_outputs[output->output_index] = false;
output->in_use = false;
ESP_LOGV(TAG, "Removed output %s from lamp %s", output->output_id.c_str(), lamp_name.c_str());
return;
}
i++;
}
this->status_set_warning();
ESP_LOGW(TAG, "No lamp with name %s defined !", lamp_name.c_str());
}
std::array<bool, 16> DynamicLamp::get_lamp_outputs(uint8_t lamp_number) {
std::array<bool, 16> bool_array; std::array<bool, 16> bool_array;
for (uint8_t i = 0; i < 16; i++) { for (uint8_t i = 0; i < 16; i++) {
bool_array[i] = this->active_lamps_[lamp_number].used_outputs[i]; bool_array[i] = this->active_lamps_[lamp_number].used_outputs[i];
@@ -172,6 +187,19 @@ std::array<bool, 16> DynamicLamp::get_lamp_outputs_(uint8_t lamp_number) {
return bool_array; return bool_array;
} }
std::array<bool, 16> DynamicLamp::get_lamp_outputs_by_name(std::string lamp_name) {
uint8_t i = 0;
std::array<bool, 16> bool_array;
for (i = 0; i < this->lamp_count_; i++) {
if (this->active_lamps_[i].name == lamp_name) {
return this->get_lamp_outputs(i);
}
}
this->status_set_warning();
ESP_LOGW(TAG, "No lamp with name %s defined !", lamp_name.c_str());
return bool_array;
}
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) {
} }

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

@@ -47,7 +47,8 @@ class DynamicLamp : public Component {
void set_save_mode(uint8_t save_mode); void set_save_mode(uint8_t save_mode);
void add_lamp(std::string name); void add_lamp(std::string name);
void remove_lamp(std::string name); void remove_lamp(std::string name);
void add_lamp_output(std::string lamp_name, LinkedOutput *output); void add_output_to_lamp(std::string lamp_name, LinkedOutput *output);
void remove_output_from_lamp(std::string lamp_name, LinkedOutput *output);
protected: protected:
void begin(); void begin();