Merge with latest 2.3

2020-05-30 11:57:03 +02:00
parent ae99f18375 b324145d10
commit bddccb9765
240 changed files with 16050 additions and 14404 deletions
@@ -150,7 +150,7 @@ void menuModelMixOne(event_t event)

      case MIX_FIELD_CURVE:
        lcdDrawTextAlignedLeft(y, STR_CURVE);
-        editCurveRef(MIXES_2ND_COLUMN, y, md2->curve, event, attr);
+        editCurveRef(MIXES_2ND_COLUMN, y, md2->curve, s_editMode > 0 ? event : 0, attr);
        break;

 #if defined(FLIGHT_MODES)