arduino/esp-clock
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

small improvement

Browse Source
This commit is contained in:
Nicu Hodos 2025-02-10 11:02:03 +01:00
parent e2607ffe6d
commit b90a190504
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/devices.h
View File

@ -137,7 +137,7 @@ namespace Devices {
Display::Brightness::brightnessChangedCallback = []{ Display::Brightness::brightnessChangedCallback = []{
brightnessMqtt->updateState(Display::Brightness::current); brightnessMqtt->updateState(Display::Brightness::current);
}; };
Display::Timer::timerCallback = [](int8 current){ Display::Timer::remainingCallback = [](int8 current){
timerRemainingMqtt->updateState(to_string(current).c_str()); timerRemainingMqtt->updateState(to_string(current).c_str());
}; };
} }

13
include/display.h
View File

@ -79,7 +79,7 @@ namespace Display {
namespace Timer { namespace Timer {
int8 timer = 0, current = 0; int8 timer = 0, current = 0;
void (*timerCallback)(int8); void (*remainingCallback)(int8);
Task tDisplayTimer(SECONDS(10), TASK_ONCE + 1, Task tDisplayTimer(SECONDS(10), TASK_ONCE + 1,
[]{ []{
@ -108,14 +108,17 @@ namespace Display {
tDisplayTimer.setIterations(TASK_FOREVER); tDisplayTimer.setIterations(TASK_FOREVER);
tDisplayTimer.restart(); tDisplayTimer.restart();
} }
if (timerCallback) timerCallback(current); if (remainingCallback) remainingCallback(current);
}, &ts, false, nullptr, }, &ts, false,
[]{
current = timer+1;
return true;
},
[]{ []{
tDisplayTimer.disable(); tDisplayTimer.disable();
}); });
void start() { void start() {
current = timer+1;
tTimer.restart(); tTimer.restart();
} }
@ -223,7 +226,7 @@ namespace Display {
void changeHourFormat24(bool format24) { void changeHourFormat24(bool format24) {
hourFormat24 = format24; hourFormat24 = format24;
drawTime(); tDisplayTime.restart();
if (hourFormatChangedCallback) hourFormatChangedCallback(); if (hourFormatChangedCallback) hourFormatChangedCallback();
} }