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
@@ -113,7 +113,11 @@ void menuModelFlightModeOne(event_t event)
        lcdDrawTextAlignedLeft(y, STR_TRIMS);
        for (uint8_t t = 0; t < NUM_STICKS; t++) {
          drawTrimMode(MIXES_2ND_COLUMN + (t*2*FW), y, s_currIdx, t, menuHorizontalPosition == t ? attr : 0);
+#if defined(NAVIGATION_9X)
+          if (s_editMode > 0 && attr && menuHorizontalPosition == t) {
+#else
          if (s_editMode >= 0 && attr && menuHorizontalPosition == t) {
+#endif
            trim_t & v = fm->trim[t];
            v.mode = checkIncDec(event, v.mode==TRIM_MODE_NONE ? -1 : v.mode, -1, k==0 ? 0 : 2*MAX_FLIGHT_MODES-1, EE_MODEL, isTrimModeAvailable);
          }