test fork
Dependencies: SPI_TFTx2 SPI_TFTx2_ILI9341 TFT_fonts TOUCH_TFTx2 mbed
Fork of CANary_9341 by
Diff: main.cpp
- Revision:
- 138:a2f5af85ed0d
- Parent:
- 137:70853cf5a30f
- Child:
- 139:ac227b203ef2
--- a/main.cpp Sun Jul 28 05:32:17 2013 +0000 +++ b/main.cpp Fri Aug 02 05:13:26 2013 +0000 @@ -10,9 +10,10 @@ // * Subtract accessory power from efficiency history (add back in when displaying) // * Add trip history display -// rev137 +// rev138 // Added update if screen touched on power // Fixed hang on immediate USB access +// Fixed metric DTE formatting #include "mbed.h" #include "CAN.h" @@ -24,7 +25,7 @@ #include "displayModes.h" #include "TOUCH_TFTx2.h" -char revStr[7] = "137"; // gg - revision string, max 6 characters +char revStr[7] = "138"; // gg - revision string, max 6 characters FATFS USBdrive; LocalFileSystem local("local"); @@ -547,8 +548,8 @@ playback.attach(&playbackISR,playbackInt); printMsg("Starting playback\n"); // start playback spkr.beep(2000,0.25); - can1.attach(NULL);// Stop recieving CAN data - can2.attach(NULL); + can1.attach(NULL);// Stop recieving EVCAN data + can2.attach(NULL);// Stop recieving CARCAN data } } else { printMsg("Must stop logging first\n"); @@ -558,8 +559,8 @@ f_close(&efile); playbackOpen=false; playbackEn=false; - can1.attach(&recieve1);// Restore CAN data recieve - can2.attach(&recieve2); + can1.attach(&recieve1);// Restore EVCAN data recieve + can2.attach(&recieve2);// Restore EVCAN data recieve lastDMode[whichTouched]=99; } } else if (dMode[whichTouched]==dateScreen){ @@ -742,7 +743,6 @@ } } laccOn=accOn; - //if(!accOn&&!logEn&&userIdle&&!playbackEn){ // Car off and logging disabled and no user activity if(!accOn&&userIdle&&!playbackEn){ // Car off and no user activity - turn off screen dled = 0; if (saveDmode<99){ @@ -759,6 +759,7 @@ if (repeatPoll&&(wait5secs==0)) { // Poll on startup if autopoll enabled logOnce=true; reqMsgCnt=0; + //sendTempReq(); msgReq.attach(&sendReq,0.015); } lastDMode[0]=99;