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

fix: refactor timer logging methods in DynamicLampComponent for clarity and consistency

Browse Source
This commit is contained in:
Oliver Kleinecke 2025-02-19 20:28:31 +01:00
parent 6112ac1520
commit 26c488f6f1
2 changed files with 35 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -104,7 +104,7 @@ void DynamicLampComponent::dump_config() {
//this->add_output_to_lamp("First Lamp", &this->available_outputs_[1]);
//this->add_output_to_lamp("First Lamp", &this->available_outputs_[2]);
//this->add_output_to_lamp("First Lamp", &this->available_outputs_[3]);
std::string lamp_names_str;
/* std::string lamp_names_str;
for (uint8_t i = 0; i < 12; i++) {
if (this->timers_[i].in_use == true) {
lamp_names_str = "";
@ -123,7 +123,7 @@ void DynamicLampComponent::dump_config() {
this->timers_[i].wednesday, this->timers_[i].thursday, this->timers_[i].friday, this->timers_[i].saturday, this->timers_[i].sunday);
ESP_LOGCONFIG(TAG, "Timer active for lamps %s", lamp_names_str.c_str());
}
}
} */
}
void DynamicLampComponent::set_save_mode(uint8_t save_mode) {
@ -322,7 +322,7 @@ std::vector<bool> DynamicLampComponent::build_lamp_list_from_list_str_(std::stri
return lamp_list;
}
void DynamicLampComponent::read_timers_to_log() {
void DynamicLampComponent::read_fram_timers_to_log() {
DynamicLampTimer timer;
for (uint8_t i = 0; i < 12; i++) {
this->fram_->read((0x4000 + (i * 64)), reinterpret_cast<unsigned char *>(&timer), 64);
@ -352,6 +352,36 @@ void DynamicLampComponent::read_timers_to_log() {
}
}
void DynamicLampComponent::read_initialized_timers_to_log() {
DynamicLampTimer timer;
for (uint8_t i = 0; i < 12; i++) {
if (this->timers_[i].in_use == true) {
timer = this->timers_[i];
std::string lamp_names_str = "";
for (uint8_t j = 0; j < 16; j++) {
uint8_t k = 0;
uint8_t l = j;
if (j > 7) {
k = 1;
l = j - 8;
}
//bool lamp_included = static_cast<bool>(timer.lamp_list[j / 8] & (1 << (j % 8)));
bool lamp_included = static_cast<bool>(timer.lamp_list[k] & (1 << l));
if (lamp_included == true && this->active_lamps_[j].active == true) {
if (lamp_names_str.length() > 0) {
lamp_names_str += ", ";
}
lamp_names_str += this->active_lamps_[j].name;
}
}
ESP_LOGV(TAG, "Timer %s found: [ active: %d, action: %d, hour: %d, minute: %d, monday: %d, tuesday: %d, wednesday: %d, thursday: %d, friday: %d, saturday: %d, sunday: %d ]",
timer.timer_desc, timer.active, timer.action, timer.hour, timer.minute, timer.monday, timer.tuesday,
timer.wednesday, timer.thursday, timer.friday, timer.saturday, timer.sunday);
ESP_LOGV(TAG, "Timer active for lamps %s", lamp_names_str.c_str());
}
}
}
bool DynamicLampComponent::write_state_(uint8_t lamp_number, float state) {
if (this->active_lamps_[lamp_number].active == true) {
this->active_lamps_[lamp_number].state_ = state;

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

@ -109,7 +109,8 @@ class DynamicLampComponent : public Component {
bool add_timer(std::string timer_desc, std::string lamp_name, bool timer_active, uint8_t mode, uint8_t hour,
uint8_t minute, bool monday, bool tuesday, bool wednesday, bool thursday,
bool friday, bool saturday, bool sunday);
void read_timers_to_log();
void read_initialized_timers_to_log();
void read_fram_timers_to_log();
void clear_fram();
protected: