|
@@ -1245,7 +1245,7 @@ static void lcd_status_screen() {
|
1245
|
1245
|
|
1246
|
1246
|
float move_menu_scale;
|
1247
|
1247
|
|
1248
|
|
- static void _lcd_move(const char* name, AxisEnum axis, float min, float max) {
|
|
1248
|
+ static void _lcd_move_xyz(const char* name, AxisEnum axis, float min, float max) {
|
1249
|
1249
|
ENCODER_DIRECTION_NORMAL();
|
1250
|
1250
|
if (encoderPosition) {
|
1251
|
1251
|
refresh_cmd_timeout();
|
|
@@ -1262,13 +1262,13 @@ static void lcd_status_screen() {
|
1262
|
1262
|
#if ENABLED(DELTA)
|
1263
|
1263
|
static float delta_clip_radius_2 = (DELTA_PRINTABLE_RADIUS) * (DELTA_PRINTABLE_RADIUS);
|
1264
|
1264
|
static int delta_clip( float a ) { return sqrt(delta_clip_radius_2 - a*a); }
|
1265
|
|
- static void lcd_move_x() { int clip = delta_clip(current_position[Y_AXIS]); _lcd_move(PSTR(MSG_MOVE_X), X_AXIS, max(sw_endstop_min[X_AXIS], -clip), min(sw_endstop_max[X_AXIS], clip)); }
|
1266
|
|
- static void lcd_move_y() { int clip = delta_clip(current_position[X_AXIS]); _lcd_move(PSTR(MSG_MOVE_Y), Y_AXIS, max(sw_endstop_min[Y_AXIS], -clip), min(sw_endstop_max[Y_AXIS], clip)); }
|
|
1265
|
+ static void lcd_move_x() { int clip = delta_clip(current_position[Y_AXIS]); _lcd_move_xyz(PSTR(MSG_MOVE_X), X_AXIS, max(sw_endstop_min[X_AXIS], -clip), min(sw_endstop_max[X_AXIS], clip)); }
|
|
1266
|
+ static void lcd_move_y() { int clip = delta_clip(current_position[X_AXIS]); _lcd_move_xyz(PSTR(MSG_MOVE_Y), Y_AXIS, max(sw_endstop_min[Y_AXIS], -clip), min(sw_endstop_max[Y_AXIS], clip)); }
|
1267
|
1267
|
#else
|
1268
|
|
- static void lcd_move_x() { _lcd_move(PSTR(MSG_MOVE_X), X_AXIS, sw_endstop_min[X_AXIS], sw_endstop_max[X_AXIS]); }
|
1269
|
|
- static void lcd_move_y() { _lcd_move(PSTR(MSG_MOVE_Y), Y_AXIS, sw_endstop_min[Y_AXIS], sw_endstop_max[Y_AXIS]); }
|
|
1268
|
+ static void lcd_move_x() { _lcd_move_xyz(PSTR(MSG_MOVE_X), X_AXIS, sw_endstop_min[X_AXIS], sw_endstop_max[X_AXIS]); }
|
|
1269
|
+ static void lcd_move_y() { _lcd_move_xyz(PSTR(MSG_MOVE_Y), Y_AXIS, sw_endstop_min[Y_AXIS], sw_endstop_max[Y_AXIS]); }
|
1270
|
1270
|
#endif
|
1271
|
|
- static void lcd_move_z() { _lcd_move(PSTR(MSG_MOVE_Z), Z_AXIS, sw_endstop_min[Z_AXIS], sw_endstop_max[Z_AXIS]); }
|
|
1271
|
+ static void lcd_move_z() { _lcd_move_xyz(PSTR(MSG_MOVE_Z), Z_AXIS, sw_endstop_min[Z_AXIS], sw_endstop_max[Z_AXIS]); }
|
1272
|
1272
|
static void lcd_move_e(
|
1273
|
1273
|
#if EXTRUDERS > 1
|
1274
|
1274
|
int8_t eindex = -1
|