3djc/2.4 add 2.3 pr (#8099)

2020-11-19 16:32:50 +01:00
parent 87cd9047b1
commit 24f93a7cbe
94 changed files with 22779 additions and 205 deletions
@@ -165,8 +165,13 @@ void menuModelCurveOne(event_t event)
      }
      break;

-#if defined(NAVIGATION_X7)
-    case EVT_KEY_LONG(KEY_MENU):
+#if defined(NAVIGATION_X7_TX12)
+    case EVT_KEY_FIRST(KEY_MODEL):
+      pushMenu(menuChannelsView);
+      killEvents(event);
+      break;
+#elif defined(NAVIGATION_X7)
+    case EVT_KEY_FIRST(KEY_MENU):
      pushMenu(menuChannelsView);
      killEvents(event);
      break;