Diff: main.cpp

Revision:

136:41a204105511

Parent:

135:89986950d501

Child:

137:70853cf5a30f

--- a/main.cpp	Fri Jul 26 04:35:31 2013 +0000
+++ b/main.cpp	Sat Jul 27 22:19:01 2013 +0000
@@ -10,9 +10,7 @@
 // * Subtract accessory power from efficiency history (add back in when displaying)
 // * Add trip history display
 
-// rev135
-// Hide buttons on health screen on powerdown
-// Turn off screen even if logging if car off and user idle
+// rev136
 
 #include "mbed.h"
 #include "CAN.h"
@@ -24,7 +22,7 @@
 #include "displayModes.h"
 #include "TOUCH_TFTx2.h"
 
-char revStr[7] = "135"; // gg - revision string, max 6 characters
+char revStr[7] = "136"; // gg - revision string, max 6 characters
 
 FATFS USBdrive;
 LocalFileSystem local("local");
@@ -347,7 +345,7 @@
             if (repeatPoll) { // re-enable autopolling if enabled
                 autoPoll.attach(&autoPollISR,pollInt);
             }
-            wait5secs=3; // Refresh screen after 3 seconds
+            wait5secs=5; // Refresh screen after 5 seconds
         } // if idle
         
         if(touched){ // call touchscreen procedure if touch interrupt detected
@@ -543,8 +541,8 @@
                                                 playback.attach(&playbackISR,playbackInt);
                                                 printMsg("Starting playback\n"); // start playback
                                                 spkr.beep(2000,0.25);
-                                                can1.attach(&doNothing);// Stop recieving CAN data
-                                                can2.attach(&doNothing);
+                                                can1.attach(NULL);// Stop recieving CAN data
+                                                can2.attach(NULL);
                                             }
                                         } else {
                                             printMsg("Must stop logging first\n");