MPCNC/Firmware2
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

SHORT_MANUAL_Z_MOVE => FINE_MANUAL_MOVE

Browse Source
This commit is contained in:
Scott Lahteine 2020-12-13 01:50:02 -06:00
parent c824086825
commit b0392be4bf
33 changed files with 48 additions and 46 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/Configuration_adv.h
View File

@ -1055,7 +1055,7 @@
#if EITHER(IS_ULTIPANEL, EXTENSIBLE_UI)
#define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/min) 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)
#define FINE_MANUAL_MOVE 0.025 // (mm) Smallest manual move (< 0.1mm) applying to Z on most machines
#if IS_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

4
Marlin/src/inc/SanityCheck.h
View File

@ -531,6 +531,8 @@
#error "PROBE_OFFSET_START is now PROBE_OFFSET_WIZARD_START_Z."
#elif defined(POWER_LOSS_PULL)
#error "POWER_LOSS_PULL is now specifically POWER_LOSS_PULL(UP|DOWN)."
#elif defined(SHORT_MANUAL_Z_MOVE)
#error "SHORT_MANUAL_Z_MOVE is now FINE_MANUAL_MOVE, applying to Z on most printers."
#elif defined(FIL_RUNOUT_INVERTING)
#if FIL_RUNOUT_INVERTING
#error "FIL_RUNOUT_INVERTING true is now FIL_RUNOUT_STATE HIGH."
@ -2657,7 +2659,7 @@ static_assert(hbm[Z_AXIS] >= 0, "HOMING_BUMP_MM.Z must be greater than or equal
#elif ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)
#error "SENSORLESS_PROBING cannot be used with Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN."
#elif ENABLED(USE_PROBE_FOR_Z_HOMING)
#error "SENSORLESS_PROBING cannot be used with USE_PROBE_FOR_Z_HOMING."
#error "SENSORLESS_PROBING cannot be used with USE_PROBE_FOR_Z_HOMING."
#elif !Z_SENSORLESS
#error "SENSORLESS_PROBING requires a TMC stepper driver with StallGuard on Z."
#endif

2
Marlin/src/lcd/language/language_an.h
View File

@ -85,7 +85,7 @@ namespace Language_an {
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("Mover Z");
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Extrusor");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Extrusor *");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Mover %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Mover %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Mover 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Mover 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Mover 10mm");

2
Marlin/src/lcd/language/language_bg.h
View File

@ -75,7 +75,7 @@ namespace Language_bg {
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("Движение по Z");
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Екструдер");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Екструдер *");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Премести с %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Премести с %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Премести с 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Премести с 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Премести с 10mm");

2
Marlin/src/lcd/language/language_ca.h
View File

@ -85,7 +85,7 @@ namespace Language_ca {
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("Mou Z");
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Extrusor");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Extrusor *");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Mou %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Mou %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Mou 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Mou 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Mou 10mm");

2
Marlin/src/lcd/language/language_cz.h
View File

@ -241,7 +241,7 @@ namespace Language_cz {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Extrudér");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Extrudér *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Hotend je studený");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Posunout o %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Posunout o %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Posunout o 0,1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Posunout o 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Posunout o 10mm");

2
Marlin/src/lcd/language/language_da.h
View File

@ -75,7 +75,7 @@ namespace Language_da {
PROGMEM Language_Str MSG_MOVE_X = _UxGT("Flyt X");
PROGMEM Language_Str MSG_MOVE_Y = _UxGT("Flyt Y");
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("Flyt Z");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Flyt %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Flyt %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Flyt 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Flyt 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Flyt 10mm");

2
Marlin/src/lcd/language/language_de.h
View File

@ -234,7 +234,7 @@ namespace Language_de {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Bewege Extruder");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Bewege Extruder *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Hotend zu kalt");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT(" %s mm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT(" %s mm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT(" 0,1 mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT(" 1,0 mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("10,0 mm");

2
Marlin/src/lcd/language/language_el.h
View File

@ -83,7 +83,7 @@ namespace Language_el {
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("Μετακίνηση Z");
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Εξωθητήρας");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Εξωθητήρας *");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Μετακίνηση %s μμ");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Μετακίνηση %s μμ");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Μετακίνηση 0,1 μμ");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Μετακίνηση 1 μμ");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Μετακίνηση 10 μμ");

2
Marlin/src/lcd/language/language_el_gr.h
View File

@ -84,7 +84,7 @@ namespace Language_el_gr {
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("Μετακίνηση Z");
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Εξωθητήρας");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Εξωθητήρας *");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Μετακίνηση %s μμ");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Μετακίνηση %s μμ");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Μετακίνηση 0,1 μμ");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Μετακίνηση 1 μμ");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Μετακίνηση 10 μμ");

