Diff: main.cpp

Revision:

4:6840cf2b153a

Parent:

3:010aeeacd7d7

Child:

5:aceac1035d71

--- a/main.cpp	Fri Jul 21 10:30:24 2017 +0000
+++ b/main.cpp	Fri Jul 21 16:02:16 2017 +0000
@@ -749,7 +749,9 @@
         case GuiStruct_ColumnPage2_9:
         case GuiStruct_ColumnDHPage1_40:
         case GuiStruct_ColumnDHPage2_50:
-            // Column status rectangle no longer used - and don't want icon on profile page (not enough space)
+        case GuiStruct_ColumnTempProfilePage_60:
+        case GuiStruct_ColumnDHTempProfilePage_61:
+            // Column status rectangle no longer used
             //singleGCComponentPageStatusColorAreas.DisplayGCComponentStatus(COLUMN);
             qspiBitmaps.DisplayColumnComponentBitmap();
             break;
@@ -1870,7 +1872,8 @@
         if(!dealtWithTouch) {
 
             if((touchAreaIndex == COLUMN_PAGE1_EDIT_COLUMN_MAX_TEMP) ||
-               (touchAreaIndex == COLUMN_DH_PAGE1_EDIT_COLUMN_MAX_TEMP)) {
+               (touchAreaIndex == COLUMN_DH_PAGE1_EDIT_COLUMN_MAX_TEMP) ||
+               (touchAreaIndex == COLUMN_PAGE2_EDIT_COLUMN_MAX_TEMP)) {
 
                 NumericKeypadPageHandler* numericKeypadPageHandler = NumericKeypadPageHandler::GetInstance(usbDevice, usbHostGC);
                 if(numericKeypadPageHandler != NULL) {
@@ -1879,9 +1882,16 @@
                     char temp[50];
                     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) {
+                        easyGUICallingPage = GuiStruct_ColumnPage2_9;
+                    }
+                    
                     numericKeypadPageHandler->StartEditing(temp);
                     numericKeypadPageHandler->SetEasyGUIVariableToEdit(GuiVar_columnMaxTemp2);
-                    numericKeypadPageHandler->SetEasyGUICallingPage((touchAreaIndex == COLUMN_DH_PAGE1_EDIT_COLUMN_MAX_TEMP) ? GuiStruct_ColumnDHPage1_40 : GuiStruct_ColumnPage1_2);
+                    numericKeypadPageHandler->SetEasyGUICallingPage(easyGUICallingPage);
                     numericKeypadPageHandler->SetEditVariableRange(0, 500);
                     numericKeypadPageHandler->SetEditVariableName("Col. Max Temp");
                     numericKeypadPageHandler->SetEditVariableUnits("deg C");