Browse Source

lcd_save_previous_menu => lcd_save_previous_screen

Scott Lahteine 8 years ago
parent
commit
c70a06daf1
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      Marlin/ultralcd.cpp

+ 3
- 3
Marlin/ultralcd.cpp View File

418
 
418
 
419
   void lcd_return_to_status() { lcd_goto_screen(lcd_status_screen); }
419
   void lcd_return_to_status() { lcd_goto_screen(lcd_status_screen); }
420
 
420
 
421
-  inline void lcd_save_previous_menu() {
421
+  void lcd_save_previous_screen() {
422
     if (screen_history_depth < COUNT(screen_history)) {
422
     if (screen_history_depth < COUNT(screen_history)) {
423
       screen_history[screen_history_depth].menu_function = currentScreen;
423
       screen_history[screen_history_depth].menu_function = currentScreen;
424
       screen_history[screen_history_depth].encoder_position = encoderPosition;
424
       screen_history[screen_history_depth].encoder_position = encoderPosition;
2343
     void menu_edit_ ## _name () { _menu_edit_ ## _name(); } \
2343
     void menu_edit_ ## _name () { _menu_edit_ ## _name(); } \
2344
     void menu_edit_callback_ ## _name () { if (_menu_edit_ ## _name ()) (*callbackFunc)(); } \
2344
     void menu_edit_callback_ ## _name () { if (_menu_edit_ ## _name ()) (*callbackFunc)(); } \
2345
     void _menu_action_setting_edit_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue) { \
2345
     void _menu_action_setting_edit_ ## _name (const char* pstr, _type* ptr, _type minValue, _type maxValue) { \
2346
-      lcd_save_previous_menu(); \
2346
+      lcd_save_previous_screen(); \
2347
       \
2347
       \
2348
       lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; \
2348
       lcdDrawUpdate = LCDVIEW_CLEAR_CALL_REDRAW; \
2349
       \
2349
       \
2434
    *
2434
    *
2435
    */
2435
    */
2436
   void _menu_action_back() { lcd_goto_previous_menu(); }
2436
   void _menu_action_back() { lcd_goto_previous_menu(); }
2437
-  void menu_action_submenu(screenFunc_t func) { lcd_save_previous_menu(); lcd_goto_screen(func); }
2437
+  void menu_action_submenu(screenFunc_t func) { lcd_save_previous_screen(); lcd_goto_screen(func); }
2438
   void menu_action_gcode(const char* pgcode) { enqueue_and_echo_commands_P(pgcode); }
2438
   void menu_action_gcode(const char* pgcode) { enqueue_and_echo_commands_P(pgcode); }
2439
   void menu_action_function(screenFunc_t func) { (*func)(); }
2439
   void menu_action_function(screenFunc_t func) { (*func)(); }
2440
 
2440
 

Loading…
Cancel
Save