2
Marlin/src/lcd/language/language_en.h
View File

@ -257,7 +257,7 @@ namespace Language_en {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Extruder");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Extruder *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Hotend too cold");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Move %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Move %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Move 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Move 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Move 10mm");

2
Marlin/src/lcd/language/language_es.h
View File

@ -236,7 +236,7 @@ namespace Language_es {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Extrusor");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Extrusor *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Hotend muy frio");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Mover %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Mover %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Mover 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Mover 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Mover 10mm");

2
Marlin/src/lcd/language/language_eu.h
View File

@ -139,7 +139,7 @@ namespace Language_eu {
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("Mugitu Z");
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Estrusorea");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Estrusorea *");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Mugitu %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Mugitu %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Mugitu 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Mugitu 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Mugitu 10mm");

2
Marlin/src/lcd/language/language_fi.h
View File

@ -72,7 +72,7 @@ namespace Language_fi {
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("Liikuta Z");
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Extruder");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Extruder *");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Liikuta %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Liikuta %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Liikuta 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Liikuta 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Liikuta 10mm");

2
Marlin/src/lcd/language/language_fr.h
View File

@ -225,7 +225,7 @@ namespace Language_fr {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Extrudeur");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Extrudeur *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Buse trop froide");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Déplacer %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Déplacer %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Déplacer 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Déplacer 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Déplacer 10mm");

2
Marlin/src/lcd/language/language_gl.h
View File

@ -233,7 +233,7 @@ namespace Language_gl {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Extrusor");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Extrusor *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Bico moi frío");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Mover %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Mover %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Mover 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Mover 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Mover 10mm");

2
Marlin/src/lcd/language/language_hr.h
View File

@ -79,7 +79,7 @@ namespace Language_hr {
PROGMEM Language_Str MSG_LEVEL_BED = _UxGT("Niveliraj bed");
PROGMEM Language_Str MSG_MOVE_X = _UxGT("Miči X");
PROGMEM Language_Str MSG_MOVE_Y = _UxGT("Miči Y");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Miči %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Miči %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Miči 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Miči 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Miči 10mm");

2
Marlin/src/lcd/language/language_hu.h
View File

@ -235,7 +235,7 @@ namespace Language_hu {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Adagoló");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Adagoló *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("A fúvóka túl hideg");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Mozgás %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Mozgás %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Mozgás 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Mozgás 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Mozgás 10mm");

2
Marlin/src/lcd/language/language_it.h
View File

@ -250,7 +250,7 @@ namespace Language_it {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Estrusore");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Estrusore *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Ugello freddo");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Muovi di %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Muovi di %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Muovi di 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Muovi di 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Muovi di 10mm");

2
Marlin/src/lcd/language/language_jp_kana.h
View File

@ -94,7 +94,7 @@ namespace Language_jp_kana {
PROGMEM Language_Str MSG_MOVE_Y = _UxGT("Yジク イドウ"); // "Move Y"
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("Zジク イドウ"); // "Move Z"
PROGMEM Language_Str MSG_MOVE_E = _UxGT("エクストルーダー"); // "Extruder"
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("%smm イドウ"); // "Move 0.025mm"
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("%smm イドウ"); // "Move 0.025mm"
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("0.1mm イドウ"); // "Move 0.1mm"
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT(" 1mm イドウ"); // "Move 1mm"
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT(" 10mm イドウ"); // "Move 10mm"

2
Marlin/src/lcd/language/language_nl.h
View File

@ -87,7 +87,7 @@ namespace Language_nl {
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("Verplaats Z");
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Extruder");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Extruder *");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Verplaats %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Verplaats %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Verplaats 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Verplaats 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Verplaats 10mm");

2
Marlin/src/lcd/language/language_pl.h
View File

@ -230,7 +230,7 @@ namespace Language_pl {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Ekstruzja (os E)");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Ekstruzja (os E) *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Dysza za zimna");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Przesuń co %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Przesuń co %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Przesuń co .1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Przesuń co 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Przesuń co 10mm");

2
Marlin/src/lcd/language/language_pt.h
View File

@ -81,7 +81,7 @@ namespace Language_pt {
PROGMEM Language_Str MSG_MOVE_Z = _UxGT("Mover Z");
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Mover Extrusor");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Mover Extrusor *");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Mover %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Mover %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Mover 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Mover 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Mover 10mm");

2
Marlin/src/lcd/language/language_pt_br.h
View File

@ -214,7 +214,7 @@ namespace Language_pt_br {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Mover Extrusor");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Mover Extrusor *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Extrus. mto fria");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Mover %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Mover %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Mover 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Mover 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Mover 10mm");

2
Marlin/src/lcd/language/language_ro.h
View File

@ -232,7 +232,7 @@ namespace Language_ro {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Extruder");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Extruder *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Capat Prea Rece");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Move %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Move %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Move 0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Move 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Move 10mm");

2
Marlin/src/lcd/language/language_ru.h
View File

@ -290,7 +290,7 @@ namespace Language_ru {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Экструдер");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Экструдер *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Сопло не нагрето");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Движение %sмм");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Движение %sмм");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Движение 0.1мм");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Движение 1мм");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Движение 10мм");

