3DPrinting/MarlinFirmware
1
0
Fork 0
mirror of https://github.com/MarlinFirmware/Marlin.git synced 2024-11-30 15:26:18 +00:00
Code Issues Releases Wiki Activity

Use configured feedrates, center for DELTA_CALIBRATION_MENU

Browse Source
This commit is contained in:
Scott Lahteine 2016-08-09 23:24:51 -07:00
parent cd496dd9bd
commit 432e9a1f50
1 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/ultralcd.cpp
View File

@ -1261,15 +1261,17 @@ void kill_screen(const char* lcd_msg) {
#if ENABLED(DELTA_CALIBRATION_MENU) #if ENABLED(DELTA_CALIBRATION_MENU)
static void _goto_tower_pos(const float &a) { static void _goto_tower_pos(const float &a) {
char cmd[26]; do_blocking_move_to(
sprintf_P(cmd, PSTR("G1 F4000 X%i Y%i"), int(-(DELTA_PRINTABLE_RADIUS) * sin(a)), int((DELTA_PRINTABLE_RADIUS) * cos(a))); a < 0 ? X_HOME_POS : sin(a) * -(DELTA_PRINTABLE_RADIUS),
enqueue_and_echo_commands_P(PSTR("G1 F8000 Z4")); a < 0 ? Y_HOME_POS : cos(a) * (DELTA_PRINTABLE_RADIUS),
enqueue_and_echo_command(cmd); 4
);
} }
static void _goto_tower_x() { _goto_tower_pos(RADIANS(120)); } static void _goto_tower_x() { _goto_tower_pos(RADIANS(120)); }
static void _goto_tower_y() { _goto_tower_pos(RADIANS(240)); } static void _goto_tower_y() { _goto_tower_pos(RADIANS(240)); }
static void _goto_tower_z() { _goto_tower_pos(0); } static void _goto_tower_z() { _goto_tower_pos(0); }
static void _goto_center() { _goto_tower_pos(-1); }
static void lcd_delta_calibrate_menu() { static void lcd_delta_calibrate_menu() {
START_MENU(); START_MENU();
@ -1278,7 +1280,7 @@ void kill_screen(const char* lcd_msg) {
MENU_ITEM(function, MSG_DELTA_CALIBRATE_X, _goto_tower_x); MENU_ITEM(function, MSG_DELTA_CALIBRATE_X, _goto_tower_x);
MENU_ITEM(function, MSG_DELTA_CALIBRATE_Y, _goto_tower_y); MENU_ITEM(function, MSG_DELTA_CALIBRATE_Y, _goto_tower_y);
MENU_ITEM(function, MSG_DELTA_CALIBRATE_Z, _goto_tower_z); MENU_ITEM(function, MSG_DELTA_CALIBRATE_Z, _goto_tower_z);
MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_CENTER, PSTR("G1 F8000 Z4\nG1 F4000 X0 Y0")); MENU_ITEM(function, MSG_DELTA_CALIBRATE_CENTER, _goto_center);
END_MENU(); END_MENU();
} }