Diff: displayModes.cpp

Revision:

184:5ca7b78297fe

Parent:

182:10017d74de67

--- a/displayModes.cpp	Sun Mar 30 03:31:37 2014 +0000
+++ b/displayModes.cpp	Tue May 06 14:43:58 2014 +0000
@@ -37,14 +37,20 @@
             if (useable_kWh<0){
                 useable_kWh=0;
             }
-            //tt.locate(181,4);
-            tt.locate(170,4); //LAJ temp
-            if (useable_kWh<9.95){
-                //printf("%3.2fkWh\n",useable_kWh);
-                printf("%3.2f %3.2f\n",useable_kWh,(wh[gids]-400)/1000); //LAJ temp
-            } else {
-                //printf("%3.1fkWh\n",useable_kWh);
-                printf("%3.1f %3.1f\n",useable_kWh,(wh[gids]-400)/1000); //LAJ temp
+            if(debugMode){
+                tt.locate(165,4);
+                if (useable_kWh<9.95){
+                    printf("%3.2f %3.2f\n",useable_kWh,(wh[gids]-400)/1000); //LAJ temp
+                } else {
+                    printf("%3.1f %3.1f\n",useable_kWh,(wh[gids]-400)/1000); //LAJ temp
+                }
+            }else{
+                tt.locate(181,4);
+                if (useable_kWh<9.95){
+                    printf("%3.2fkWh\n",useable_kWh);
+                } else {
+                    printf("%3.1fkWh\n",useable_kWh);
+                }
             }
         }
         if(force||SOC_x10!=lSOC){
@@ -1427,7 +1433,7 @@
 }
 
 void whpgDisplay(bool force, bool showButtons, bool showWh){ 
-    unsigned short maxGid, minGid, i, y, delta;
+    unsigned short maxGid, minGid, i, y, maxWg;
     static unsigned short lmg;
 
     tt.foreground(White);
@@ -1436,13 +1442,12 @@
 
     maxGid=0;
     minGid=9999;
-    delta=0;
 
     if(force){
         lmg=281;
     }
 
-    // find max/min/delta
+    // find max/min/maxWg
     if(showWh){
         for(i=0; i<300; i++){
             if(wh[i]>0){
@@ -1450,7 +1455,7 @@
                 if(i<minGid) minGid=i;
             }
         }
-        delta = (wh[maxGid]-wh[minGid]);
+        maxWg = wh[maxGid];
     }else{
         for(i=0; i<300; i++){
             if(whpg[i]>0){
@@ -1458,7 +1463,7 @@
                 if(i<minGid) minGid=i;
             }
         }
-        delta = (whpg[minGid]-whpg[maxGid]);
+        maxWg = whpg[minGid];
     }
 
     if (force||(minGid<lmg)){ //update if new data
@@ -1505,25 +1510,29 @@
         // plot
         if( maxGid >= minGid ) {
             tt.locate( xWinMin+4, yWinMin+4);
-            printf("%3.1f avg\n", (float) delta/(maxGid-minGid) );
+            printf("%3.1f avg\n", (float) maxWg/(maxGid-minGid+1) );
             if(debugMode){
                 tt.locate( xWinMin+4, yWinMin+20);
                 printf("minGids=%d; maxGids=%d\n", minGid,maxGid);
                 tt.locate( xWinMin+4, yWinMin+36);
-                printf("minwhpg=%d; maxwhpg=%d\n", whpg[minGid],whpg[maxGid]);
+                if(showWh){
+                    printf("minwh=%3.1f; maxwh=%3.1f\n", wh[minGid],wh[maxGid]);
+                }else{
+                    printf("minwhpg=%d; maxwhpg=%d\n", whpg[minGid],whpg[maxGid]);
+                }
             }
 
-            for( i=4; i<=286; i++) {
+            for( i=3; i<=287; i++) {
                 if(showWh){
                     y =  wh[i]-wh[i-1];
                     tt.fillcircle(i+xWinMin,yWinMax-y,2,Green);
                 }else{
-                    if((whpg[i-4]>0)&&(whpg[i+4]>0)){
-                        y = (whpg[i-4]-whpg[i+4])/8;
+                    if((whpg[i-3]>0)&&(whpg[i+3]>0)){
+                        y = (whpg[i-3]-whpg[i+3])/6;
                     }else{
-                        y =  whpg[i];
+                        y = 0;
                     }
-                    if( (y>20) && (y<180) && whpg[i]>0){
+                    if((y>0) && (y<180)){
                         tt.fillcircle(i+xWinMin,yWinMax-y,2,Yellow);
                     }
                 }