Browse Source

Actual menu change. Moved menu logic to not be shown unless not currently printing. (untested but straight-forward, printer in a bad state currently)

Caleb Anderson 9 years ago
parent
commit
cb047e9070
1 changed files with 21 additions and 0 deletions
  1. 21
    0
      Marlin/ultralcd.cpp

+ 21
- 0
Marlin/ultralcd.cpp View File

65
 static void lcd_control_retract_menu();
65
 static void lcd_control_retract_menu();
66
 static void lcd_sdcard_menu();
66
 static void lcd_sdcard_menu();
67
 
67
 
68
+#ifdef DELTA_CALIBRATION_MENU
69
+static void lcd_delta_calibrate_menu();
70
+#endif // DELTA_CALIBRATION_MENU
71
+
68
 static void lcd_quick_feedback();//Cause an LCD refresh, and give the user visual or audible feedback that something has happened
72
 static void lcd_quick_feedback();//Cause an LCD refresh, and give the user visual or audible feedback that something has happened
69
 
73
 
70
 /* Different types of actions that can be used in menu items. */
74
 /* Different types of actions that can be used in menu items. */
334
         MENU_ITEM(submenu, MSG_TUNE, lcd_tune_menu);
338
         MENU_ITEM(submenu, MSG_TUNE, lcd_tune_menu);
335
     }else{
339
     }else{
336
         MENU_ITEM(submenu, MSG_PREPARE, lcd_prepare_menu);
340
         MENU_ITEM(submenu, MSG_PREPARE, lcd_prepare_menu);
341
+#ifdef DELTA_CALIBRATION_MENU
342
+        MENU_ITEM(submenu, MSG_DELTA_CALIBRATE, lcd_delta_calibrate_menu);
343
+#endif // DELTA_CALIBRATION_MENU
337
     }
344
     }
338
     MENU_ITEM(submenu, MSG_CONTROL, lcd_control_menu);
345
     MENU_ITEM(submenu, MSG_CONTROL, lcd_control_menu);
339
 #ifdef SDSUPPORT
346
 #ifdef SDSUPPORT
628
     END_MENU();
635
     END_MENU();
629
 }
636
 }
630
 
637
 
638
+#ifdef DELTA_CALIBRATION_MENU
639
+static void lcd_delta_calibrate_menu()
640
+{
641
+    START_MENU();
642
+    MENU_ITEM(back, MSG_MAIN, lcd_main_menu);
643
+    MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
644
+    MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_X, PSTR("G0 F8000 X-77.94 Y-45 Z0"));
645
+    MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_Y, PSTR("G0 F8000 X77.94 Y-45 Z0"));
646
+    MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_Z, PSTR("G0 F8000 X0 Y90 Z0"));
647
+    MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_CENTER, PSTR("G0 F8000 X0 Y0 Z0"));
648
+    END_MENU();
649
+}
650
+#endif // DELTA_CALIBRATION_MENU
651
+
631
 float move_menu_scale;
652
 float move_menu_scale;
632
 static void lcd_move_menu_axis();
653
 static void lcd_move_menu_axis();
633
 
654
 

Loading…
Cancel
Save