Diff: main.cpp

Revision:

7:f0e645cf73a2

Parent:

6:dba3fbdfd5da

Child:

8:26e49e6955bd

--- a/main.cpp	Thu Jul 27 16:17:56 2017 +0000
+++ b/main.cpp	Fri Jul 28 15:53:40 2017 +0000
@@ -39,7 +39,7 @@
 #include "USBHostGCUtilities.h"
 
 
-#define BUILD_DATE "27 July 2017" // Copied to easyGUI variable "GuiVar_buildDate", displayed on both Settings pages (normal and Running).
+#define BUILD_DATE "28 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.
@@ -167,6 +167,8 @@
 
 //#define WANT_STATUS_RECTANGLE_ON_COLUMN_AUTO_CALIB_PAGE
 //#define WANT_STATUS_RECTANGLE_ON_GAS_CALIB_PAGES
+//#define WANT_DOOR_ACTUATOR_BUTTONS_ON_COLUMN_PAGES
+//#define WANT_COMPONENT_ICON_ON_PROFILE_PAGES
 
 /*
     Bodge so GuiDisplay.c ('easyGUIFixed' file) can call Thread::wait 
@@ -748,7 +750,9 @@
         case GuiStruct_ColumnPage1_2:
         case GuiStruct_ColumnPage2_9:
         case GuiStruct_ColumnMethodPage_Def:
+#ifdef WANT_COMPONENT_ICON_ON_PROFILE_PAGES
         case GuiStruct_ColumnTempProfilePage_60:
+#endif // WANT_COMPONENT_ICON_ON_PROFILE_PAGES
             // Column status rectangle no longer used
             //singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(COLUMN);
             qspiBitmaps.DisplayColumnComponentBitmap();
@@ -756,7 +760,9 @@
             
         case GuiStruct_InjectorPage1_3:
         case GuiStruct_InjectorMethodPage_Def:
+#ifdef WANT_COMPONENT_ICON_ON_PROFILE_PAGES
         case GuiStruct_InjectorTempProfilePage_25:
+#endif // WANT_COMPONENT_ICON_ON_PROFILE_PAGES
             // Injector status rectangle no longer used
             //singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(INJECTOR);
             qspiBitmaps.DisplayInjectorComponentBitmap();
@@ -776,7 +782,9 @@
             qspiBitmaps.DisplayDetectorComponentBitmap();
             break;
             
+#ifdef WANT_COMPONENT_ICON_ON_PROFILE_PAGES
         case GuiStruct_GasProfilePage_15:
+#endif // WANT_COMPONENT_ICON_ON_PROFILE_PAGES
         case GuiStruct_GasMethodPage_Def:
         case GuiStruct_GasInformationPage_6:
 #ifdef WANT_STATUS_RECTANGLE_ON_GAS_CALIB_PAGES        
@@ -970,14 +978,18 @@
     }    
     
     // Column page - must draw Lock/Release buttons if required
+#ifdef WANT_DOOR_ACTUATOR_BUTTONS_ON_COLUMN_PAGES
     if((structureIndex == GuiStruct_ColumnDHAutoCalibrationPage_Def) ||
        (structureIndex == GuiStruct_ColumnPage1_2) ||
        (structureIndex == GuiStruct_ColumnPage2_9) ||
        (structureIndex == GuiStruct_ColumnMethodPage_Def) ||
        (structureIndex == GuiStruct_ColumnTempProfilePage_60)) {
+#else
+    if(structureIndex == GuiStruct_ColumnDHAutoCalibrationPage_Def) {
+#endif
         SetupDoorActuatorCommandUserInterface(usbDevice, usbHostGC, false);
     }  
-    
+
     if(structureIndex == GuiStruct_ColumnMethodPage_Def) {
         if(getGCStatusLoop != NULL) {
             getGCStatusLoop->ShowColumnMethodPageScrollButtonsIfNecessary();
@@ -2128,6 +2140,12 @@
             } else if(touchAreaIndex == INJECTOR_METHOD_SCROLL_DOWN) {
                 getGCStatusLoop->ScrollInjectorMethodRampsDownIfPossible();
                 dealtWithTouch = true;
+            } else if(touchAreaIndex == GAS_METHOD_SCROLL_UP) {
+                getGCStatusLoop->ScrollGasMethodRampsUpIfPossible();
+                dealtWithTouch = true;
+            } else if(touchAreaIndex == GAS_METHOD_SCROLL_DOWN) {
+                getGCStatusLoop->ScrollGasMethodRampsDownIfPossible();
+                dealtWithTouch = true;
             }
         }
     }