feat: new SF GV Adjust mode to copy source (instead of %) value (#5406)

This commit is contained in:
philmoz
2024-08-16 08:32:12 +10:00
committed by GitHub
parent 6bf335166f
commit 7e7deb21dc
32 changed files with 96 additions and 38 deletions
@@ -92,6 +92,11 @@ void onAdjustGvarSourceLongEnterPress(const char * result)
CFN_PARAM(cfn) = 0;
storageDirty(EE_MODEL);
}
else if (result == STR_MIXSOURCERAW) {
CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_SOURCERAW;
CFN_PARAM(cfn) = 0;
storageDirty(EE_MODEL);
}
else if (result == STR_GLOBALVAR) {
CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_GVAR;
CFN_PARAM(cfn) = 0;
@@ -393,6 +398,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
drawGVarValue(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, CFN_GVAR_INDEX(cfn), val_displayed, attr|LEFT);
break;
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
val_max = MIXSRC_LAST_CH;
drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);
if (active) {
@@ -436,6 +442,8 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
POPUP_MENU_ADD_ITEM(STR_CONSTANT);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCE)
POPUP_MENU_ADD_ITEM(STR_MIXSOURCE);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCERAW)
POPUP_MENU_ADD_ITEM(STR_MIXSOURCERAW);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_GVAR)
POPUP_MENU_ADD_ITEM(STR_GLOBALVAR);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_INCDEC)
@@ -124,6 +124,11 @@ void onAdjustGvarSourceLongEnterPress(const char * result)
CFN_PARAM(cfn) = 0;
storageDirty(EE_MODEL);
}
else if (result == STR_MIXSOURCERAW) {
CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_SOURCERAW;
CFN_PARAM(cfn) = 0;
storageDirty(EE_MODEL);
}
else if (result == STR_GLOBALVAR) {
CFN_GVAR_MODE(cfn) = FUNC_ADJUST_GVAR_GVAR;
CFN_PARAM(cfn) = 0;
@@ -372,6 +377,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
break;
}
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
val_max = MIXSRC_LAST_CH;
drawSource(MODEL_SPECIAL_FUNC_3RD_COLUMN, y, val_displayed, attr);
if (active) {
@@ -403,6 +409,8 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
POPUP_MENU_ADD_ITEM(STR_CONSTANT);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCE)
POPUP_MENU_ADD_ITEM(STR_MIXSOURCE);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_SOURCERAW)
POPUP_MENU_ADD_ITEM(STR_MIXSOURCERAW);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_GVAR)
POPUP_MENU_ADD_ITEM(STR_GLOBALVAR);
if (CFN_GVAR_MODE(cfn) != FUNC_ADJUST_GVAR_INCDEC)
@@ -226,6 +226,7 @@ void FunctionLineButton::refresh()
formatNumberAsString(CFN_PARAM(cfn)).c_str());
break;
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
sprintf(s + strlen(s), " = %s", getSourceString(CFN_PARAM(cfn)));
break;
case FUNC_ADJUST_GVAR_GVAR:
@@ -532,6 +533,8 @@ void FunctionEditPage::updateSpecialFunctionOneWindow()
return std::string(STR_CONSTANT);
case FUNC_ADJUST_GVAR_SOURCE:
return std::string(STR_MIXSOURCE);
case FUNC_ADJUST_GVAR_SOURCERAW:
return std::string(STR_MIXSOURCERAW);
case FUNC_ADJUST_GVAR_GVAR:
return std::string(STR_GLOBALVAR);
case FUNC_ADJUST_GVAR_INCDEC:
@@ -549,6 +552,7 @@ void FunctionEditPage::updateSpecialFunctionOneWindow()
break;
}
case FUNC_ADJUST_GVAR_SOURCE:
case FUNC_ADJUST_GVAR_SOURCERAW:
addSourceChoice(line, STR_MIXSOURCE, cfn, MIXSRC_LAST_CH);
break;
case FUNC_ADJUST_GVAR_GVAR: {