2
Marlin/src/lcd/language/language_sk.h
View File

@ -247,7 +247,7 @@ namespace Language_sk {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Extrudér");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Extrudér *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Hotend je studený");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Posunúť o %smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Posunúť o %smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Posunúť o 0,1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Posunúť o 1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Posunúť o 10mm");

2
Marlin/src/lcd/language/language_tr.h
View File

@ -235,7 +235,7 @@ namespace Language_tr {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Ekstruder");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Ekstruder *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Nozul Çok Soğuk");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("%smm");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("%smm");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("0.1mm");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("1mm");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("10mm");

2
Marlin/src/lcd/language/language_uk.h
View File

@ -286,7 +286,7 @@ namespace Language_uk {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("Екструдер");
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("Екструдер *");
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("Сопло дуже холодне");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("Рух по %sмм");
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("Рух по %sмм");
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("Рух по 0.1мм");
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("Рух по 1мм");
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("Рух по 10мм");

2
Marlin/src/lcd/language/language_zh_CN.h
View File

@ -230,7 +230,7 @@ namespace Language_zh_CN {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("挤出机"); //"Extruder"
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("挤出机 *"); //"Extruder"
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("热端太冷");
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("移动 %s mm"); //"Move 0.025mm"
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("移动 %s mm"); //"Move 0.025mm"
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("移动 0.1 mm"); //"Move 0.1mm"
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("移动 1 mm"); //"Move 1mm"
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("移动 10 mm"); //"Move 10mm"

2
Marlin/src/lcd/language/language_zh_TW.h
View File

@ -228,7 +228,7 @@ namespace Language_zh_TW {
PROGMEM Language_Str MSG_MOVE_E = _UxGT("擠出機"); //"Extruder"
PROGMEM Language_Str MSG_MOVE_EN = _UxGT("擠出機 *"); //"Extruder *"
PROGMEM Language_Str MSG_HOTEND_TOO_COLD = _UxGT("噴嘴溫度不夠"); //"Hotend too cold"
PROGMEM Language_Str MSG_MOVE_Z_DIST = _UxGT("移動 %s mm"); //"Move 0.025mm"
PROGMEM Language_Str MSG_MOVE_N_MM = _UxGT("移動 %s mm"); //"Move 0.025mm"
PROGMEM Language_Str MSG_MOVE_01MM = _UxGT("移動 0.1 mm"); //"Move 0.1mm"
PROGMEM Language_Str MSG_MOVE_1MM = _UxGT("移動 1 mm"); //"Move 1mm"
PROGMEM Language_Str MSG_MOVE_10MM = _UxGT("移動 10 mm"); //"Move 10mm"

18
Marlin/src/lcd/menu/menu_motion.cpp
View File

@ -143,8 +143,8 @@ void lcd_move_z() { _lcd_move_xyz(GET_TEXT(MSG_MOVE_Z), Z_AXIS); }
// "Motion" > "Move Xmm" > "Move XYZ" submenu
//
#ifndef SHORT_MANUAL_Z_MOVE
#define SHORT_MANUAL_Z_MOVE 0.025
#ifndef FINE_MANUAL_MOVE
#define FINE_MANUAL_MOVE 0.025
#endif
screenFunc_t _manual_move_func_ptr;
@ -180,22 +180,22 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
SUBMENU(MSG_MOVE_10MM, []{ _goto_manual_move(10); });
SUBMENU(MSG_MOVE_1MM, []{ _goto_manual_move( 1); });
SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
if (axis == Z_AXIS && (SHORT_MANUAL_Z_MOVE) > 0.0f && (SHORT_MANUAL_Z_MOVE) < 0.1f) {
if (axis == Z_AXIS && (FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f) {
// Determine digits needed right of decimal
constexpr 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;
PGM_P const label = GET_TEXT(MSG_MOVE_Z_DIST);
constexpr uint8_t digs = !UNEAR_ZERO((FINE_MANUAL_MOVE) * 1000 - int((FINE_MANUAL_MOVE) * 1000)) ? 4 :
!UNEAR_ZERO((FINE_MANUAL_MOVE) * 100 - int((FINE_MANUAL_MOVE) * 100)) ? 3 : 2;
PGM_P const label = GET_TEXT(MSG_MOVE_N_MM);
char tmp[strlen_P(label) + 10 + 1], numstr[10];
sprintf_P(tmp, label, dtostrf(SHORT_MANUAL_Z_MOVE, 1, digs, numstr));
sprintf_P(tmp, label, dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
#if DISABLED(HAS_GRAPHICAL_TFT)
extern const char NUL_STR[];
SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
lcd_put_u8str(tmp);
MENU_ITEM_ADDON_END();
#else
SUBMENU_P(tmp, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
SUBMENU_P(tmp, []{ _goto_manual_move(float(FINE_MANUAL_MOVE)); });
#endif
}
}

12
Marlin/src/lcd/menu/menu_probe_offset.cpp
View File

@ -81,20 +81,20 @@ void probe_offset_wizard_menu() {
SUBMENU(MSG_MOVE_1MM, []{ _goto_manual_move_z( 1); });
SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move_z( 0.1f); });
if ((SHORT_MANUAL_Z_MOVE) > 0.0f && (SHORT_MANUAL_Z_MOVE) < 0.1f) {
if ((FINE_MANUAL_MOVE) > 0.0f && (FINE_MANUAL_MOVE) < 0.1f) {
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;
sprintf_P(tmp, GET_TEXT(MSG_MOVE_Z_DIST), dtostrf(SHORT_MANUAL_Z_MOVE, 1, digs, numstr));
const uint8_t digs = !UNEAR_ZERO((FINE_MANUAL_MOVE) * 1000 - int((FINE_MANUAL_MOVE) * 1000)) ? 4 :
!UNEAR_ZERO((FINE_MANUAL_MOVE) * 100 - int((FINE_MANUAL_MOVE) * 100)) ? 3 : 2;
sprintf_P(tmp, GET_TEXT(MSG_MOVE_N_MM), dtostrf(FINE_MANUAL_MOVE, 1, digs, numstr));
#if DISABLED(HAS_GRAPHICAL_TFT)
extern const char NUL_STR[];
SUBMENU_P(NUL_STR, []{ _goto_manual_move_z(float(SHORT_MANUAL_Z_MOVE)); });
SUBMENU_P(NUL_STR, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
MENU_ITEM_ADDON_START(0 + ENABLED(HAS_MARLINUI_HD44780));
lcd_put_u8str(tmp);
MENU_ITEM_ADDON_END();
#else
SUBMENU_P(tmp, []{ _goto_manual_move_z(float(SHORT_MANUAL_Z_MOVE)); });
SUBMENU_P(tmp, []{ _goto_manual_move_z(float(FINE_MANUAL_MOVE)); });
#endif
}