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
@@ -85,6 +85,17 @@ void drawOffsetBar(uint8_t x, uint8_t y, MixData * md)

 void menuModelMixOne(event_t event)
 {
+#if defined(NAVIGATION_X7)
+  if (event == EVT_KEY_LONG(KEY_MENU)) {
+    pushMenu(menuChannelsView);
+    killEvents(event);
+  }
+#elif defined(NAVIGATION_XLITE)
+  if (event == EVT_KEY_LONG(KEY_SHIFT)) {
+    pushMenu(menuChannelsView);
+    killEvents(event);
+  }
+#endif
  MixData * md2 = mixAddress(s_currIdx) ;
  putsChn(PSIZE(TR_MIXES)*FW+FW, 0, md2->destCh+1,0);