Skip to content

Commit

Permalink
Configurable Z move distance (#14593)
Browse files Browse the repository at this point in the history
  • Loading branch information
MarcelMo authored and thinkyhead committed Jul 30, 2019
1 parent 842466f commit f8aa523
Show file tree
Hide file tree
Showing 119 changed files with 142 additions and 32 deletions.
1 change: 1 addition & 0 deletions Marlin/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@

#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
#define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
#define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
#if ENABLED(ULTIPANEL)
#define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
#define ULTIPANEL_FEEDMULTIPLY // Encoder sets the feedrate multiplier on the Status Screen
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_an.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
#define MSG_MOVE_Y _UxGT("Mover Y")
#define MSG_MOVE_Z _UxGT("Mover Z")
#define MSG_MOVE_E _UxGT("Extrusor")
#define MSG_MOVE_0025MM _UxGT("Mover 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Mover %smm")
#define MSG_MOVE_01MM _UxGT("Mover 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mover 1mm")
#define MSG_MOVE_10MM _UxGT("Mover 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_bg.h
Original file line number Diff line number Diff line change
Expand Up @@ -62,7 +62,7 @@
#define MSG_MOVE_Y _UxGT("Движение по Y")
#define MSG_MOVE_Z _UxGT("Движение по Z")
#define MSG_MOVE_E _UxGT("Екструдер")
#define MSG_MOVE_0025MM _UxGT("Премести с 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Премести с %smm")
#define MSG_MOVE_01MM _UxGT("Премести с 0.1mm")
#define MSG_MOVE_1MM _UxGT("Премести с 1mm")
#define MSG_MOVE_10MM _UxGT("Премести с 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_ca.h
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@
#define MSG_MOVE_Y _UxGT("Mou Y")
#define MSG_MOVE_Z _UxGT("Mou Z")
#define MSG_MOVE_E _UxGT("Extrusor")
#define MSG_MOVE_0025MM _UxGT("Mou 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Mou %smm")
#define MSG_MOVE_01MM _UxGT("Mou 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mou 1mm")
#define MSG_MOVE_10MM _UxGT("Mou 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_cz.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@
#define MSG_MOVE_Z _UxGT("Posunout Z")
#define MSG_MOVE_E _UxGT("Extrudér")
#define MSG_HOTEND_TOO_COLD _UxGT("Hotend je studený")
#define MSG_MOVE_0025MM _UxGT("Posunout o 0,025mm")
#define MSG_MOVE_Z_DIST _UxGT("Posunout o %smm")
#define MSG_MOVE_01MM _UxGT("Posunout o 0,1mm")
#define MSG_MOVE_1MM _UxGT("Posunout o 1mm")
#define MSG_MOVE_10MM _UxGT("Posunout o 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_da.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
#define MSG_MOVE_Y _UxGT("Flyt Y")
#define MSG_MOVE_Z _UxGT("Flyt Z")
#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_0025MM _UxGT("Flyt 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Flyt %smm")
#define MSG_MOVE_01MM _UxGT("Flyt 0.1mm")
#define MSG_MOVE_1MM _UxGT("Flyt 1mm")
#define MSG_MOVE_10MM _UxGT("Flyt 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_de.h
Original file line number Diff line number Diff line change
Expand Up @@ -199,7 +199,7 @@
#define MSG_MOVE_Z _UxGT("Bewege Z")
#define MSG_MOVE_E _UxGT("Bewege Extruder")
#define MSG_HOTEND_TOO_COLD _UxGT("Hotend zu kalt")
#define MSG_MOVE_0025MM _UxGT(" 0,025 mm")
#define MSG_MOVE_Z_DIST _UxGT(" %s mm")
#define MSG_MOVE_01MM _UxGT(" 0,1 mm")
#define MSG_MOVE_1MM _UxGT(" 1,0 mm")
#define MSG_MOVE_10MM _UxGT("10,0 mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_el-gr.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
#define MSG_MOVE_Y _UxGT("Μετακίνηση Y")
#define MSG_MOVE_Z _UxGT("Μετακίνηση Z")
#define MSG_MOVE_E _UxGT("Εξωθητήρας")
#define MSG_MOVE_0025MM _UxGT("Μετακίνηση 0,025 μμ")
#define MSG_MOVE_Z_DIST _UxGT("Μετακίνηση %s μμ")
#define MSG_MOVE_01MM _UxGT("Μετακίνηση 0,1 μμ")
#define MSG_MOVE_1MM _UxGT("Μετακίνηση 1 μμ")
#define MSG_MOVE_10MM _UxGT("Μετακίνηση 10 μμ")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_el.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
#define MSG_MOVE_Y _UxGT("Μετακίνηση Y")
#define MSG_MOVE_Z _UxGT("Μετακίνηση Z")
#define MSG_MOVE_E _UxGT("Εξωθητήρας")
#define MSG_MOVE_0025MM _UxGT("Μετακίνηση 0,025 μμ")
#define MSG_MOVE_Z_DIST _UxGT("Μετακίνηση %s μμ")
#define MSG_MOVE_01MM _UxGT("Μετακίνηση 0,1 μμ")
#define MSG_MOVE_1MM _UxGT("Μετακίνηση 1 μμ")
#define MSG_MOVE_10MM _UxGT("Μετακίνηση 10 μμ")
Expand Down
4 changes: 2 additions & 2 deletions Marlin/src/lcd/language/language_en.h
Original file line number Diff line number Diff line change
Expand Up @@ -543,8 +543,8 @@
#ifndef MSG_HOTEND_TOO_COLD
#define MSG_HOTEND_TOO_COLD _UxGT("Hotend too cold")
#endif
#ifndef MSG_MOVE_0025MM
#define MSG_MOVE_0025MM _UxGT("Move 0.025mm")
#ifndef MSG_MOVE_Z_DIST
#define MSG_MOVE_Z_DIST _UxGT("Move %smm")
#endif
#ifndef MSG_MOVE_01MM
#define MSG_MOVE_01MM _UxGT("Move 0.1mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_es.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
#define MSG_MOVE_Y _UxGT("Mover Y")
#define MSG_MOVE_Z _UxGT("Mover Z")
#define MSG_MOVE_E _UxGT("Extrusor")
#define MSG_MOVE_0025MM _UxGT("Mover 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Mover %smm")
#define MSG_MOVE_01MM _UxGT("Mover 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mover 1mm")
#define MSG_MOVE_10MM _UxGT("Mover 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_eu.h
Original file line number Diff line number Diff line change
Expand Up @@ -166,7 +166,7 @@
#define MSG_MOVE_Y _UxGT("Mugitu Y")
#define MSG_MOVE_Z _UxGT("Mugitu Z")
#define MSG_MOVE_E _UxGT("Estrusorea")
#define MSG_MOVE_0025MM _UxGT("Mugitu 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Mugitu %smm")
#define MSG_MOVE_01MM _UxGT("Mugitu 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mugitu 1mm")
#define MSG_MOVE_10MM _UxGT("Mugitu 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_fi.h
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,7 @@
#define MSG_MOVE_Y _UxGT("Liikuta Y")
#define MSG_MOVE_Z _UxGT("Liikuta Z")
#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_0025MM _UxGT("Liikuta 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Liikuta %smm")
#define MSG_MOVE_01MM _UxGT("Liikuta 0.1mm")
#define MSG_MOVE_1MM _UxGT("Liikuta 1mm")
#define MSG_MOVE_10MM _UxGT("Liikuta 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_fr.h
Original file line number Diff line number Diff line change
Expand Up @@ -195,7 +195,7 @@
#define MSG_MOVE_Z _UxGT("Déplacer Z")
#define MSG_MOVE_E _UxGT("Extrudeur")
#define MSG_HOTEND_TOO_COLD _UxGT("Buse trop froide")
#define MSG_MOVE_0025MM _UxGT("Déplacer 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Déplacer %smm")
#define MSG_MOVE_01MM _UxGT("Déplacer 0.1mm")
#define MSG_MOVE_1MM _UxGT("Déplacer 1mm")
#define MSG_MOVE_10MM _UxGT("Déplacer 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_gl.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
#define MSG_MOVE_Y _UxGT("Mover Y")
#define MSG_MOVE_Z _UxGT("Mover Z")
#define MSG_MOVE_E _UxGT("Extrusor")
#define MSG_MOVE_0025MM _UxGT("Mover 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Mover %smm")
#define MSG_MOVE_01MM _UxGT("Mover 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mover 1mm")
#define MSG_MOVE_10MM _UxGT("Mover 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_hr.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
#define MSG_MOVE_Y _UxGT("Miči Y")
#define MSG_MOVE_Z _UxGT("Miči Z")
#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_0025MM _UxGT("Miči 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Miči %smm")
#define MSG_MOVE_01MM _UxGT("Miči 0.1mm")
#define MSG_MOVE_1MM _UxGT("Miči 1mm")
#define MSG_MOVE_10MM _UxGT("Miči 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_it.h
Original file line number Diff line number Diff line change
Expand Up @@ -197,7 +197,7 @@
#define MSG_MOVE_Z _UxGT("Muovi Z")
#define MSG_MOVE_E _UxGT("Estrusore")
#define MSG_HOTEND_TOO_COLD _UxGT("Ugello freddo")
#define MSG_MOVE_0025MM _UxGT("Muovi di 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Muovi di %smm")
#define MSG_MOVE_01MM _UxGT("Muovi di 0.1mm")
#define MSG_MOVE_1MM _UxGT("Muovi di 1mm")
#define MSG_MOVE_10MM _UxGT("Muovi di 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_jp-kana.h
Original file line number Diff line number Diff line change
Expand Up @@ -82,7 +82,7 @@
#define MSG_MOVE_Y _UxGT("Yジク イドウ") // "Move Y"
#define MSG_MOVE_Z _UxGT("Zジク イドウ") // "Move Z"
#define MSG_MOVE_E _UxGT("エクストルーダー") // "Extruder"
#define MSG_MOVE_0025MM _UxGT("0.025mm イドウ") // "Move 0.025mm"
#define MSG_MOVE_Z_DIST _UxGT("%smm イドウ") // "Move 0.025mm"
#define MSG_MOVE_01MM _UxGT("0.1mm イドウ") // "Move 0.1mm"
#define MSG_MOVE_1MM _UxGT(" 1mm イドウ") // "Move 1mm"
#define MSG_MOVE_10MM _UxGT(" 10mm イドウ") // "Move 10mm"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_ko_KR.h
Original file line number Diff line number Diff line change
Expand Up @@ -177,7 +177,7 @@
#define MSG_MOVE_Y _UxGT("Move Y")
#define MSG_MOVE_Z _UxGT("Move Z")
#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_0025MM _UxGT("Move 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Move %smm")
#define MSG_MOVE_01MM _UxGT("Move 0.1mm")
#define MSG_MOVE_1MM _UxGT("Move 1mm")
#define MSG_MOVE_10MM _UxGT("Move 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_nl.h
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@
#define MSG_MOVE_Y _UxGT("Verplaats Y")
#define MSG_MOVE_Z _UxGT("Verplaats Z")
#define MSG_MOVE_E _UxGT("Extruder")
#define MSG_MOVE_0025MM _UxGT("Verplaats 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Verplaats %smm")
#define MSG_MOVE_01MM _UxGT("Verplaats 0.1mm")
#define MSG_MOVE_1MM _UxGT("Verplaats 1mm")
#define MSG_MOVE_10MM _UxGT("Verplaats 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_pl.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
#define MSG_MOVE_Y _UxGT("Przesuń w Y")
#define MSG_MOVE_Z _UxGT("Przesuń w Z")
#define MSG_MOVE_E _UxGT("Ekstruzja (os E)")
#define MSG_MOVE_0025MM _UxGT("Przesuń co .025mm")
#define MSG_MOVE_Z_DIST _UxGT("Przesuń co %smm")
#define MSG_MOVE_01MM _UxGT("Przesuń co .1mm")
#define MSG_MOVE_1MM _UxGT("Przesuń co 1mm")
#define MSG_MOVE_10MM _UxGT("Przesuń co 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_pt-br.h
Original file line number Diff line number Diff line change
Expand Up @@ -189,7 +189,7 @@
#define MSG_MOVE_Z _UxGT("Mover Z")
#define MSG_MOVE_E _UxGT("Mover Extrusor")
#define MSG_HOTEND_TOO_COLD _UxGT("Extrus. mto fria")
#define MSG_MOVE_0025MM _UxGT("Mover 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Mover %smm")
#define MSG_MOVE_01MM _UxGT("Mover 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mover 1mm")
#define MSG_MOVE_10MM _UxGT("Mover 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_pt.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,7 +70,7 @@
#define MSG_MOVE_Y _UxGT("Mover Y")
#define MSG_MOVE_Z _UxGT("Mover Z")
#define MSG_MOVE_E _UxGT("Mover Extrusor")
#define MSG_MOVE_0025MM _UxGT("Mover 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Mover %smm")
#define MSG_MOVE_01MM _UxGT("Mover 0.1mm")
#define MSG_MOVE_1MM _UxGT("Mover 1mm")
#define MSG_MOVE_10MM _UxGT("Mover 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_ru.h
Original file line number Diff line number Diff line change
Expand Up @@ -168,7 +168,7 @@
#define MSG_MOVE_Y _UxGT("Движение по Y")
#define MSG_MOVE_Z _UxGT("Движение по Z")
#define MSG_MOVE_E _UxGT("Экструдер")
#define MSG_MOVE_0025MM _UxGT("Движение 0.025мм")
#define MSG_MOVE_Z_DIST _UxGT("Движение %sмм")
#define MSG_MOVE_01MM _UxGT("Движение 0.1мм")
#define MSG_MOVE_1MM _UxGT("Движение 1мм")
#define MSG_MOVE_10MM _UxGT("Движение 10мм")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_sk.h
Original file line number Diff line number Diff line change
Expand Up @@ -206,7 +206,7 @@
#define MSG_MOVE_Z _UxGT("Posunúť Z")
#define MSG_MOVE_E _UxGT("Extrudér")
#define MSG_HOTEND_TOO_COLD _UxGT("Hotend je studený")
#define MSG_MOVE_0025MM _UxGT("Posunúť o 0,025mm")
#define MSG_MOVE_Z_DIST _UxGT("Posunúť o %smm")
#define MSG_MOVE_01MM _UxGT("Posunúť o 0,1mm")
#define MSG_MOVE_1MM _UxGT("Posunúť o 1mm")
#define MSG_MOVE_10MM _UxGT("Posunúť o 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_tr.h
Original file line number Diff line number Diff line change
Expand Up @@ -186,7 +186,7 @@
#define MSG_MOVE_Z _UxGT("Z Hareketi")
#define MSG_MOVE_E _UxGT("Ekstruder")
#define MSG_HOTEND_TOO_COLD _UxGT("Nozul Çok Soğuk")
#define MSG_MOVE_0025MM _UxGT("0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("%smm")
#define MSG_MOVE_01MM _UxGT("0.1mm")
#define MSG_MOVE_1MM _UxGT("1mm")
#define MSG_MOVE_10MM _UxGT("10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_uk.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,7 +72,7 @@
#define MSG_MOVE_Y _UxGT("Рух по Y")
#define MSG_MOVE_Z _UxGT("Рух по Z")
#define MSG_MOVE_E _UxGT("Екструдер")
#define MSG_MOVE_0025MM _UxGT("Рух по 0.025mm")
#define MSG_MOVE_Z_DIST _UxGT("Рух по %smm")
#define MSG_MOVE_01MM _UxGT("Рух по 0.1mm")
#define MSG_MOVE_1MM _UxGT("Рух по 1mm")
#define MSG_MOVE_10MM _UxGT("Рух по 10mm")
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_zh_CN.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
#define MSG_MOVE_Y _UxGT("移动Y") //"Move Y"
#define MSG_MOVE_Z _UxGT("移动Z") //"Move Z"
#define MSG_MOVE_E _UxGT("挤出机") //"Extruder"
#define MSG_MOVE_0025MM _UxGT("移动 0.025 mm") //"Move 0.025mm"
#define MSG_MOVE_Z_DIST _UxGT("移动 %s mm") //"Move 0.025mm"
#define MSG_MOVE_01MM _UxGT("移动 0.1 mm") //"Move 0.1mm"
#define MSG_MOVE_1MM _UxGT("移动 1 mm") //"Move 1mm"
#define MSG_MOVE_10MM _UxGT("移动 10 mm") //"Move 10mm"
Expand Down
2 changes: 1 addition & 1 deletion Marlin/src/lcd/language/language_zh_TW.h
Original file line number Diff line number Diff line change
Expand Up @@ -164,7 +164,7 @@
#define MSG_MOVE_Y _UxGT("移動Y") //"Move Y"
#define MSG_MOVE_Z _UxGT("移動Z") //"Move Z"
#define MSG_MOVE_E _UxGT("擠出機") //"Extruder"
#define MSG_MOVE_0025MM _UxGT("移動 0.025 mm") //"Move 0.025mm"
#define MSG_MOVE_Z_DIST _UxGT("移動 %s mm") //"Move 0.025mm"
#define MSG_MOVE_01MM _UxGT("移動 0.1 mm") //"Move 0.1mm"
#define MSG_MOVE_1MM _UxGT("移動 1 mm") //"Move 1mm"
#define MSG_MOVE_10MM _UxGT("移動 10 mm") //"Move 10mm"
Expand Down
26 changes: 23 additions & 3 deletions Marlin/src/lcd/menu/menu_motion.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -29,6 +29,13 @@
#if HAS_LCD_MENU

#include "menu.h"

#include "../lcdprint.h"

#if HAS_GRAPHICAL_LCD
#include "../dogm/ultralcd_DOGM.h"
#endif

#include "../../module/motion.h"

#if ENABLED(DELTA)
Expand Down Expand Up @@ -230,6 +237,10 @@ inline void lcd_move_e() { _lcd_move_e(); }
// "Motion" > "Move Xmm" > "Move XYZ" submenu
//

#ifndef SHORT_MANUAL_Z_MOVE
#define SHORT_MANUAL_Z_MOVE 0.025
#endif

screenFunc_t _manual_move_func_ptr;

void _goto_manual_move(const float scale) {
Expand All @@ -240,7 +251,6 @@ void _goto_manual_move(const float scale) {
void menu_move_10mm() { _goto_manual_move(10); }
void menu_move_1mm() { _goto_manual_move( 1); }
void menu_move_01mm() { _goto_manual_move( 0.1f); }
void menu_move_0025mm() { _goto_manual_move( 0.025f); }

void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int8_t eindex=-1) {
_manual_move_func_ptr = func;
Expand Down Expand Up @@ -268,8 +278,18 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
MENU_ITEM(submenu, MSG_MOVE_10MM, menu_move_10mm);
MENU_ITEM(submenu, MSG_MOVE_1MM, menu_move_1mm);
MENU_ITEM(submenu, MSG_MOVE_01MM, menu_move_01mm);
if (axis == Z_AXIS)
MENU_ITEM(submenu, MSG_MOVE_0025MM, menu_move_0025mm);
if (axis == Z_AXIS && (SHORT_MANUAL_Z_MOVE) > 0.0f && (SHORT_MANUAL_Z_MOVE) < 0.1f) {
MENU_ITEM(submenu, "", []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
MENU_ITEM_ADDON_START(1);
char tmp[20], numstr[10];
// Determine digits needed right of decimal
const uint8_t digs = !UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) * 1000 - int((SHORT_MANUAL_Z_MOVE) * 1000)) ? 4 :
!UNEAR_ZERO((SHORT_MANUAL_Z_MOVE) * 100 - int((SHORT_MANUAL_Z_MOVE) * 100)) ? 3 : 2;
dtostrf(SHORT_MANUAL_Z_MOVE, 1, digs, numstr);
sprintf_P(tmp, PSTR(MSG_MOVE_Z_DIST), numstr);
LCDPRINT(tmp);
MENU_ITEM_ADDON_END();
}
}
END_MENU();
}
Expand Down
1 change: 1 addition & 0 deletions config/default/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@

