Browse Source

SHORT_MANUAL_Z_MOVE => FINE_MANUAL_MOVE

Scott Lahteine 4 years ago
parent
commit
b0392be4bf

+ 1 - 1
Marlin/Configuration_adv.h

@@ -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

+ 3 - 1
Marlin/src/inc/SanityCheck.h

@@ -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

+ 1 - 1
Marlin/src/lcd/language/language_an.h

@@ -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");

+ 1 - 1
Marlin/src/lcd/language/language_bg.h

@@ -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");

+ 1 - 1
Marlin/src/lcd/language/language_ca.h

@@ -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");

+ 1 - 1
Marlin/src/lcd/language/language_cz.h

@@ -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");

+ 1 - 1
Marlin/src/lcd/language/language_da.h

@@ -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");

+ 1 - 1
Marlin/src/lcd/language/language_de.h

@@ -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");

+ 1 - 1
Marlin/src/lcd/language/language_el.h

@@ -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 μμ");

+ 1 - 1
Marlin/src/lcd/language/language_el_gr.h

@@ -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 μμ");

Some files were not shown because too many files changed in this diff