Merge with latest 2.3

2020-03-18 17:09:38 +01:00
parent 34aa1e4327 5444cd1ab6
commit 1d96af49c4
52 changed files with 514 additions and 295 deletions
@@ -161,6 +161,18 @@ void menuModelCurveOne(event_t event)
        POPUP_MENU_START(onCurveOneMenu);
      }
      break;
+
+#if defined(NAVIGATION_X7)
+    case EVT_KEY_LONG(KEY_MENU):
+      pushMenu(menuChannelsView);
+      killEvents(event);
+      break;
+#elif defined(NAVIGATION_XLITE)
+    case EVT_KEY_LONG(KEY_SHIFT):
+      pushMenu(menuChannelsView);
+      killEvents(event);
+      break;
+#endif
  }

  drawCurve(0);