0x90/Marlin
12
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Fix menu callback issue wrt LCD_CLICKED

Browse source
This commit is contained in:
Scott Lahteine 2015-02-23 19:40:57 -08:00
parent 0cf0c20532
commit fa4c36df68
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
Marlin/ultralcd.cpp
View file

@ -1025,19 +1025,20 @@ void lcd_sdcard_menu() {
}
#define menu_edit_type(_type, _name, _strFunc, scale) \
void menu_edit_ ## _name () { \
bool menu_edit_ ## _name () { \
bool isClicked = LCD_CLICKED;
if ((int32_t)encoderPosition < 0) encoderPosition = 0; \
if ((int32_t)encoderPosition > maxEditValue) encoderPosition = maxEditValue; \
if (lcdDrawUpdate) \
lcd_implementation_drawedit(editLabel, _strFunc(((_type)((int32_t)encoderPosition + minEditValue)) / scale)); \
if (LCD_CLICKED) { \
if (isClicked) { \
*((_type*)editValue) = ((_type)((int32_t)encoderPosition + minEditValue)) / scale; \
lcd_goto_menu(prevMenu, prevEncoderPosition); \
} \
return isClicked;
} \
void menu_edit_callback_ ## _name () { \
menu_edit_ ## _name (); \
if (LCD_CLICKED) (*callbackFunc)(); \
if (menu_edit_ ## _name ()) (*callbackFunc)(); \
} \
static void _menu_action_setting_edit_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue) { \
prevMenu = currentMenu; \