sascha/esphome
1
0
Fork 0
mirror of https://github.com/esphome/esphome.git synced 2025-03-13 22:28:14 +00:00
Code Issues Releases Wiki Activity

fix: change get_lamp_name return type from unsigned char* to std::string in DynamicLampComponent

Browse Source
This commit is contained in:
Oliver Kleinecke 2025-02-19 23:00:34 +01:00
parent 92dc31c636
commit 5dfbd6ee2f
2 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -416,8 +416,9 @@ bool DynamicLampComponent::write_state_(uint8_t lamp_number, float state) {
return false;
}
unsigned char* DynamicLampComponent::get_lamp_name(uint8_t lamp_number) {
return this->active_lamps_[lamp_number].name;
std::string DynamicLampComponent::get_lamp_name(uint8_t lamp_number) {
std::string str(this->active_lamps_[lamp_number].name, this->active_lamps_[lamp_number].name + sizeof this->active_lamps_[lamp_number].name / sizeof this->active_lamps_[lamp_number].name[0]);
return str;
}
void DynamicLampComponent::set_lamp_values_(uint8_t lamp_number, bool active, uint16_t selected_outputs, uint8_t mode, uint8_t mode_value) {

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

@ -104,7 +104,7 @@ class DynamicLampComponent : public Component {
void set_save_mode(uint8_t save_mode);
void add_lamp(std::string name);
void remove_lamp(std::string name);
unsigned char* get_lamp_name(uint8_t lamp_number);
std::string get_lamp_name(uint8_t lamp_number);
void add_output_to_lamp(std::string lamp_name, LinkedOutput *output);
void remove_output_from_lamp(std::string lamp_name, LinkedOutput *output);
std::array<bool, 16> get_lamp_outputs(uint8_t lamp_number);