Diff: displayModes.cpp

Revision:

159:577e9d015693

Parent:

158:059abeb44ba1

Child:

161:71ac85d11f03

--- a/displayModes.cpp	Thu Oct 31 14:41:24 2013 +0000
+++ b/displayModes.cpp	Fri Nov 08 16:07:53 2013 +0000
@@ -933,6 +933,12 @@
         showButton(1,2,"Disable","RegMon",4,4);
     else
         showButton(1,2," Enable"," RegMon",4,4);
+
+    if(heaterMon)
+        showButton(2,2,"Disable","HeatMon",4,4);
+    else
+        showButton(2,2," Enable","HeatMon",4,4);
+
 }
 
 void config2(bool force, bool showButtons){
@@ -1318,30 +1324,6 @@
     printf("%02d%02d%02d %02d%02d%03d\n",hour,minute,second,month,day,year);*/
     //printf("%4.2fV %4.2fV \n",accV,accV2);
 
-    /*for (i=0; i<4; i++){
-        msg = lastMsg[indexLastMsg[(uMsgId[i]>>4)]];
-        uData[i] = msg.data[(uMsgId[i]&0x000f)];
-        msg = lastMsg[indexLastMsg[(uMsgId[i+4]>>4)]];
-        uData[i+4] = msg.data[(uMsgId[i+4]&0x000f)];
-        tt.locate(10,90+i*30);
-        if(clearTest){
-            oldData[i]=uData[i];
-            oldData[i+4]=uData[i+4];
-            tt.foreground(Yellow);
-            tt.background(Navy);
-            printf("%4x:%2x %4x:%2x\n",uMsgId[i],uData[i],uMsgId[i+4],uData[i+4]);
-        }else if((uData[i]!=oldData[i])||(uData[i+4]!=oldData[i+4])){
-            tt.foreground(Yellow);
-            tt.background(Navy);
-            tt.foreground(Navy);
-            tt.background(Yellow);
-            printf("%4x:%2x %4x:%2x\n",uMsgId[i],uData[i],uMsgId[i+4],uData[i+4]);
-        }else if(force){
-            tt.foreground(Yellow);
-            tt.background(Navy);
-            printf("%4x:%2x %4x:%2x\n",uMsgId[i],uData[i],uMsgId[i+4],uData[i+4]);
-        }
-    }*/
     for (i=0; i<8; i++){
         msg = lastMsg[indexLastMsg[(uMsgId[i]>>4)]];
         uData[i] = msg.data[(uMsgId[i]&0x000f)];
@@ -1359,6 +1341,7 @@
             tt.foreground(Navy);
             tt.background(Yellow);
             printf("%4x:%2x\n",uMsgId[i],uData[i]);
+            oldData[i]=uData[i];
         }else if(force){
             tt.foreground(Yellow);
             tt.background(Navy);