Tick Tock / Mbed 2 deprecated CANary

Important changes to repositories hosted on mbed.com

Mbed hosted mercurial repositories are deprecated and are due to be permanently deleted in July 2026.

To keep a copy of this software download the repository Zip archive or clone locally using Mercurial.

It is also possible to export all your personal repositories from the account settings page.

Dependencies:   SPI_TFTx2_ILI9341 TFT_fonts TOUCH_TFTx2_ILI9341 mbed

Fork of CANary_corrupt by Tick Tock

Files at this revision

API Documentation at this revision

Revision 199:400b8950effa, committed 2014-08-28

Comitter:
TickTock
Date:
Thu Aug 28 10:49:02 2014 +0000
Parent:
198:4e0decce14fd
Child:
200:b2d21dcd6287
Commit message:
.

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Wed Aug 20 02:09:21 2014 +0000
+++ b/main.cpp	Thu Aug 28 10:49:02 2014 +0000
@@ -456,8 +456,10 @@
                     lwt=whichTouched;
                     if(sMode==2){ // Exit keypad mode if other screen touched
                         sMode=0; // end keypad mode
-                        dMode[0]=saveDmode[0];
-                        dMode[1]=saveDmode[1];
+                        if(saveDmode[0]<=maxScreens)
+                            dMode[0]=saveDmode[0];
+                        if(saveDmode[1]<=maxScreens)
+                            dMode[1]=saveDmode[1];
                         lastDMode[0]=99;
                         lastDMode[1]=99;
                         uidx=99;
@@ -899,8 +901,10 @@
                                     break;
                                 case 3: // col 4 row 3
                                     sMode=0; // end keypad mode
-                                    dMode[0]=saveDmode[0];
-                                    dMode[1]=saveDmode[1];
+                                    if(saveDmode[0]<=maxScreens)
+                                        dMode[0]=saveDmode[0];
+                                    if(saveDmode[1]<=maxScreens)
+                                        dMode[1]=saveDmode[1];
                                     lastDMode[0]=99;
                                     lastDMode[1]=99;
                                     uidx=99;
@@ -978,7 +982,7 @@
                 dailyGids += startGids-((lastMsg[indexLastMsg[0x5bc]].data[0]<<2)+(lastMsg[indexLastMsg[0x5bc]].data[1]>>6));
                 lHeaterOn=false;
                 if (showHealth&&!playbackOpen){
-                    if (saveDmode[0]==99){
+                    if (saveDmode[0]>maxScreens){
                         saveDmode[0]=dMode[0];
                         saveDmode[1]=dMode[1];
                     }
@@ -1075,7 +1079,7 @@
                 } // Charged since last trip
                 wait5secs=5;
                 if (showHealth&&!playbackOpen){
-                    if (saveDmode[0]==99){
+                    if (saveDmode[0]>maxScreens){
                         saveDmode[0]=dMode[0];
                     }
                     dMode[0]=healthScreen;
@@ -1085,11 +1089,11 @@
             laccOn=accOn;
             if(!accOn&&userIdle&&!playbackEn){ // Car off and no user activity - turn off screen
                 dled = 0;
-                if (saveDmode[0]<99){
+                if (saveDmode[0]<=maxScreens){
                     dMode[0]=saveDmode[0];
                     saveDmode[0]=99;
                 }
-                if (saveDmode[1]<99){
+                if (saveDmode[1]<=maxScreens){
                     dMode[1]=saveDmode[1];
                     saveDmode[1]=99;
                 }
@@ -1129,7 +1133,7 @@
                 }
             }
             //remove health screen once moving
-            if(moving&&(saveDmode[0]<99)&&(wait5secs==0)){
+            if(moving&&(saveDmode[0]<=maxScreens)&&(wait5secs==0)){
                 dMode[0]=saveDmode[0];
                 saveDmode[0]=99;
             }