Diff: main.cpp

Revision:

63:aa3bf6a33635

Parent:

62:ffd15edb5431

Child:

64:a2b3c7201faa

Child:

65:821fc79cd7fe

--- a/main.cpp	Wed Apr 10 12:55:22 2013 +0000
+++ b/main.cpp	Wed Apr 10 13:08:54 2013 +0000
@@ -157,7 +157,7 @@
     logMsg(sTemp);
     
     // revision
-    sprintf(sTemp,"CANary firmware rev59\n");
+    sprintf(sTemp,"CANary firmware rev62\n");
     logMsg(sTemp);
 
     // Look for new binary on thumbdrive
@@ -359,21 +359,17 @@
                 switch (sMode) {
                     case 0: // no select
                         break;
-                    case 1: // select screen
-                        // is this col(0:2)*10 + row(0:2) + screen(0:1)*30
-                        //switch (buttonX(lastTouch.x,3)*10+buttonY(lastTouch.y,3)) {
-                        
+                    case 1: // select screen                        
                         //--------------
                         // gg - 4x4 touch
                         tCol = buttonX(lastTouch.x,4) ;
-                        //if( tCol >= 4 ){ tCol -= 4; tScrn = 1 ; } // touch is on screen 1
                         if( tCol >= 4 ){ tCol -= 4; } // touch is on screen 1
                         
                         tRow = buttonY(lastTouch.y,4) ;
                         
-                        highlightButton( tCol,tRow, whichTouched, 4,4) ; // g - highlight
+                        highlightButton( tCol,tRow, whichTouched, 4,4) ; // gg - highlight
                         
-                        if( tRow == tNavRow ) tRow = 7 ; //                    
+                        if( tRow == tNavRow ) tRow = 7 ; // gg                   
                         switch ( (tCol*10) + tRow ) {
                             //---------------------------------
                             case 00: // 00 on screen 0 or 1