ZAM/PowerTimer-Firmware
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Compare commits

base: ZAM:main
Branches Tags
ZAM:main
ZAM:jeopardy
ZAM:segment_pwm
..
compare: ZAM:segment_pwm
Branches Tags
ZAM:jeopardy
ZAM:main
ZAM:segment_pwm

No commits in common. "main" and "segment_pwm" have entirely different histories.
main ... segment_pw

1 changed files with 1 additions and 1 deletions
Show stats Expand all files Collapse all files

2
src/main.c
View file

@ -245,7 +245,7 @@ static void update_countdown_fsm(uint32_t time_ms)
&& (time_in_state > 3000) && (time_in_state > 3000)
&& ((time_ms - buttons_get_last_change_time(BTN_ON)) > 500) && ((time_ms - buttons_get_last_change_time(BTN_ON)) > 500)
&& ((time_ms - buttons_get_last_change_time(BTN_ON)) % 500 == 0))) { && ((time_ms - buttons_get_last_change_time(BTN_ON)) % 500 == 0))) {
if(countdown_time_remaining < 10 * ONE_MINUTE) { if(m_countdown_off_time < 10 * ONE_MINUTE) {
m_countdown_off_time += 10 * ONE_MINUTE; m_countdown_off_time += 10 * ONE_MINUTE;
} else { } else {
m_countdown_off_time += countdown_time_remaining; // double remaining time m_countdown_off_time += countdown_time_remaining; // double remaining time