CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Shared function for menu_edit_* and menu_edit_callback_*

Browse Source
This commit is contained in:
Scott Lahteine 2015-02-23 20:31:28 -08:00
parent df8c51528f
commit 2af559cca3
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Marlin/ultralcd.cpp
View File

@ -1025,7 +1025,7 @@ void lcd_sdcard_menu() {
} }
#define menu_edit_type(_type, _name, _strFunc, scale) \ #define menu_edit_type(_type, _name, _strFunc, scale) \
bool menu_edit_ ## _name () { \ bool _menu_edit_ ## _name () { \
bool isClicked = LCD_CLICKED; \ bool isClicked = LCD_CLICKED; \
if ((int32_t)encoderPosition < 0) encoderPosition = 0; \ if ((int32_t)encoderPosition < 0) encoderPosition = 0; \
if ((int32_t)encoderPosition > maxEditValue) encoderPosition = maxEditValue; \ if ((int32_t)encoderPosition > maxEditValue) encoderPosition = maxEditValue; \
@ -1037,9 +1037,8 @@ void lcd_sdcard_menu() {
} \ } \
return isClicked; \ return isClicked; \
} \ } \
void menu_edit_callback_ ## _name () { \ void menu_edit_ ## _name () { _menu_edit_ ## _name(); } \
if (menu_edit_ ## _name ()) (*callbackFunc)(); \ void menu_edit_callback_ ## _name () { if (_menu_edit_ ## _name ()) (*callbackFunc)(); } \
} \
static void _menu_action_setting_edit_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue) { \ static void _menu_action_setting_edit_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue) { \
prevMenu = currentMenu; \ prevMenu = currentMenu; \
prevEncoderPosition = encoderPosition; \ prevEncoderPosition = encoderPosition; \