Tick Tock / Mbed 2 deprecated CANary_merge

Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Files at this revision

API Documentation at this revision

Revision 173:9815b1467039, committed 2013-12-29

Comitter:
TickTock
Date:
Sun Dec 29 22:35:09 2013 +0000
Parent:
172:53548bf8bf85
Child:
174:cd27e80f197d
Commit message:
// fixed bugs

Changed in this revision

displayModes.cpp Show annotated file Show diff for this revision Revisions of this file
main.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/displayModes.cpp	Sun Dec 29 12:38:00 2013 +0000
+++ b/displayModes.cpp	Sun Dec 29 22:35:09 2013 +0000
@@ -435,7 +435,7 @@
     }
     if(force||SOH2_x100!=lSOH){
         tt.locate(10,70);
-        printf(" %d%s,%3.1f%s \n",SOH_x2/2,"% SOH",(float)SOH2_x100/100," Hx");
+        printf(" %d%s,%3.1f%s \n",SOH_x2/2,"% SOH ",(float)SOH2_x100/100," Hx");
         lSOH=SOH2_x100;
     }
     if(force||Ah_x10000!=lAh){

--- a/main.cpp	Sun Dec 29 12:38:00 2013 +0000
+++ b/main.cpp	Sun Dec 29 22:35:09 2013 +0000
@@ -11,8 +11,8 @@
 // * Add climate control impact to main max/min dte and new trip display
 // * Be more efficient with write buffer (use msgLen instead of always storing 8 bytes)
 
-// rev172
-// added wh/gid display to Health screen
+// rev173
+// fixed bugs
 
 #include "mbed.h"
 #include "CAN.h"
@@ -23,7 +23,7 @@
 #include "displayModes.h"
 #include "TOUCH_TFTx2.h"
 
-char revStr[7] = "172";
+char revStr[7] = "173";
 unsigned long maxTarget = 1000;
 FATFS USBdrive;
 LocalFileSystem local("local");
@@ -907,14 +907,13 @@
                         lastDMode[0]=99;
                         lastDMode[1]=99;
                     }
-                    //remove health screen once moving
-                    if(moving&&(saveDmode<99)){
-                        dMode[0]=saveDmode;
-                        saveDmode=99;
-                    }
                 }
             }
-
+            //remove health screen once moving
+            if(moving&&(saveDmode<99)&&(wait5secs==0)){
+                dMode[0]=saveDmode;
+                saveDmode=99;
+            }
 
             //compute historic efficiency
             if(numSsamples>0){ // Avoid div0