|
|
@ -666,19 +666,6 @@ inline void line_to_current() {
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
}
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
float move_menu_scale;
|
|
|
|
|
|
|
|
static void lcd_move_menu_axis() {
|
|
|
|
|
|
|
|
START_MENU();
|
|
|
|
|
|
|
|
MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu);
|
|
|
|
|
|
|
|
MENU_ITEM(submenu, MSG_MOVE_X, lcd_move_x);
|
|
|
|
|
|
|
|
MENU_ITEM(submenu, MSG_MOVE_Y, lcd_move_y);
|
|
|
|
|
|
|
|
if (move_menu_scale < 10.0) {
|
|
|
|
|
|
|
|
MENU_ITEM(submenu, MSG_MOVE_Z, lcd_move_z);
|
|
|
|
|
|
|
|
MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
END_MENU();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
static void _lcd_move(const char *name, int axis, int min, int max) {
|
|
|
|
static void _lcd_move(const char *name, int axis, int min, int max) {
|
|
|
|
if (encoderPosition != 0) {
|
|
|
|
if (encoderPosition != 0) {
|
|
|
|
refresh_cmd_timeout();
|
|
|
|
refresh_cmd_timeout();
|
|
|
@ -696,6 +683,19 @@ static void lcd_move_x() { _lcd_move(PSTR("X"), X_AXIS, X_MIN_POS, X_MAX_POS); }
|
|
|
|
static void lcd_move_y() { _lcd_move(PSTR("Y"), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
|
|
|
|
static void lcd_move_y() { _lcd_move(PSTR("Y"), Y_AXIS, Y_MIN_POS, Y_MAX_POS); }
|
|
|
|
static void lcd_move_z() { _lcd_move(PSTR("Z"), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
|
|
|
|
static void lcd_move_z() { _lcd_move(PSTR("Z"), Z_AXIS, Z_MIN_POS, Z_MAX_POS); }
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
float move_menu_scale;
|
|
|
|
|
|
|
|
static void lcd_move_menu_axis() {
|
|
|
|
|
|
|
|
START_MENU();
|
|
|
|
|
|
|
|
MENU_ITEM(back, MSG_MOVE_AXIS, lcd_move_menu);
|
|
|
|
|
|
|
|
MENU_ITEM(submenu, MSG_MOVE_X, lcd_move_x);
|
|
|
|
|
|
|
|
MENU_ITEM(submenu, MSG_MOVE_Y, lcd_move_y);
|
|
|
|
|
|
|
|
if (move_menu_scale < 10.0) {
|
|
|
|
|
|
|
|
MENU_ITEM(submenu, MSG_MOVE_Z, lcd_move_z);
|
|
|
|
|
|
|
|
MENU_ITEM(submenu, MSG_MOVE_E, lcd_move_e);
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
END_MENU();
|
|
|
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
|
|
static void lcd_move_e() {
|
|
|
|
static void lcd_move_e() {
|
|
|
|
if (encoderPosition != 0) {
|
|
|
|
if (encoderPosition != 0) {
|
|
|
|
current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
|
|
|
|
current_position[E_AXIS] += float((int)encoderPosition) * move_menu_scale;
|
|
|
|