Diff: GetGCStatusLoop.cpp

Revision:

4:6840cf2b153a

Parent:

3:010aeeacd7d7

Child:

5:aceac1035d71

--- a/GetGCStatusLoop.cpp	Fri Jul 21 10:30:24 2017 +0000
+++ b/GetGCStatusLoop.cpp	Fri Jul 21 16:02:16 2017 +0000
@@ -3289,6 +3289,17 @@
         strcpy(GuiVar_columnType, buff);
     }
     
+    GetColumnMaxTemperature(buff, false, false, true);
+    if(strcmp(buff, GuiVar_columnMaxTemp2) != 0) {
+        strcpy(GuiVar_columnMaxTemp2, buff);
+
+        //mustUpdateDisplay = true;
+        // No - just do this (don't force entire page to redisplay)
+        // Hard coded values taken from easyGUI
+        RedrawSingleEasyGUIVariableOnComponentPage(400, 150, &GuiVar_columnMaxTemp2, GuiLib_ALIGN_LEFT, COLUMN);
+    }
+
+    
     GetColumnLength(buff);
     if(strcmp(buff, GuiVar_columnLength) != 0) {
         mustUpdateDisplay = true;
@@ -3310,20 +3321,6 @@
         strcpy(GuiVar_columnOuterDiameter, buff);
     }
     
-    GetSerialNumber(buff);
-    if(strcmp(buff, GuiVar_columnSerialNumber) != 0) {
-        mustUpdateDisplay = true;
-        
-        strcpy(GuiVar_columnSerialNumber, buff);
-    }
-    
-    GetInjectionCountSinceColumnInstalled(buff);
-    if(strcmp(buff, GuiVar_columnInjectionsSinceInstallation) != 0) {
-        mustUpdateDisplay = true;
-        
-        strcpy(GuiVar_columnInjectionsSinceInstallation, buff);
-    }
-    
     if(SinglePageGCComponentStatusHasChanged(COLUMN)) {
         mustUpdateDisplay = true;
     }
@@ -3622,7 +3619,10 @@
         }
 #endif
 
-        // Note - no column icon on Column Profile page - not enough space
+        // And (currently) we draw the component bitmap on top of the rectangle
+        if(qspiBitmaps != NULL) {
+            qspiBitmaps->DisplayColumnComponentBitmap();
+        }
 
         GuiLibGraph* graphToUse = GetColumnTempGraphForColumnType(columnType);