Merge with latest 2.3

2020-03-05 10:43:01 +01:00
parent 33b6efc40d ec56892de6
commit 6878ae4a9f
144 changed files with 3009 additions and 1035 deletions
@@ -369,7 +369,7 @@ void menuMainView(event_t event)
      break;

    case EVT_KEY_GENERAL_MENU:
-      pushMenu(menuRadioSetup);
+      pushMenu(menuRadioTools);
      killEvents(event);
      break;
 #endif
@@ -397,7 +397,7 @@ void menuMainView(event_t event)
 #endif

    case EVT_KEY_TELEMETRY:
-      chainMenu(menuViewTelemetryFrsky);
+      chainMenu(menuViewTelemetry);
      killEvents(event);
      break;