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

refactor: rename lamp management methods for consistency and clarity

Browse Source
This commit is contained in:
Oliver Kleinecke
2025-02-15 13:55:23 +01:00
parent 3e4e20cd52
commit 83fa338435
2 changed files with 11 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -91,11 +91,11 @@ void DynamicLamp::dump_config() {
ESP_LOGCONFIG(TAG, "Using output with id %s as output number %" PRIu8 "", this->available_outputs_[i].output_id.c_str(), i); ESP_LOGCONFIG(TAG, "Using output with id %s as output number %" PRIu8 "", this->available_outputs_[i].output_id.c_str(), i);
} }
} }
this->add_lamp_("First Lamp"); this->add_lamp("First Lamp");
this->add_lamp_output_("First Lamp", &this->available_outputs_[0]); this->add_lamp_output("First Lamp", *this->available_outputs_[0]);
this->add_lamp_output_("First Lamp", &this->available_outputs_[1]); this->add_lamp_output("First Lamp", *this->available_outputs_[1]);
this->add_lamp_output_("First Lamp", &this->available_outputs_[2]); this->add_lamp_output("First Lamp", *this->available_outputs_[2]);
this->add_lamp_output_("First Lamp", &this->available_outputs_[3]); this->add_lamp_output("First Lamp", *this->available_outputs_[3]);
} }
void DynamicLamp::set_save_mode(uint8_t save_mode) { void DynamicLamp::set_save_mode(uint8_t save_mode) {
@@ -118,7 +118,7 @@ void DynamicLamp::add_available_output(output::FloatOutput * output, std::string
counter++; counter++;
} }
void DynamicLamp::add_lamp_(std::string name) { void DynamicLamp::add_lamp(std::string name) {
if (this->lamp_count_ < 15) { if (this->lamp_count_ < 15) {
this->lamp_count_++; this->lamp_count_++;
this->active_lamps_[this->lamp_count_].active = true; this->active_lamps_[this->lamp_count_].active = true;
@@ -133,7 +133,7 @@ void DynamicLamp::add_lamp_(std::string name) {
this->status_set_warning(); this->status_set_warning();
} }
void DynamicLamp::remove_lamp_(std::string name) { void DynamicLamp::remove_lamp(std::string name) {
uint8_t i = 0; uint8_t i = 0;
while (i < this->lamp_count_) { while (i < this->lamp_count_) {
if (this->active_lamps_[i].name == name) { if (this->active_lamps_[i].name == name) {
@@ -149,7 +149,7 @@ void DynamicLamp::remove_lamp_(std::string 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_lamp_output(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) {

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

@@ -45,12 +45,13 @@ class DynamicLamp : public Component {
void dump_config() override; void dump_config() override;
void add_available_output(output::FloatOutput * output, std::string output_id); void add_available_output(output::FloatOutput * output, std::string output_id);
void set_save_mode(uint8_t save_mode); void set_save_mode(uint8_t save_mode);
void add_lamp(std::string name);
void remove_lamp(std::string name);
void add_lamp_output(std::string lamp_name, LinkedOutput *output);
protected: protected:
void begin(); void begin();
void add_lamp_(std::string name);
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_(std::string lamp_name, LinkedOutput &output);
void restore_lamp_values_(uint8_t lamp_number); void restore_lamp_values_(uint8_t lamp_number);
void set_lamp_values_(uint8_t lamp_number, bool active, uint16_t selected_outputs, uint8_t mode, uint8_t mode_value); void set_lamp_values_(uint8_t lamp_number, bool active, uint16_t selected_outputs, uint8_t mode, uint8_t mode_value);