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

fix: enhance timer functionality by adding description and adjusting log messages

Browse Source
This commit is contained in:
Oliver Kleinecke
2025-02-19 15:03:25 +01:00
parent 43e306998b
commit 943b024b33
2 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -236,11 +236,12 @@ std::array<bool, 16> DynamicLampComponent::get_lamp_outputs_by_name_(std::string
return this->get_lamp_outputs(lamp_index); return this->get_lamp_outputs(lamp_index);
} }
bool DynamicLampComponent::add_timer(std::string lamp_list_str, bool timer_active, uint8_t action, uint8_t hour, bool DynamicLampComponent::add_timer(std::string timer_desc, std::string lamp_list_str, bool timer_active, uint8_t action, uint8_t hour,
uint8_t minute, bool monday, bool tuesday, bool wednesday, bool thursday, uint8_t minute, bool monday, bool tuesday, bool wednesday, bool thursday,
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;
strncpy(reinterpret_cast<char *>(new_timer.desc), timer_desc.c_str(), 40);
unsigned char lamp_list_bytes[2] = {0, 0}; unsigned char lamp_list_bytes[2] = {0, 0};
for (uint8_t i = 0; i < lamp_list.size(); i++) { for (uint8_t i = 0; i < lamp_list.size(); i++) {
if (lamp_list[i] == true && !this->active_lamps_[i].active) { if (lamp_list[i] == true && !this->active_lamps_[i].active) {
@@ -270,11 +271,11 @@ bool DynamicLampComponent::add_timer(std::string lamp_list_str, bool timer_activ
new_timer.begin_date = begin_date; new_timer.begin_date = begin_date;
new_timer.end_date = end_date; new_timer.end_date = end_date;
unsigned char* timer_as_bytes = static_cast<unsigned char*>(static_cast<void*>(&new_timer)); unsigned char* timer_as_bytes = static_cast<unsigned char*>(static_cast<void*>(&new_timer));
ESP_LOGV(TAG, "Added new timer for lamp %s, active %d, action %d, hour %d, minute %d, monday %d, tuesday %d, wednesday %d, thursday %d, friday %d, saturday %d, sunday %d", ESP_LOGV(TAG, "Added new timer %s with lamp-list %s, active %d, action %d, hour %d, minute %d, monday %d, tuesday %d, wednesday %d, thursday %d, friday %d, saturday %d, sunday %d",
lamp_list_str.c_str(), new_timer.active, new_timer.action, new_timer.hour, new_timer.minute, new_timer.monday, new_timer.tuesday, new_timer.wednesday, new_timer.desc, lamp_list_str.c_str(), new_timer.active, new_timer.action, new_timer.hour, new_timer.minute, new_timer.monday,
new_timer.thursday, new_timer.friday, new_timer.saturday, new_timer.sunday); new_timer.tuesday, new_timer.wednesday, new_timer.thursday, new_timer.friday, new_timer.saturday, new_timer.sunday);
ESP_LOGV(TAG, "Size of struct is %" PRIu8 "", static_cast<uint8_t>(sizeof(new_timer))); ESP_LOGV(TAG, "Size of struct is %" PRIu8 "", static_cast<uint8_t>(sizeof(new_timer)));
this->fram_->write((2048), timer_as_bytes, 24); this->fram_->write((2048), timer_as_bytes, 64);
return true; return true;
} }
@@ -303,7 +304,7 @@ std::vector<bool> DynamicLampComponent::build_lamp_list_from_list_str_(std::stri
void DynamicLampComponent::read_timers_to_log() { void DynamicLampComponent::read_timers_to_log() {
DynamicLampTimer timer; DynamicLampTimer timer;
this->fram_->read((2048), reinterpret_cast<unsigned char *>(&timer), 24); this->fram_->read((2048), reinterpret_cast<unsigned char *>(&timer), 64);
std::string lamp_names_str = ""; std::string lamp_names_str = "";
for (uint8_t j = 0; j < 16; j++) { for (uint8_t j = 0; j < 16; j++) {
bool lamp_included = static_cast<bool>(timer.lamp_list[j / 8] & (1 << (j % 8))); bool lamp_included = static_cast<bool>(timer.lamp_list[j / 8] & (1 << (j % 8)));
@@ -314,8 +315,8 @@ void DynamicLampComponent::read_timers_to_log() {
lamp_names_str += this->active_lamps_[j].name; lamp_names_str += this->active_lamps_[j].name;
} }
} }
ESP_LOGV(TAG, "Timer found: [ active: %d, action: %d, hour: %d, minute: %d, monday: %d, tuesday: %d, wednesday: %d, thursday: %d, friday: %d, saturday: %d, sunday: %d ]", 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.active, timer.action, timer.hour, timer.minute, timer.monday, timer.tuesday, timer.desc, timer.active, timer.action, timer.hour, timer.minute, timer.monday, timer.tuesday,
timer.wednesday, timer.thursday, timer.friday, timer.saturday, timer.sunday); timer.wednesday, timer.thursday, timer.friday, timer.saturday, timer.sunday);
ESP_LOGV(TAG, "Timer active for lamps %s", lamp_names_str.c_str()); ESP_LOGV(TAG, "Timer active for lamps %s", lamp_names_str.c_str());
} }

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

@@ -69,7 +69,7 @@ struct CombinedLamp {
}; };
struct DynamicLampTimer { struct DynamicLampTimer {
unsigned char validation[3] = { 'D', 'L', 'T' }; unsigned char timer_desc[40];
unsigned char lamp_list[2]; unsigned char lamp_list[2];
uint8_t action : 3; uint8_t action : 3;
uint8_t hour : 5; uint8_t hour : 5;
@@ -82,7 +82,7 @@ struct DynamicLampTimer {
bool friday : 1; bool friday : 1;
bool saturday : 1; bool saturday : 1;
bool sunday : 1; bool sunday : 1;
unsigned char :0; bool respect_dst : 1;
time_t begin_date : 64; time_t begin_date : 64;
time_t end_date : 64; time_t end_date : 64;
}; };
@@ -104,7 +104,7 @@ class DynamicLampComponent : public Component {
void add_output_to_lamp(std::string lamp_name, LinkedOutput *output); void add_output_to_lamp(std::string lamp_name, LinkedOutput *output);
void remove_output_from_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); std::array<bool, 16> get_lamp_outputs(uint8_t lamp_number);
bool add_timer(std::string lamp_name, bool timer_active, uint8_t mode, uint8_t hour, 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, uint8_t minute, bool monday, bool tuesday, bool wednesday, bool thursday,
bool friday, bool saturday, bool sunday); bool friday, bool saturday, bool sunday);
void read_timers_to_log(); void read_timers_to_log();