Browse Source

lcd_goto_menu should set lcdDrawUpdate to 2

Scott Lahteine 9 years ago
parent
commit
0d6609c3c5
1 changed files with 3 additions and 3 deletions
  1. 3
    3
      Marlin/ultralcd.cpp

+ 3
- 3
Marlin/ultralcd.cpp View File

298
 static void lcd_goto_menu(menuFunc_t menu, const bool feedback = false, const uint32_t encoder = 0) {
298
 static void lcd_goto_menu(menuFunc_t menu, const bool feedback = false, const uint32_t encoder = 0) {
299
   if (currentMenu != menu) {
299
   if (currentMenu != menu) {
300
     currentMenu = menu;
300
     currentMenu = menu;
301
+    lcdDrawUpdate = 2;
301
     #if ENABLED(NEWPANEL)
302
     #if ENABLED(NEWPANEL)
302
       encoderPosition = encoder;
303
       encoderPosition = encoder;
303
       if (feedback) lcd_quick_feedback();
304
       if (feedback) lcd_quick_feedback();
2476
           current_position[X_AXIS] = mbl.get_x(ix);
2477
           current_position[X_AXIS] = mbl.get_x(ix);
2477
           current_position[Y_AXIS] = mbl.get_y(iy);
2478
           current_position[Y_AXIS] = mbl.get_y(iy);
2478
           line_to_current(manual_feedrate[X_AXIS] <= manual_feedrate[Y_AXIS] ? X_AXIS : Y_AXIS);
2479
           line_to_current(manual_feedrate[X_AXIS] <= manual_feedrate[Y_AXIS] ? X_AXIS : Y_AXIS);
2479
-          lcdDrawUpdate = 2;
2480
+          lcdDrawUpdate = 1;
2480
         }
2481
         }
2481
       }
2482
       }
2482
     }
2483
     }
2490
    */
2491
    */
2491
   static void _lcd_level_bed_homing() {
2492
   static void _lcd_level_bed_homing() {
2492
     if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ " MSG_LEVEL_BED_HOMING), NULL);
2493
     if (lcdDrawUpdate) lcd_implementation_drawedit(PSTR("XYZ " MSG_LEVEL_BED_HOMING), NULL);
2494
+    lcdDrawUpdate = 1;
2493
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) {
2495
     if (axis_known_position[X_AXIS] && axis_known_position[Y_AXIS] && axis_known_position[Z_AXIS]) {
2494
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
2496
       current_position[Z_AXIS] = MESH_HOME_SEARCH_Z;
2495
       plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
2497
       plan_set_position(current_position[X_AXIS], current_position[Y_AXIS], current_position[Z_AXIS], current_position[E_AXIS]);
2499
       _lcd_level_bed_position = 0;
2501
       _lcd_level_bed_position = 0;
2500
       lcd_goto_menu(_lcd_level_bed);
2502
       lcd_goto_menu(_lcd_level_bed);
2501
     }
2503
     }
2502
-    lcdDrawUpdate = 2;
2503
   }
2504
   }
2504
 
2505
 
2505
   /**
2506
   /**
2510
     axis_known_position[X_AXIS] = axis_known_position[Y_AXIS] = axis_known_position[Z_AXIS] = false;
2511
     axis_known_position[X_AXIS] = axis_known_position[Y_AXIS] = axis_known_position[Z_AXIS] = false;
2511
     mbl.reset();
2512
     mbl.reset();
2512
     enqueue_and_echo_commands_P(PSTR("G28"));
2513
     enqueue_and_echo_commands_P(PSTR("G28"));
2513
-    lcdDrawUpdate = 2;
2514
     lcd_goto_menu(_lcd_level_bed_homing);
2514
     lcd_goto_menu(_lcd_level_bed_homing);
2515
   }
2515
   }
2516
 
2516
 

Loading…
Cancel
Save