Исправлен будильник по дням + немного причесаны диагностические сообщения

[esp-clock.git] / alarm.cpp

diff --git a/alarm.cpp b/alarm.cpp
index 4028b6c165ec886f61f2873f4256f56ec4c2478d..e609dbaed71f95ccbe614dac210c02fc943407d5 100644 (file)
--- a/alarm.cpp
+++ b/alarm.cpp
@@ -22,7 +22,7 @@ void checkAlarm() {
   int alarm_length = cfg.getIntValue(F("alarm_length"));
   int alarm_beep_ms = cfg.getIntValue(F("alarm_beep_ms"));
   int alarm_silent_ms = cfg.getIntValue(F("alarm_silent_ms"));
   int alarm_length = cfg.getIntValue(F("alarm_length"));
   int alarm_beep_ms = cfg.getIntValue(F("alarm_beep_ms"));
   int alarm_silent_ms = cfg.getIntValue(F("alarm_silent_ms"));

-  if ( enable_alarm && hh == alarm_hour && mi == alarm_minute && alarm_days[dd?dd-1:6]!='0') {
+  if ( enable_alarm && (hh == alarm_hour) && (mi == alarm_minute) && (alarm_days[dw?dw-1:6]!='0')) {

     beep(alarm_tone, alarm_length * 1000, alarm_beep_ms, alarm_silent_ms);
   }
 }
     beep(alarm_tone, alarm_length * 1000, alarm_beep_ms, alarm_silent_ms);
   }
 }