Tick Tock / Mbed 2 deprecated CANary_9341

Dual CANbus monitor and instrumentation cluster supporting ILI9341 display controller

Dependencies:   SPI_TFTx2_ILI9341 TOUCH_TFTx2_ILI9341 TFT_fonts mbed

Fork of CANary by Tick Tock

Files at this revision

API Documentation at this revision

Revision 142:c1a11d6f181c, committed 2013-08-04

Comitter:
TickTock
Date:
Sun Aug 04 20:59:27 2013 +0000
Parent:
141:cf13a632ddb5
Child:
143:88b5155622a5
Commit message:
changed trip log back to just cp vales

Changed in this revision

main.cpp Show annotated file Show diff for this revision Revisions of this file
utility.cpp Show annotated file Show diff for this revision Revisions of this file 
--- a/main.cpp	Sun Aug 04 20:39:16 2013 +0000
+++ b/main.cpp	Sun Aug 04 20:59:27 2013 +0000
@@ -10,8 +10,8 @@
 // * Subtract accessory power from efficiency history (add back in when displaying)
 // * Add trip history display
 
-// rev141
-// tweaked brakeMon sensitivity and threshold
+// rev142
+// changed trip log back to jsut cp vales
 
 
 #include "mbed.h"
@@ -23,7 +23,7 @@
 #include "utility.h"
 #include "displayModes.h"
 #include "TOUCH_TFTx2.h"
-char revStr[7] = "141"; // gg - revision string, max 6 characters
+char revStr[7] = "142"; // gg - revision string, max 6 characters
 
 FATFS USBdrive;
 LocalFileSystem local("local");

--- a/utility.cpp	Sun Aug 04 20:39:16 2013 +0000
+++ b/utility.cpp	Sun Aug 04 20:59:27 2013 +0000
@@ -786,15 +786,15 @@
         f_printf(&bfile,"%s,",sTemp);           
         f_printf(&bfile,"%d,%d,%d,%d,",(battData[(BatDataBaseG4*7)+ 3]<<8)+battData[(BatDataBaseG4*7)+ 4],battData[(BatDataBaseG4*7)+ 5],(battData[(BatDataBaseG4*7)+ 6]<<8)+battData[(BatDataBaseG4*7)+ 7],battData[(BatDataBaseG4*7)+ 8]);
         f_printf(&bfile,"%d,%d,%d,%d", (battData[(BatDataBaseG4*7)+ 9]<<8)+battData[(BatDataBaseG4*7)+10],battData[(BatDataBaseG4*7)+11],(battData[(BatDataBaseG4*7)+12]<<8)+battData[(BatDataBaseG4*7)+13],battData[(BatDataBaseG4*7)+14]);
-        /*for(i=0; i<96; i++) {
+        for(i=0; i<96; i++) {
             bd=(battData[BatDataBaseG2*7+i*2+3]<<8)+battData[BatDataBaseG2*7+i*2+4];
             f_printf(&bfile,",%d",bd);
-        }*/
+        }
         // temporariliy dump everything
-        for(i=0; i<BatDataBufMax; i++) {
+        /*for(i=0; i<BatDataBufMax; i++) {
             sprintf(sTemp,",%02x",battData[i]);
             f_printf(&bfile,"%s",sTemp);
-        }
+        }*/
 
         f_printf(&bfile,"\r\n");
         f_close(&bfile);