Attempts to merge SPI_TFT2 & SPI_TFT_ILI9341

Dependencies:   SPI_TFTx2 TFT_fonts TOUCH_TFTx2 mbed

Fork of CANary by Tick Tock

Branch:
Metric
Revision:
103:1389e9efe8c3
Parent:
102:fd19f777a0b4
Child:
104:5a19101aaac5
--- a/main.cpp	Thu Jun 20 05:35:36 2013 +0000
+++ b/main.cpp	Thu Jun 20 23:07:27 2013 +0000
@@ -8,22 +8,17 @@
 // * Add 50% charge option
 // * Tire Pressure Sensor display
 // * Fix bug in playback while connected to canbus (hangs)
-// * Fix no power displayed while charging
 // * Force regen display to zero when in neutral
 // * Add coasting regen to regen/braking display
-// * Change semilog efficiancy graph to linear with 10 minute values
+// * Change semilog efficiency graph to linear with 10 minute values
 // * Add Trip meter (kWh and efficiency for current trip)
 // * Make unique sound when log file write fails and logging disabled
 // * Make display updates interruptable for log writes
 // * Add additional 79b bank readouts
-// * Add algorithmic temperature using raw ADC for better accuracy
-// * Display max temperature instead of average
 // * Ignore the missing 4th pemperature sensor on 2013 models
 // * Add ability to transfer settings config file to/from USB
-// * Add Ah & Health
-
-//Bugs:
-// *** Average temperature seems to only get 3 out of 4 on the first read
+// * Add once-on-powerup/powerdown log
+// * Move log dump to ISR (but CAN RX at higher priority)
 
 #include "mbed.h"
 #include "CAN.h"
@@ -106,7 +101,7 @@
 bool showCP = false;
 //bool pollCP = false;
 bool logCP = false; //Turbo3
-bool repeatPoll = false;
+bool repeatPoll = true;
 bool headlights = false;
 bool tick = false;
 bool ZeroSecTick = false;
@@ -532,10 +527,10 @@
                             case 01: // left col middle row
                                 if (dMode[whichTouched]==configScreen) {
                                     logEn = !logEn;
-                                    if (!logEn) {
-                                        repeatPoll=false; // disable auto polling, too
-                                        autoPoll.detach();
-                                    }
+                                    //if (!logEn) {
+                                    //    repeatPoll=false; // disable auto polling, too
+                                    //    autoPoll.detach();
+                                    //}
                                 } else if (dMode[whichTouched] == indexScreen) { // gg - index
                                     dMode[whichTouched] = cpScreen ; // GoTo CP Data Screen                                
                                     sMode=0;