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
@@ -212,7 +212,7 @@ void menuModelLimits(event_t event)
        case ITEM_LIMITS_CURVE:
          drawCurveName(LIMITS_CURVE_POS, y, ld->curve, attr);
          if (attr && event==EVT_KEY_LONG(KEY_ENTER) && ld->curve>0) {
-            s_curveChan = (ld->curve<0 ? -ld->curve-1 : ld->curve-1);
+            s_currIdxSubMenu = (ld->curve<0 ? -ld->curve-1 : ld->curve-1);
            pushMenu(menuModelCurveOne);
          }
          if (active) {