Diff: main.cpp

Revision:

5:aceac1035d71

Parent:

4:6840cf2b153a

Child:

6:dba3fbdfd5da

--- a/main.cpp	Fri Jul 21 16:02:16 2017 +0000
+++ b/main.cpp	Mon Jul 24 15:57:36 2017 +0000
@@ -39,7 +39,7 @@
 #include "USBHostGCUtilities.h"
 
 
-#define BUILD_DATE "21 July 2017" // Copied to easyGUI variable "GuiVar_buildDate", displayed on both Settings pages (normal and Running).
+#define BUILD_DATE "24 July 2017" // Copied to easyGUI variable "GuiVar_buildDate", displayed on both Settings pages (normal and Running).
                                   // *** MUST update for each 'delivered' build, MUST correspond with date on 'delivered' binary file ***
                                   //     This should be updated first thing every morning, and immediately after every 'delivery'
                                   //     (to e.g. "dd mmm yyyy #2"), so that it is ready for the next one.
@@ -747,10 +747,8 @@
             
         case GuiStruct_ColumnPage1_2:
         case GuiStruct_ColumnPage2_9:
-        case GuiStruct_ColumnDHPage1_40:
-        case GuiStruct_ColumnDHPage2_50:
+        case GuiStruct_ColumnMethodPage_Def:
         case GuiStruct_ColumnTempProfilePage_60:
-        case GuiStruct_ColumnDHTempProfilePage_61:
             // Column status rectangle no longer used
             //singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(COLUMN);
             qspiBitmaps.DisplayColumnComponentBitmap();
@@ -801,7 +799,7 @@
         }
     }
     
-    if((structureIndex == GuiStruct_ColumnPage1_2) || (structureIndex == GuiStruct_ColumnDHPage1_40)){
+    if(structureIndex == GuiStruct_ColumnPage1_2){
         if(getGCStatusLoop != NULL) {
             getGCStatusLoop->UpdateColumnStatusEasyGUIVariable();
         }    
@@ -971,24 +969,11 @@
 #endif // SWIM_TEST
     }    
     
-    if(structureIndex == GuiStruct_ColumnDHTempProfilePage_61) {
-
-        // Make sure the directly heated column temperature profile graph is drawn 
-        // on entering this page (note that we must do this *after* 
-        // drawing the column status rectangle and *after* 'GuiLib_ShowScreen')
-
-        if(getGCStatusLoop != NULL) {
-            getGCStatusLoop->DisplayColumnTempProfilePageGraph(DIRECTLY_HEATED_COLUMN);
-        }
-    }   
-    
     // Column page - must draw Lock/Release buttons if required
     if((structureIndex == GuiStruct_ColumnDHAutoCalibrationPage_Def) ||
-       (structureIndex == GuiStruct_ColumnDHPage1_40) ||
-       (structureIndex == GuiStruct_ColumnDHPage2_50) ||
-       (structureIndex == GuiStruct_ColumnDHTempProfilePage_61) ||
        (structureIndex == GuiStruct_ColumnPage1_2) ||
        (structureIndex == GuiStruct_ColumnPage2_9) ||
+       (structureIndex == GuiStruct_ColumnMethodPage_Def) ||
        (structureIndex == GuiStruct_ColumnTempProfilePage_60)) {
         SetupDoorActuatorCommandUserInterface(usbDevice, usbHostGC, false);
     }     
@@ -1573,9 +1558,6 @@
 {
     int runCount = SettingsHandler::GetIntegerValueFromQSPISettings("RunCount", 0);
 
-    int columnInstalledRunCount = SettingsHandler::GetIntegerValueFromQSPISettings("RunCountWhenColumnInstalled", 0);
-    sprintf(GuiVar_columnInjectionsSinceInstallation, "%d", (runCount - columnInstalledRunCount));
-
     int linerChangedRunCount = SettingsHandler::GetIntegerValueFromQSPISettings("RunCountWhenLinerChanged", 0);
     sprintf(GuiVar_injectionCountSinceLinerChanged, "%d", (runCount - linerChangedRunCount));
 
@@ -1883,9 +1865,7 @@
                     RemoveUnitsFromEasyGUIStringIfFound(temp, GuiVar_columnMaxTemp2, " deg C"); // Remove space before units as well as the units themselves
                     
                     int easyGUICallingPage = GuiStruct_ColumnPage1_2;
-                    if(touchAreaIndex == COLUMN_DH_PAGE1_EDIT_COLUMN_MAX_TEMP) {
-                        easyGUICallingPage = GuiStruct_ColumnDHPage1_40;
-                    } else if (touchAreaIndex == COLUMN_PAGE2_EDIT_COLUMN_MAX_TEMP) {
+                    if (touchAreaIndex == COLUMN_PAGE2_EDIT_COLUMN_MAX_TEMP) {
                         easyGUICallingPage = GuiStruct_ColumnPage2_9;
                     }