From 2e1ac80a2589ac46b30e9567d96faec602d8292e Mon Sep 17 00:00:00 2001
From: "bsongis@gmail.com"
 <bsongis@gmail.com@8db61ce9-5e8f-94c8-fa6b-1d1c8bcca7d0>
Date: Mon, 5 Aug 2013 22:44:11 +0000
Subject: [PATCH] [all] Shift in timer modes (negative toggle modes, I wonder
 if I shouldn't remove them, as I don't see how they can be useful...)

---
 src/gui/menu_model.cpp | 2 +-
 src/lcd.cpp            | 8 ++++----
 src/lcd.h              | 6 +++---
 3 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/src/gui/menu_model.cpp b/src/gui/menu_model.cpp
index 629b5f11b..fb97a7e88 100644
--- a/src/gui/menu_model.cpp
+++ b/src/gui/menu_model.cpp
@@ -1029,7 +1029,7 @@ void menuModelSetup(uint8_t event)
             div_t qr = div(timer->start, 60);
             switch (m_posHorz) {
               case 0:
-                CHECK_INCDEC_MODELVAR(event, timer->mode, -2*(MAX_PSWITCH+NUM_CSW)-1, TMR_VAROFS-1+2*(MAX_PSWITCH+NUM_CSW));
+                CHECK_INCDEC_MODELVAR(event, timer->mode, -2*(MAX_PSWITCH+NUM_CSW), TMR_VAROFS-1+2*(MAX_PSWITCH+NUM_CSW));
                 break;
               case 1:
                 CHECK_INCDEC_MODELVAR_ZERO(event, qr.quot, 59);
diff --git a/src/lcd.cpp b/src/lcd.cpp
index e6c9fc751..c563c8624 100644
--- a/src/lcd.cpp
+++ b/src/lcd.cpp
@@ -947,10 +947,6 @@ void putsCurve(xcoord_t x, uint8_t y, int8_t idx, LcdFlags att)
 
 void putsTmrMode(xcoord_t x, uint8_t y, int8_t mode, LcdFlags att)
 {
-  if (mode >= TMR_VAROFS+MAX_PSWITCH+NUM_CSW) {
-    mode++;
-  }
-
   if (mode < 0) {
     mode = TMR_VAROFS - mode - 1;
     lcd_putcAtt(x-1*FW, y, '!', att);
@@ -960,6 +956,10 @@ void putsTmrMode(xcoord_t x, uint8_t y, int8_t mode, LcdFlags att)
     return;
   }
 
+  if (mode >= TMR_VAROFS+MAX_PSWITCH+NUM_CSW) {
+    mode++;
+  }
+
   putsSwitches(x, y, mode-(TMR_VAROFS-1), att);
 }
 
diff --git a/src/lcd.h b/src/lcd.h
index 926abd7f8..a826df7f4 100644
--- a/src/lcd.h
+++ b/src/lcd.h
@@ -74,9 +74,9 @@
 #define INVERS          0x02
 #define DBLSIZE         0x04
 #ifdef BOLD_FONT
-#define BOLD            0x40
+  #define BOLD            0x40
 #else
-#define BOLD            0x00
+  #define BOLD            0x00
 #endif
 
 /* lcd putc flags */
@@ -85,8 +85,8 @@
 /* lcd puts flags */
 /* no 0x80 here because of "GV"1 which is aligned LEFT */
 /* no 0x10 here because of "MODEL"01 which uses LEADING0 */
+#define STRCONDENSED    0x10 /* means that THRm will be displayed as THR */
 #define BSS             0x20
-#define STRCONDENSED    0x40 /* means that THRm will be displayed as THR */
 #define ZCHAR           0x80
 
 /* lcd outdez flags */