#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
#define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
#define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
#if ENABLED(ULTIPANEL)
#define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
#define ULTIPANEL_FEEDMULTIPLY // Encoder sets the feedrate multiplier on the Status Screen
Expand Down
1 change: 1 addition & 0 deletions config/examples/3DFabXYZ/Migbot/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@

#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
#define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
#define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
#if ENABLED(ULTIPANEL)
#define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
#define ULTIPANEL_FEEDMULTIPLY // Encoder sets the feedrate multiplier on the Status Screen
Expand Down
1 change: 1 addition & 0 deletions config/examples/AlephObjects/TAZ4/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@

#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
#define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
#define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
#if ENABLED(ULTIPANEL)
#define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
#define ULTIPANEL_FEEDMULTIPLY // Encoder sets the feedrate multiplier on the Status Screen
Expand Down
1 change: 1 addition & 0 deletions config/examples/AliExpress/UM2pExt/Configuration_adv.h
Original file line number Diff line number Diff line change
Expand Up @@ -650,6 +650,7 @@

#if EITHER(ULTIPANEL, EXTENSIBLE_UI)
#define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 60 } // Feedrates for manual moves along X, Y, Z, E from panel
#define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
#if ENABLED(ULTIPANEL)
#define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
#define ULTIPANEL_FEEDMULTIPLY // Encoder sets the feedrate multiplier on the Status Screen
Expand Down
Loading

0 comments on commit f8aa523

Please sign in to comment.