Bug in minute beeps

This commit is contained in:
bsongis
2012-01-15 09:26:45 +00:00
parent 8bac9c2784
commit 5d8a717131
2 changed files with 3 additions and 3 deletions
+1 -1
View File
@@ -1028,7 +1028,7 @@ FORCEINLINE void incTimers(int16_t val)
g_LightOffCounter = FLASH_DURATION;
}
if (g_eeGeneral.minuteBeep && (((timer->val ? timer->val-s_timerVal[0] : s_timerVal[0])%60)==0)) { // short beep every minute
if (g_eeGeneral.minuteBeep && (((g_model.timer1.val ? g_model.timer1.val-s_timerVal[0] : s_timerVal[0])%60)==0)) { // short beep every minute
beepWarn2();
if(g_eeGeneral.flashBeep) g_LightOffCounter = FLASH_DURATION;
}
+2 -2
View File
@@ -40,9 +40,9 @@ void menuProcStatistic(uint8_t event)
lcd_puts_P( 17*FW, FH*1, PSTR("TM2"));
putsTime( 12*FW, FH*1, s_timerVal[1], 0, 0);
lcd_puts_P( 1*FW, FH*2, PSTR("STK"));
lcd_puts_P( 1*FW, FH*2, PSTR("THR"));
putsTime( 5*FW, FH*2, s_timeCumThr, 0, 0);
lcd_puts_P( 17*FW, FH*2, PSTR("ST%"));
lcd_puts_P( 17*FW, FH*2, PSTR("TH%"));
putsTime( 12*FW, FH*2, s_timeCum16ThrP/16, 0, 0);
lcd_puts_P( 17*FW, FH*0, PSTR("TOT"));