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
@@ -49,8 +49,13 @@ enum ExposFields {

 void menuModelExpoOne(event_t event)
 {
-#if defined(NAVIGATION_X7)
-  if (event == EVT_KEY_LONG(KEY_MENU)) {
+#if defined(NAVIGATION_X7_TX12)
+  if (event == EVT_KEY_FIRST(KEY_MODEL)) {
+    pushMenu(menuChannelsView);
+    killEvents(event);
+  }
+#elif defined(NAVIGATION_X7)
+  if (event == EVT_KEY_FIRST(KEY_MENU)) {
    pushMenu(menuChannelsView);
    killEvents(event);
  }