melch/Marlin
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Make DELTA_CALIBRATION_MENU more universal

Browse Source
This commit is contained in:
Scott Lahteine 2016-08-08 19:35:26 -07:00
parent 85c4d5d2b5
commit b16ea09498
1 changed files with 15 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
Marlin/ultralcd.cpp
View File

@ -1260,14 +1260,25 @@ 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) {
char cmd[20];
sprintf_P(cmd, PSTR("G1 X%i Y%i"), int(-(DELTA_PRINTABLE_RADIUS) * sin(a)), int((DELTA_PRINTABLE_RADIUS) * cos(a)));
enqueue_and_echo_commands_P(PSTR("G1 F8000 Z4\nG1 F4000"));
enqueue_and_echo_command(cmd);
}
static void _goto_tower_x() { _goto_tower_pos(RADIANS(120)); }
static void _goto_tower_y() { _goto_tower_pos(RADIANS(240)); }
static void _goto_tower_z() { _goto_tower_pos(0); }
static void lcd_delta_calibrate_menu() { static void lcd_delta_calibrate_menu() {
START_MENU(); START_MENU();
MENU_ITEM(back, MSG_MAIN); MENU_ITEM(back, MSG_MAIN);
MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28")); MENU_ITEM(gcode, MSG_AUTO_HOME, PSTR("G28"));
MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_X, PSTR("G0 F8000 X-77.94 Y-45 Z0")); MENU_ITEM(function, MSG_DELTA_CALIBRATE_X, _goto_tower_x);
MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_Y, PSTR("G0 F8000 X77.94 Y-45 Z0")); MENU_ITEM(function, MSG_DELTA_CALIBRATE_Y, _goto_tower_y);
MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_Z, PSTR("G0 F8000 X0 Y90 Z0")); MENU_ITEM(function, MSG_DELTA_CALIBRATE_Z, _goto_tower_z);
MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_CENTER, PSTR("G0 F8000 X0 Y0 Z0")); MENU_ITEM(gcode, MSG_DELTA_CALIBRATE_CENTER, PSTR("G1 F8000 Z4\nG1 F4000 X0 Y0"));
END_MENU(); END_MENU();
} }