Fixes 3 issues with the displays (ExpressLRS#2916)

* Fixes 2 issues with the displays * Fix for joystick that uses shared WIFI ADC
JyeSmith · Sep 6, 2024 · b3b43dd · b3b43dd
1 parent 98409ee
commit b3b43dd
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 10 deletions.
diff --git a/src/lib/SCREEN/devScreen.cpp b/src/lib/SCREEN/devScreen.cpp
@@ -36,14 +36,6 @@ static bool jumpToChannelSelect = false;
 
 static int handle(void)
 {
-#if defined(JOY_ADC_VALUES) && defined(PLATFORM_ESP32)
-    // if we are using analog joystick then we can't cancel because WiFi is using the ADC2 (i.e. channel >= 8)!
-    if (connectionState == wifiUpdate && digitalPinToAnalogChannel(GPIO_PIN_JOYSTICK) >= 8)
-    {
-        return DURATION_NEVER;
-    }
-#endif
-
 #ifdef HAS_GSENSOR
     is_screen_flipped = gsensor.isFlipped();
 
@@ -81,7 +73,19 @@ static int handle(void)
     {
         int key;
         bool isLongPressed;
+#if defined(JOY_ADC_VALUES) && defined(PLATFORM_ESP32)
+        // if we are using analog joystick then we can't cancel because WiFi is using the ADC2 (i.e. channel >= 8)!
+        if (connectionState == wifiUpdate && digitalPinToAnalogChannel(GPIO_PIN_JOYSTICK) >= 8)
+        {
+            key = INPUT_KEY_NO_PRESS;
+        }
+        else
+        {
+            fivewaybutton.update(&key, &isLongPressed);
+        }
+#else
         fivewaybutton.update(&key, &isLongPressed);
+#endif
         fsm_event_t fsm_event;
         switch (key)
         {

diff --git a/src/lib/SCREEN/menu.cpp b/src/lib/SCREEN/menu.cpp
@@ -577,7 +577,7 @@ fsm_state_entry_t const wifi_update_menu_fsm[] = {
     {STATE_LAST}
 };
 fsm_state_event_t const wifi_menu_update_events[] = {MENU_EVENTS(wifi_update_menu_fsm)};
-fsm_state_event_t const wifi_ext_execute_events[] = {{EVENT_TIMEOUT, GOTO(STATE_WIFI_EXECUTE)}};
+fsm_state_event_t const wifi_ext_execute_events[] = {{EVENT_TIMEOUT, ACTION_POP}};
 fsm_state_entry_t const wifi_ext_menu_fsm[] = {
     {STATE_WIFI_EXECUTE, nullptr, executeWiFi, 1000, wifi_ext_execute_events, ARRAY_SIZE(wifi_ext_execute_events)},
     {STATE_LAST}

diff --git a/src/lib/SCREEN/menu.h b/src/lib/SCREEN/menu.h
@@ -16,7 +16,6 @@ enum fsm_state_s {
     STATE_BIND,
     STATE_WIFI,
     STATE_VTX,
-    STATE_LINKSTATS,
 
     STATE_POWER_MAX,
     STATE_POWER_DYNAMIC,
@@ -57,6 +56,8 @@ enum fsm_state_s {
     STATE_VALUE_INC,
     STATE_VALUE_DEC,
     STATE_VALUE_SAVE,
+
+    STATE_LINKSTATS
 };