sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-04-16 07:40:29 +01:00
Code Issues Releases Wiki Activity

fix: improve lamp name comparison in remove_lamp and add_output_to_lamp functions of DynamicLampComponent

Browse Source
This commit is contained in:
Oliver Kleinecke 2025-02-19 23:04:52 +01:00
parent 5dfbd6ee2f
commit aa8ba87371
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -147,7 +147,8 @@ void DynamicLampComponent::add_lamp(std::string name) {
void DynamicLampComponent::remove_lamp(std::string lamp_name) {
uint8_t i = 0;
while (i < this->lamp_count_) {
if (this->active_lamps_[i].name == lamp_name.c_str()) {
std::string str(this->active_lamps_[i].name, this->active_lamps_[i].name + sizeof this->active_lamps_[i].name / sizeof this->active_lamps_[i].name[0]);
if (str == lamp_name) {
for (uint8_t j = 0; j < 16; j++) {
uint8_t k = 0;
uint8_t l = j;
@ -188,7 +189,8 @@ void DynamicLampComponent::add_output_to_lamp(std::string lamp_name, LinkedOutpu
}
uint8_t i = 0;
while (i < 16) {
if (this->active_lamps_[i].name == lamp_name.c_str()) {
std::string str(this->active_lamps_[i].name, this->active_lamps_[i].name + sizeof this->active_lamps_[i].name / sizeof this->active_lamps_[i].name[0]);
if (str == lamp_name) {
uint8_t j = 0;
if (output->output_index > 7) {
j = 1;
@ -208,7 +210,8 @@ void DynamicLampComponent::add_output_to_lamp(std::string lamp_name, LinkedOutpu
void DynamicLampComponent::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) {
std::string str(this->active_lamps_[i].name, this->active_lamps_[i].name + sizeof this->active_lamps_[i].name / sizeof this->active_lamps_[i].name[0]);
if (str == lamp_name) {
uint8_t k = output->output_index;
uint8_t j = 0;
if (output->output_index > 7) {