test fork

Dependencies:   SPI_TFTx2 SPI_TFTx2_ILI9341 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary_9341 by Tick Tock

Revision:
65:821fc79cd7fe
Parent:
63:aa3bf6a33635
Child:
66:b7476ce7a59e
Child:
67:2022fce701d0
--- a/main.cpp	Wed Apr 10 13:08:54 2013 +0000
+++ b/main.cpp	Wed Apr 10 15:08:38 2013 +0000
@@ -97,7 +97,7 @@
 char header[5];
 char data[8];
 signed long motorRPM;
-unsigned char skin = 0;
+unsigned char skin = ttSkin ;
 unsigned char dtePeriod = 14; //ten minute averaging interval
 float mph[39]={0};
 float kW[39]={0};
@@ -157,7 +157,8 @@
     logMsg(sTemp);
     
     // revision
-    sprintf(sTemp,"CANary firmware rev62\n");
+    //sprintf(sTemp,"CANary firmware rev62\n"); // wrong rev, should be rev63
+    sprintf(sTemp,"CANary firmware rev64\n");
     logMsg(sTemp);
 
     // Look for new binary on thumbdrive
@@ -436,6 +437,29 @@
                                 }
 
                                 break;
+                                
+                            case 30: // rightmost on top row
+                                
+                                if (dMode[whichTouched]==config1Screen) {
+                                    // step through skins
+                                    if( skin < maxSkin ) skin += 1 ;
+                                    else skin = 0 ;
+                                    
+                                    // repaint both screens, I think
+                                    lastDMode[whichTouched]=99;//repaint to clear highlight
+                                    // and re-paint the other screen too, to see new skin there
+                                    lastDMode[whichTouched ^ 1]=99; // repaint other screen (^ = XOR)
+                                    
+                                    //sprintf(sTemp,"Changed Skin to %d.\n");
+                                    //logMsg(sTemp);
+                                    //saveConfig();
+                                    //spkr.beep(2000,0.25);
+                               
+                                }else{
+                                    lastDMode[whichTouched]=99;//repaint to clear highlight
+                                }
+
+                                break;
                             //----------------------------------
                             //----------------------------------
                             case 01: // col 0 row 1