main.cpp: only LCDlock will disable LCD menu

Author: mstegen

SmartEVSE-3/src/glcd.cpp

@@ -1176,14 +1176,6 @@ void GLCDMenu(uint8_t Buttons) {
     // Main Menu Navigation
     BacklightTimer = BACKLIGHT;                                                 // delay before LCD backlight turns off.
 
-    // Disable buttons when access switch is configured and access is denied
-    if ((getItemValue(MENU_SWITCH) == 1 || getItemValue(MENU_SWITCH) == 2) && Access_bit == 0 && LCDNav == 0)
-        return;
-
-    if (getItemValue(MENU_RCMON) == 1 && (ErrorFlags & RCM_TRIPPED) && RCMFAULT == LOW) {          // RCM was tripped, but RCM level is back to normal
-        ErrorFlags &= ~RCM_TRIPPED;                                             // Clear RCM error bit, by pressing any button
-    }
-
     if ((LCDNav == 0) && (Buttons == 0x5) && (ButtonRelease == 0)) {            // Button 2 pressed ?
         LCDNav = MENU_ENTER;                                                    // about to enter menu
         ButtonTimer = millis();

SmartEVSE-3/src/main.cpp

@@ -253,8 +253,8 @@ uint8_t BacklightSet = 0;
 uint8_t LCDTimer = 0;
 uint8_t AccessTimer = 0;
 int8_t TempEVSE = 0;                                                        // Temperature EVSE in deg C (-50 to +125)
-uint8_t ButtonState = 0x0f;                                                 // Holds latest push Buttons state (LSB 3:0)
-uint8_t OldButtonState = 0x0f;                                              // Holds previous push Buttons state (LSB 3:0)
+uint8_t ButtonState = 0x07;                                                 // Holds latest push Buttons state (LSB 2:0)
+uint8_t OldButtonState = 0x07;                                              // Holds previous push Buttons state (LSB 2:0)
 uint8_t LCDNav = 0;
 uint8_t SubMenu = 0;
 uint32_t ScrollTimer = 0;
@@ -2287,8 +2287,13 @@ void Timer10ms(void * parameter) {
         getButtonState();
 
         // When one or more button(s) are pressed, we call GLCDMenu
-        if (((ButtonState != 0x07) || (ButtonState != OldButtonState)) && !LCDlock) GLCDMenu(ButtonState);
-
+        if (((ButtonState != 0x07) || (ButtonState != OldButtonState)) ) {
+            // RCM was tripped, but RCM level is back to normal
+            if (getItemValue(MENU_RCMON) == 1 && (ErrorFlags & RCM_TRIPPED) && RCMFAULT == LOW) {
+                ErrorFlags &= ~RCM_TRIPPED;         // Clear RCM error bit
+            }
+            if (!LCDlock) GLCDMenu(ButtonState);    // LCD is unlocked, enter menu
+        }
         // Update/Show Helpmenu
         if (LCDNav > MENU_ENTER && LCDNav < MENU_EXIT && (ScrollTimer + 5000 < millis() ) && (!SubMenu)) GLCDHelp();