Revision 95:248b3c25a7df, committed 2013-05-03

Comitter:

TickTock

Date:

Fri May 03 12:18:10 2013 +0000

Parent:

94:c3a14b3975d6

Child:

96:a6c6a6fd1d28

Commit message:

Stop auto-polling when asleep; added battery temp to main display

Changed in this revision

--- a/displayModes.cpp	Fri May 03 11:25:03 2013 +0000
+++ b/displayModes.cpp	Fri May 03 12:18:10 2013 +0000
@@ -72,7 +72,7 @@
 
 void mainDisplay (bool force, bool showButtons){
     unsigned short gids, SOC, packV;
-    static unsigned short lgids=0, lSOC=0, lpackV=0, maxPS;
+    static unsigned short lgids=0, lSOC=0, lpackV=0, lbattTemp_x4=99, maxPS=0;
     static float lkW=0, laccV=0, lmpkWh=0;
     CANMessage msg;
 
@@ -117,6 +117,11 @@
             printf("%4.1fV \n",(float)packV/2);
             lpackV=packV;
         }
+        if(battTemp_x4!=lbattTemp_x4){
+            tt.locate(200,170);
+            printf("%4.1fF \n",(float)battTemp_x4*9/20+32);
+            lbattTemp_x4=battTemp_x4;
+        }
         if(force||accV!=laccV){
             tt.locate(20,200);
             printf("%3.1fV  \n",accV);

--- a/displayModes.h	Fri May 03 11:25:03 2013 +0000
+++ b/displayModes.h	Fri May 03 12:18:10 2013 +0000
@@ -40,6 +40,7 @@
 extern bool updateDTE;
 extern unsigned char tNavRow; // gg - 4x4
 extern unsigned short pointerSep; // log write buffer pointer separation
+extern unsigned char battTemp_x4;
 
 extern "C" {
     void printLast (bool force, bool showButtons);

--- a/main.cpp	Fri May 03 11:25:03 2013 +0000
+++ b/main.cpp	Fri May 03 12:18:10 2013 +0000
@@ -8,6 +8,7 @@
 // * Add 50% charge option
 // * Tire Pressure Sensor display
 // * Fix bug in playback while connected to canbus (hangs)
+// * Add temperature to Main screen
 
 #include "mbed.h"
 #include "CAN.h"
@@ -50,7 +51,7 @@
 // gg - revStr is used in 2 places
 // gg - and is easy to edit here
 // gg - added ZeroSecTick and revStr
-char revStr[7] = "94";
+char revStr[7] = "95";
 
 bool debugMode = false;
 bool logEn = false, logOpen = false; 
@@ -124,7 +125,7 @@
 bool updateDTE = false;
 unsigned short pointerSep;
 unsigned char reqMsgCnt = 99;
-
+unsigned char battTemp_x4 = 99;
 int main() {
     char sTemp[40];
     unsigned long secs;
@@ -301,6 +302,9 @@
             }
         } // if logOpen
         if (canIdle&&userIdle&&!playbackEn) { // canbus idle --> sleep to save power
+            if (repeatPoll) { // stop autopolling if enabled
+                autoPoll.detach();
+            }
             if (logOpen){
                 fclose(file);
             } // if (logOpen)*/
@@ -325,7 +329,6 @@
             }
             secsNoTouch=2;
             canIdle=secsNoMsg>canTimeout;
-            //userIdle=!touched;
             dled=0.8; // turn on display LED
             seconds = time(NULL);
             t = *localtime(&seconds) ;
@@ -339,6 +342,9 @@
                 logEvent("WakingUp"); // gg - use messeges
                 logTS(); // Date-Time at wakeup
             }
+            if (repeatPoll) { // re-enable autopolling if enabled
+                autoPoll.attach(&autoPollISR,pollInt);
+            }
         } // if idle
         
         if(touched){ // call touchscreen procedure if touch interrupt detected

--- a/utility.cpp	Fri May 03 11:25:03 2013 +0000
+++ b/utility.cpp	Fri May 03 12:18:10 2013 +0000
@@ -251,6 +251,7 @@
                 if(i==BatDataBaseG4+2){ // Last of Temperature data
                     logCP=yesBattLog; // Only log if logging enabled
                     showCP=true; // Always show
+                    battTemp_x4=battData[224+5]+battData[224+8]+battData[224+11]+battData[224+14];
                 }
                 //-------
                 i*=7;

--- a/utility.h	Fri May 03 11:25:03 2013 +0000
+++ b/utility.h	Fri May 03 12:18:10 2013 +0000
@@ -53,6 +53,7 @@
 extern unsigned char dtePeriod;
 extern Beep spkr;
 extern unsigned char reqMsgCnt;
+extern unsigned char battTemp_x4;
 
 extern "C" {
     void mbed_reset();