diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.cpp b/esphome/components/dynamic_lamp/dynamic_lamp.cpp index 0a696f53c7..c8465091f8 100644 --- a/esphome/components/dynamic_lamp/dynamic_lamp.cpp +++ b/esphome/components/dynamic_lamp/dynamic_lamp.cpp @@ -278,8 +278,7 @@ bool DynamicLampComponent::add_timer(std::string lamp_list_str, bool timer_activ } std::vector DynamicLampComponent::build_lamp_list_from_list_str_(std::string lamp_list_str) { - std::string delimiter = ","; - std::vector lamp_list_vector = this->split_to_int_vector_(lamp_list_str, delimiter); + std::vector lamp_list_vector = this->split_to_int_vector_(lamp_list_str, ","); std::vector lamp_list; memset(&lamp_list, 0, 16); if (lamp_list_vector.size() > 16) { @@ -337,11 +336,12 @@ void DynamicLampComponent::restore_lamp_values_(uint8_t lamp_number) { this->active_lamps_[lamp_number].active = false; } -std::vector DynamicLampComponent::split_to_int_vector_(const std::string& s, const std::string& delimiter) { +std::vector DynamicLampComponent::split_to_int_vector_(std::string lamp_list_str, std::string& delimiter) { std::vector tokens; - std::stringstream sstream(s); + std::stringstream sstream; + sstream << std::string_view(lamp_list_str); std::string segment; - while(std::getline(test, segment, delimiter)) { + while(std::getline(sstream, segment, delimiter)) { tokens.push_back(static_cast(atoi(segment.c_str()))); } return tokens; diff --git a/esphome/components/dynamic_lamp/dynamic_lamp.h b/esphome/components/dynamic_lamp/dynamic_lamp.h index 249e5153f1..9805f4b462 100644 --- a/esphome/components/dynamic_lamp/dynamic_lamp.h +++ b/esphome/components/dynamic_lamp/dynamic_lamp.h @@ -118,7 +118,7 @@ class DynamicLampComponent : public Component { bool write_state_(uint8_t lamp_number, float state); uint8_t get_lamp_index_by_name_(std::string lamp_name); std::array get_lamp_outputs_by_name_(std::string lamp_name); - std::vector split_to_int_vector_(const std::string& s, const std::string& delimiter); + std::vector split_to_int_vector_(std::string lamp_list_str, std::string delimiter) std::vector build_lamp_list_from_list_str_(std::string lamp_list_str); CombinedLamp active_lamps_[16];