|
@@ -1384,8 +1384,6 @@ void lcd_pause_usb_print()
|
|
|
SERIAL_PROTOCOLLNRPGM(MSG_OCTOPRINT_PAUSE);
|
|
|
}
|
|
|
|
|
|
-
|
|
|
-float move_menu_scale;
|
|
|
static void lcd_move_menu_axis();
|
|
|
|
|
|
|
|
@@ -2762,7 +2760,7 @@ static void _lcd_move(const char *name, uint8_t axis, int min, int max)
|
|
|
refresh_cmd_timeout();
|
|
|
if (! planner_queue_full())
|
|
|
{
|
|
|
- current_position[axis] += float((int)lcd_encoder) * move_menu_scale;
|
|
|
+ current_position[axis] += float((int)lcd_encoder);
|
|
|
if (min_software_endstops && current_position[axis] < min) current_position[axis] = min;
|
|
|
if (max_software_endstops && current_position[axis] > max) current_position[axis] = max;
|
|
|
lcd_encoder = 0;
|
|
@@ -2790,7 +2788,7 @@ void lcd_move_e()
|
|
|
refresh_cmd_timeout();
|
|
|
if (! planner_queue_full())
|
|
|
{
|
|
|
- current_position[E_AXIS] += float((int)lcd_encoder) * move_menu_scale;
|
|
|
+ current_position[E_AXIS] += float((int)lcd_encoder);
|
|
|
lcd_encoder = 0;
|
|
|
plan_buffer_line_curposXYZE(manual_feedrate[E_AXIS] / 60);
|
|
|
lcd_draw_update = 1;
|
|
@@ -4234,13 +4232,6 @@ void lcd_move_menu_axis()
|
|
|
MENU_END();
|
|
|
}
|
|
|
|
|
|
-static void lcd_move_menu_1mm()
|
|
|
-{
|
|
|
- move_menu_scale = 1.0;
|
|
|
- lcd_move_menu_axis();
|
|
|
-}
|
|
|
-
|
|
|
-
|
|
|
void EEPROM_save(int pos, uint8_t* value, uint8_t size)
|
|
|
{
|
|
|
do
|
|
@@ -5671,7 +5662,7 @@ static void lcd_settings_menu()
|
|
|
|
|
|
if (!PRINTER_ACTIVE || isPrintPaused)
|
|
|
{
|
|
|
- MENU_ITEM_SUBMENU_P(_i("Move axis"), lcd_move_menu_1mm);////MSG_MOVE_AXIS c=18
|
|
|
+ MENU_ITEM_SUBMENU_P(_i("Move axis"), lcd_move_menu_axis);////MSG_MOVE_AXIS c=18
|
|
|
MENU_ITEM_GCODE_P(_i("Disable steppers"), PSTR("M84"));////MSG_DISABLE_STEPPERS c=18
|
|
|
}
|
|
|
|
|
@@ -8879,7 +8870,6 @@ void menu_lcd_longpress_func(void)
|
|
|
#endif
|
|
|
|| menu_menu == lcd_support_menu
|
|
|
){
|
|
|
- move_menu_scale = 1.0;
|
|
|
menu_submenu(lcd_move_z);
|
|
|
} else {
|
|
|
// otherwise consume the long press as normal click
|