From 5d8a7171310bd869f994245b6cbed37575d28108 Mon Sep 17 00:00:00 2001
From: bsongis <bsongis@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Sun, 15 Jan 2012 09:26:45 +0000
Subject: [PATCH] Bug in minute beeps

---
 src/gruvin9x.cpp         | 2 +-
 src/statistics_views.cpp | 4 ++--
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/gruvin9x.cpp b/src/gruvin9x.cpp
index fab7e7c33..327a50689 100644
--- a/src/gruvin9x.cpp
+++ b/src/gruvin9x.cpp
@@ -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;
           }
diff --git a/src/statistics_views.cpp b/src/statistics_views.cpp
index 38a0d66bf..4a38de855 100644
--- a/src/statistics_views.cpp
+++ b/src/statistics_views.cpp
@@ -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"));