Merge with latest 2.3
This commit is contained in:
@@ -91,7 +91,7 @@ void menuModelMixOne(event_t event)
|
||||
killEvents(event);
|
||||
}
|
||||
#elif defined(NAVIGATION_XLITE)
|
||||
if (event == EVT_KEY_LONG(KEY_SHIFT)) {
|
||||
if (event == EVT_KEY_FIRST(KEY_ENTER) && IS_SHIFT_PRESSED()) {
|
||||
pushMenu(menuChannelsView);
|
||||
killEvents(event);
|
||||
}
|
||||
@@ -150,6 +150,8 @@ void menuModelMixOne(event_t event)
|
||||
|
||||
case MIX_FIELD_CURVE:
|
||||
lcdDrawTextAlignedLeft(y, STR_CURVE);
|
||||
s_currSrcRaw = md2->srcRaw;
|
||||
s_currScale = 0;
|
||||
editCurveRef(MIXES_2ND_COLUMN, y, md2->curve, s_editMode > 0 ? event : 0, attr);
|
||||
break;
|
||||
|
||||
|
||||
Reference in New Issue
Block a user