|
@@ -1025,7 +1025,7 @@ void lcd_sdcard_menu() {
|
1025
|
1025
|
}
|
1026
|
1026
|
|
1027
|
1027
|
#define menu_edit_type(_type, _name, _strFunc, scale) \
|
1028
|
|
- bool menu_edit_ ## _name () { \
|
|
1028
|
+ bool _menu_edit_ ## _name () { \
|
1029
|
1029
|
bool isClicked = LCD_CLICKED; \
|
1030
|
1030
|
if ((int32_t)encoderPosition < 0) encoderPosition = 0; \
|
1031
|
1031
|
if ((int32_t)encoderPosition > maxEditValue) encoderPosition = maxEditValue; \
|
|
@@ -1037,9 +1037,8 @@ void lcd_sdcard_menu() {
|
1037
|
1037
|
} \
|
1038
|
1038
|
return isClicked; \
|
1039
|
1039
|
} \
|
1040
|
|
- void menu_edit_callback_ ## _name () { \
|
1041
|
|
- if (menu_edit_ ## _name ()) (*callbackFunc)(); \
|
1042
|
|
- } \
|
|
1040
|
+ void menu_edit_ ## _name () { _menu_edit_ ## _name(); } \
|
|
1041
|
+ void menu_edit_callback_ ## _name () { if (_menu_edit_ ## _name ()) (*callbackFunc)(); } \
|
1043
|
1042
|
static void _menu_action_setting_edit_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue) { \
|
1044
|
1043
|
prevMenu = currentMenu; \
|
1045
|
1044
|
prevEncoderPosition = encoderPosition; \
|