Fix global functions navigation
This commit is contained in:
@@ -22,7 +22,7 @@
|
|||||||
|
|
||||||
void menuRadioSpecialFunctions(event_t event)
|
void menuRadioSpecialFunctions(event_t event)
|
||||||
{
|
{
|
||||||
#if defined(PCBTARANIS)
|
#if defined(NAVIGATION_X7)
|
||||||
const CustomFunctionData * cfn = &g_eeGeneral.customFn[menuVerticalPosition];
|
const CustomFunctionData * cfn = &g_eeGeneral.customFn[menuVerticalPosition];
|
||||||
if (!CFN_SWITCH(cfn) && menuHorizontalPosition < 0 && event==EVT_KEY_BREAK(KEY_ENTER)) {
|
if (!CFN_SWITCH(cfn) && menuHorizontalPosition < 0 && event==EVT_KEY_BREAK(KEY_ENTER)) {
|
||||||
menuHorizontalPosition = 0;
|
menuHorizontalPosition = 0;
|
||||||
@@ -33,7 +33,7 @@ void menuRadioSpecialFunctions(event_t event)
|
|||||||
|
|
||||||
menuSpecialFunctions(event, g_eeGeneral.customFn, &globalFunctionsContext);
|
menuSpecialFunctions(event, g_eeGeneral.customFn, &globalFunctionsContext);
|
||||||
|
|
||||||
#if defined(PCBX7)
|
#if defined(NAVIGATION_X7)
|
||||||
if (!CFN_SWITCH(cfn) && menuHorizontalPosition == 0 && s_editMode <= 0) {
|
if (!CFN_SWITCH(cfn) && menuHorizontalPosition == 0 && s_editMode <= 0) {
|
||||||
menuHorizontalPosition = -1;
|
menuHorizontalPosition = -1;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -384,7 +384,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
|||||||
else if (attr) {
|
else if (attr) {
|
||||||
REPEAT_LAST_CURSOR_MOVE();
|
REPEAT_LAST_CURSOR_MOVE();
|
||||||
}
|
}
|
||||||
#if defined(PCBX7) || defined(PCBX9LITE)
|
#if defined(NAVIGATION_X7)
|
||||||
if (active || event==EVT_KEY_LONG(KEY_ENTER)) {
|
if (active || event==EVT_KEY_LONG(KEY_ENTER)) {
|
||||||
CFN_PARAM(cfn) = CHECK_INCDEC_PARAM(event, val_displayed, val_min, val_max);
|
CFN_PARAM(cfn) = CHECK_INCDEC_PARAM(event, val_displayed, val_min, val_max);
|
||||||
if (func == FUNC_ADJUST_GVAR && attr && event==EVT_KEY_LONG(KEY_ENTER)) {
|
if (func == FUNC_ADJUST_GVAR && attr && event==EVT_KEY_LONG(KEY_ENTER)) {
|
||||||
@@ -431,7 +431,7 @@ void menuSpecialFunctions(event_t event, CustomFunctionData * functions, CustomF
|
|||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
#if defined(PCBX7) || defined(PCBX9LITE)
|
#if defined(NAVIGATION_X7)
|
||||||
if (sub==k && menuHorizontalPosition<0 && CFN_SWITCH(cfn)) {
|
if (sub==k && menuHorizontalPosition<0 && CFN_SWITCH(cfn)) {
|
||||||
lcdInvertLine(i+1);
|
lcdInvertLine(i+1);
|
||||||
}
|
}
|
||||||
|
|||||||
Reference in New Issue
Block a user