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

fix: update lamp list handling in add_timer and build_lamp_list_from_list_str_ for improved clarity and correctness

Browse Source
This commit is contained in:
Oliver Kleinecke
2025-02-19 11:08:55 +01:00
parent c3a9ca8e88
commit 00f88fa3f8
2 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -240,10 +240,10 @@ bool DynamicLampComponent::add_timer(std::string lamp_list_str, bool timer_activ
bool friday, bool saturday, bool sunday) { bool friday, bool saturday, bool sunday) {
std::vector<bool> lamp_list = this->build_lamp_list_from_list_str_(lamp_list_str); std::vector<bool> lamp_list = this->build_lamp_list_from_list_str_(lamp_list_str);
DynamicLampTimer new_timer; DynamicLampTimer new_timer;
uint8_t lamp_list_bytes[2]; unsigned char lamp_list_bytes[2] = {0, 0};
for (uint8_t i = 0; i < 16; i++) { for (uint8_t i = 0; i < lamp_list.size(); i++) {
if (!this->active_lamps_[i].active) { if (!this->active_lamps_[i].active) {
ESP_LOGW(TAG, "Ignoring lamp number %" PRIu8 " as there is no active lamp with that index!", lamp_list_vector[i]); ESP_LOGW(TAG, "Ignoring lamp number %" PRIu8 " as there is no active lamp with that index!", i);
continue; continue;
} }
if (lamp_list[i]) { if (lamp_list[i]) {
@@ -281,7 +281,7 @@ std::vector<bool> DynamicLampComponent::build_lamp_list_from_list_str_(std::stri
std::string delimiter = ","; std::string delimiter = ",";
std::vector<uint8_t> lamp_list_vector = this->split_to_int_vector_(lamp_list_str, delimiter); std::vector<uint8_t> lamp_list_vector = this->split_to_int_vector_(lamp_list_str, delimiter);
std::vector<bool> lamp_list; std::vector<bool> lamp_list;
memset(&lamp_list, 0, sizeof(lamp_list)); memset(&lamp_list, 0, 16);
if (lamp_list_vector.size() > 16) { if (lamp_list_vector.size() > 16) {
ESP_LOGW(TAG, "Too many lamps in list, only 16 supported!"); ESP_LOGW(TAG, "Too many lamps in list, only 16 supported!");
this->status_set_warning(); this->status_set_warning();
@@ -342,7 +342,7 @@ std::vector<uint8_t> DynamicLampComponent::split_to_int_vector_(const std::strin
size_t pos = 0; size_t pos = 0;
std::string token; std::string token;
while ((pos = s.find(delimiter)) != std::string::npos) { while ((pos = s.find(delimiter)) != std::string::npos) {
token = static_cast<uint8_t>(atoi(s.substr(0, pos))); token = static_cast<uint8_t>(atoi(s.substr(0, pos).c_str()));
tokens.push_back(token); tokens.push_back(token);
s.erase(0, pos + delimiter.length()); s.erase(0, pos + delimiter.length());
} }

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

@@ -70,7 +70,7 @@ struct CombinedLamp {
struct DynamicLampTimer { struct DynamicLampTimer {
unsigned char validation[3] = { 'D', 'L', 'T' }; unsigned char validation[3] = { 'D', 'L', 'T' };
uint8_t lamp_list[2]; unsigned char lamp_list[2];
uint8_t action : 3; uint8_t action : 3;
uint8_t hour : 5; uint8_t hour : 5;
uint8_t minute : 6; uint8_t minute : 6;