Diff: main.cpp

Revision:

3:010aeeacd7d7

Parent:

2:6e94a7fd1e37

Child:

4:6840cf2b153a

--- a/main.cpp	Thu Jul 20 15:31:28 2017 +0000
+++ b/main.cpp	Fri Jul 21 10:30:24 2017 +0000
@@ -39,7 +39,7 @@
 #include "USBHostGCUtilities.h"
 
 
-#define BUILD_DATE "20 July 2017" // Copied to easyGUI variable "GuiVar_buildDate", displayed on both Settings pages (normal and Running).
+#define BUILD_DATE "21 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.
@@ -744,25 +744,25 @@
             homePageGCComponentStatusColorAreas.DisplayAll();
 #endif // USE_QSPI_BITMAPS
             break;
+            
         case GuiStruct_ColumnPage1_2:
         case GuiStruct_ColumnPage2_9:
-        case GuiStruct_ColumnTempProfilePage_60:
         case GuiStruct_ColumnDHPage1_40:
         case GuiStruct_ColumnDHPage2_50:
-        case GuiStruct_ColumnDHTempProfilePage_61:
-#ifdef WANT_STATUS_RECTANGLE_ON_COLUMN_AUTO_CALIB_PAGE
-        case GuiStruct_ColumnDHAutoCalibrationPage_Def:
-#endif // WANT_STATUS_RECTANGLE_ON_COLUMN_AUTO_CALIB_PAGE
-            singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(COLUMN);
+            // Column status rectangle no longer used - and don't want icon on profile page (not enough space)
+            //singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(COLUMN);
             qspiBitmaps.DisplayColumnComponentBitmap();
             break;
+            
         case GuiStruct_InjectorPage1_3:
         case GuiStruct_InjectorTempProfilePage_25:
         case GuiStruct_InjectorGasStatusPage_30:
         case GuiStruct_InjectorConsumablesPage_20:
-            singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(INJECTOR);
+            // Injector status rectangle no longer used
+            //singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(INJECTOR);
             qspiBitmaps.DisplayInjectorComponentBitmap();
             break;
+            
         case GuiStruct_DetectorFIDPage_4:
         case GuiStruct_DetectorECDPage_12:
         case GuiStruct_DetectorFPDPage_14:
@@ -772,9 +772,11 @@
         case GuiStruct_DetectorPIDPage_29:
         case GuiStruct_DetectorSPDIDPage_30:
         case GuiStruct_DetectorTXLPage_27:
-            singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(DETECTOR);
+            // Detector status rectangle no longer used
+            //singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(DETECTOR);
             qspiBitmaps.DisplayDetectorComponentBitmap();
             break;
+            
         case GuiStruct_GasProfilePage_15:
         case GuiStruct_GasInformationPage_6:
 #ifdef WANT_STATUS_RECTANGLE_ON_GAS_CALIB_PAGES        
@@ -782,9 +784,11 @@
         case GuiStruct_GasBackPressureDACPage_Def:
         case GuiStruct_GasChannelDACAndADCPage_Def:
 #endif
-            singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(GAS);
+            // Gas status rectangle no longer used
+            //singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(GAS);
             qspiBitmaps.DisplayGasComponentBitmap();
             break;
+            
         default: // Don't need to display status rectangle for this page
             break;
     }