bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

M666 normalize positive values to <=0

Browse Source 
M666

+ tower radians absolute value
This commit is contained in:
LVD-AC
2017-04-27 23:24:08 +02:00
committed by teemuatlut
parent d8102aeca8
commit 7a6a1ef583
2 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/ultralcd.cpp
View File

@ -1811,8 +1811,8 @@ void kill_screen(const char* lcd_msg) {
current_position[Z_AXIS] = max(Z_HOMING_HEIGHT, Z_CLEARANCE_BETWEEN_PROBES) + (DELTA_PRINTABLE_RADIUS) / 5;
line_to_current(Z_AXIS);
current_position[X_AXIS] = a < 0 ? LOGICAL_X_POSITION(X_HOME_POS) : sin(a) * -(delta_calibration_radius);
current_position[Y_AXIS] = a < 0 ? LOGICAL_Y_POSITION(Y_HOME_POS) : cos(a) * (delta_calibration_radius);
current_position[X_AXIS] = a < 0 ? LOGICAL_X_POSITION(X_HOME_POS) : cos(RADIANS(a)) * delta_calibration_radius;
current_position[Y_AXIS] = a < 0 ? LOGICAL_Y_POSITION(Y_HOME_POS) : sin(RADIANS(a)) * delta_calibration_radius;
line_to_current(Z_AXIS);
current_position[Z_AXIS] = 4.0;
@ -1824,9 +1824,9 @@ void kill_screen(const char* lcd_msg) {
lcd_goto_screen(lcd_move_z);
}
void _goto_tower_x() { _goto_tower_pos(RADIANS(120)); }
void _goto_tower_y() { _goto_tower_pos(RADIANS(240)); }
void _goto_tower_z() { _goto_tower_pos(0); }
void _goto_tower_x() { _goto_tower_pos(210); }
void _goto_tower_y() { _goto_tower_pos(330); }
void _goto_tower_z() { _goto_tower_pos(90); }
void _goto_center() { _goto_tower_pos(-1); }
void lcd_delta_calibrate_menu() {