Browse Source

Change XY_PROBE_SPEED format to (x*60) (#18997)

qwewer0 3 years ago
parent
commit
434e43cc42
No account linked to committer's email address
2 changed files with 19 additions and 19 deletions
  1. 9
    9
      Marlin/Configuration.h
  2. 10
    10
      Marlin/Configuration_adv.h

+ 9
- 9
Marlin/Configuration.h View File

235
 
235
 
236
   #elif ENABLED(MAGNETIC_PARKING_EXTRUDER)
236
   #elif ENABLED(MAGNETIC_PARKING_EXTRUDER)
237
 
237
 
238
-    #define MPE_FAST_SPEED      9000      // (mm/m) Speed for travel before last distance point
239
-    #define MPE_SLOW_SPEED      4500      // (mm/m) Speed for last distance travel to park and couple
238
+    #define MPE_FAST_SPEED      9000      // (mm/min) Speed for travel before last distance point
239
+    #define MPE_SLOW_SPEED      4500      // (mm/min) Speed for last distance travel to park and couple
240
     #define MPE_TRAVEL_DISTANCE   10      // (mm) Last distance point
240
     #define MPE_TRAVEL_DISTANCE   10      // (mm) Last distance point
241
     #define MPE_COMPENSATION       0      // Offset Compensation -1 , 0 , 1 (multiplier) only for coupling
241
     #define MPE_COMPENSATION       0      // Offset Compensation -1 , 0 , 1 (multiplier) only for coupling
242
 
242
 
284
     #if ENABLED(PRIME_BEFORE_REMOVE)
284
     #if ENABLED(PRIME_BEFORE_REMOVE)
285
       #define SWITCHING_TOOLHEAD_PRIME_MM           20  // (mm)   Extruder prime length
285
       #define SWITCHING_TOOLHEAD_PRIME_MM           20  // (mm)   Extruder prime length
286
       #define SWITCHING_TOOLHEAD_RETRACT_MM         10  // (mm)   Retract after priming length
286
       #define SWITCHING_TOOLHEAD_RETRACT_MM         10  // (mm)   Retract after priming length
287
-      #define SWITCHING_TOOLHEAD_PRIME_FEEDRATE    300  // (mm/m) Extruder prime feedrate
288
-      #define SWITCHING_TOOLHEAD_RETRACT_FEEDRATE 2400  // (mm/m) Extruder retract feedrate
287
+      #define SWITCHING_TOOLHEAD_PRIME_FEEDRATE    300  // (mm/min) Extruder prime feedrate
288
+      #define SWITCHING_TOOLHEAD_RETRACT_FEEDRATE 2400  // (mm/min) Extruder retract feedrate
289
     #endif
289
     #endif
290
   #elif ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
290
   #elif ENABLED(ELECTROMAGNETIC_SWITCHING_TOOLHEAD)
291
     #define SWITCHING_TOOLHEAD_Z_HOP          2         // (mm) Z raise for switching
291
     #define SWITCHING_TOOLHEAD_Z_HOP          2         // (mm) Z raise for switching
999
 // with NOZZLE_AS_PROBE this can be negative for a wider probing area.
999
 // with NOZZLE_AS_PROBE this can be negative for a wider probing area.
1000
 #define PROBING_MARGIN 10
1000
 #define PROBING_MARGIN 10
1001
 
1001
 
1002
-// X and Y axis travel speed (mm/m) between probes
1003
-#define XY_PROBE_SPEED 8000
1002
+// X and Y axis travel speed (mm/min) between probes
1003
+#define XY_PROBE_SPEED (133*60)
1004
 
1004
 
1005
-// Feedrate (mm/m) for the first approach when double-probing (MULTIPLE_PROBING == 2)
1005
+// Feedrate (mm/min) for the first approach when double-probing (MULTIPLE_PROBING == 2)
1006
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
1006
 #define Z_PROBE_SPEED_FAST HOMING_FEEDRATE_Z
1007
 
1007
 
1008
-// Feedrate (mm/m) for the "accurate" probe of each point
1008
+// Feedrate (mm/min) for the "accurate" probe of each point
1009
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
1009
 #define Z_PROBE_SPEED_SLOW (Z_PROBE_SPEED_FAST / 2)
1010
 
1010
 
1011
 /**
1011
 /**
1399
   #define Z_SAFE_HOMING_Y_POINT Y_CENTER  // Y point for Z homing
1399
   #define Z_SAFE_HOMING_Y_POINT Y_CENTER  // Y point for Z homing
1400
 #endif
1400
 #endif
1401
 
1401
 
1402
-// Homing speeds (mm/m)
1402
+// Homing speeds (mm/min)
1403
 #define HOMING_FEEDRATE_XY (50*60)
1403
 #define HOMING_FEEDRATE_XY (50*60)
1404
 #define HOMING_FEEDRATE_Z  (4*60)
1404
 #define HOMING_FEEDRATE_Z  (4*60)
1405
 
1405
 

+ 10
- 10
Marlin/Configuration_adv.h View File

339
 #if ENABLED(EXTRUDER_RUNOUT_PREVENT)
339
 #if ENABLED(EXTRUDER_RUNOUT_PREVENT)
340
   #define EXTRUDER_RUNOUT_MINTEMP 190
340
   #define EXTRUDER_RUNOUT_MINTEMP 190
341
   #define EXTRUDER_RUNOUT_SECONDS 30
341
   #define EXTRUDER_RUNOUT_SECONDS 30
342
-  #define EXTRUDER_RUNOUT_SPEED 1500  // (mm/m)
342
+  #define EXTRUDER_RUNOUT_SPEED 1500  // (mm/min)
343
   #define EXTRUDER_RUNOUT_EXTRUDE 5   // (mm)
343
   #define EXTRUDER_RUNOUT_EXTRUDE 5   // (mm)
344
 #endif
344
 #endif
345
 
345
 
883
       // increments while checking for the contact to be broken.
883
       // increments while checking for the contact to be broken.
884
       #define BACKLASH_MEASUREMENT_LIMIT       0.5   // (mm)
884
       #define BACKLASH_MEASUREMENT_LIMIT       0.5   // (mm)
885
       #define BACKLASH_MEASUREMENT_RESOLUTION  0.005 // (mm)
885
       #define BACKLASH_MEASUREMENT_RESOLUTION  0.005 // (mm)
886
-      #define BACKLASH_MEASUREMENT_FEEDRATE    Z_PROBE_SPEED_SLOW // (mm/m)
886
+      #define BACKLASH_MEASUREMENT_FEEDRATE    Z_PROBE_SPEED_SLOW // (mm/min)
887
     #endif
887
     #endif
888
   #endif
888
   #endif
889
 #endif
889
 #endif
1025
 // @section lcd
1025
 // @section lcd
1026
 
1026
 
1027
 #if EITHER(ULTIPANEL, EXTENSIBLE_UI)
1027
 #if EITHER(ULTIPANEL, EXTENSIBLE_UI)
1028
-  #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/m) Feedrates for manual moves along X, Y, Z, E from panel
1028
+  #define MANUAL_FEEDRATE { 50*60, 50*60, 4*60, 2*60 } // (mm/min) Feedrates for manual moves along X, Y, Z, E from panel
1029
   #define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
1029
   #define SHORT_MANUAL_Z_MOVE 0.025 // (mm) Smallest manual Z move (< 0.1mm)
1030
   #if ENABLED(ULTIPANEL)
1030
   #if ENABLED(ULTIPANEL)
1031
     #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
1031
     #define MANUAL_E_MOVES_RELATIVE // Display extruder move distance rather than "position"
1985
     // Load / Unload
1985
     // Load / Unload
1986
     #define TOOLCHANGE_FS_LENGTH              12  // (mm) Load / Unload length
1986
     #define TOOLCHANGE_FS_LENGTH              12  // (mm) Load / Unload length
1987
     #define TOOLCHANGE_FS_EXTRA_RESUME_LENGTH  0  // (mm) Extra length for better restart, fine tune by LCD/Gcode)
1987
     #define TOOLCHANGE_FS_EXTRA_RESUME_LENGTH  0  // (mm) Extra length for better restart, fine tune by LCD/Gcode)
1988
-    #define TOOLCHANGE_FS_RETRACT_SPEED   (50*60) // (mm/m) (Unloading)
1989
-    #define TOOLCHANGE_FS_UNRETRACT_SPEED (25*60) // (mm/m) (On SINGLENOZZLE or Bowden loading must be slowed down)
1988
+    #define TOOLCHANGE_FS_RETRACT_SPEED   (50*60) // (mm/min) (Unloading)
1989
+    #define TOOLCHANGE_FS_UNRETRACT_SPEED (25*60) // (mm/min) (On SINGLENOZZLE or Bowden loading must be slowed down)
1990
 
1990
 
1991
     // Longer prime to clean out a SINGLENOZZLE
1991
     // Longer prime to clean out a SINGLENOZZLE
1992
     #define TOOLCHANGE_FS_EXTRA_PRIME          0  // (mm) Extra priming length
1992
     #define TOOLCHANGE_FS_EXTRA_PRIME          0  // (mm) Extra priming length
1993
-    #define TOOLCHANGE_FS_PRIME_SPEED    (4.6*60) // (mm/m) Extra priming feedrate
1994
-    #define TOOLCHANGE_FS_WIPE_RETRACT         0  // (mm/m) Retract before cooling for less stringing, better wipe, etc.
1993
+    #define TOOLCHANGE_FS_PRIME_SPEED    (4.6*60) // (mm/min) Extra priming feedrate
1994
+    #define TOOLCHANGE_FS_WIPE_RETRACT         0  // (mm/min) Retract before cooling for less stringing, better wipe, etc.
1995
 
1995
 
1996
     // Cool after prime to reduce stringing
1996
     // Cool after prime to reduce stringing
1997
     #define TOOLCHANGE_FS_FAN                 -1  // Fan index or -1 to skip
1997
     #define TOOLCHANGE_FS_FAN                 -1  // Fan index or -1 to skip
2027
   //#define TOOLCHANGE_PARK
2027
   //#define TOOLCHANGE_PARK
2028
   #if ENABLED(TOOLCHANGE_PARK)
2028
   #if ENABLED(TOOLCHANGE_PARK)
2029
     #define TOOLCHANGE_PARK_XY    { X_MIN_POS + 10, Y_MIN_POS + 10 }
2029
     #define TOOLCHANGE_PARK_XY    { X_MIN_POS + 10, Y_MIN_POS + 10 }
2030
-    #define TOOLCHANGE_PARK_XY_FEEDRATE 6000  // (mm/m)
2030
+    #define TOOLCHANGE_PARK_XY_FEEDRATE 6000  // (mm/min)
2031
     //#define TOOLCHANGE_PARK_X_ONLY          // X axis only move
2031
     //#define TOOLCHANGE_PARK_X_ONLY          // X axis only move
2032
     //#define TOOLCHANGE_PARK_Y_ONLY          // Y axis only move
2032
     //#define TOOLCHANGE_PARK_Y_ONLY          // Y axis only move
2033
   #endif
2033
   #endif
3151
 //#define GCODE_MOTION_MODES  // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
3151
 //#define GCODE_MOTION_MODES  // Remember the motion mode (G0 G1 G2 G3 G5 G38.X) and apply for X Y Z E F, etc.
3152
 
3152
 
3153
 // Enable and set a (default) feedrate for all G0 moves
3153
 // Enable and set a (default) feedrate for all G0 moves
3154
-//#define G0_FEEDRATE 3000 // (mm/m)
3154
+//#define G0_FEEDRATE 3000 // (mm/min)
3155
 #ifdef G0_FEEDRATE
3155
 #ifdef G0_FEEDRATE
3156
   //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
3156
   //#define VARIABLE_G0_FEEDRATE // The G0 feedrate is set by F in G0 motion mode
3157
 #endif
3157
 #endif
3468
   #if ENABLED(PRUSA_MMU2_S_MODE)
3468
   #if ENABLED(PRUSA_MMU2_S_MODE)
3469
     #define MMU2_C0_RETRY   5             // Number of retries (total time = timeout*retries)
3469
     #define MMU2_C0_RETRY   5             // Number of retries (total time = timeout*retries)
3470
 
3470
 
3471
-    #define MMU2_CAN_LOAD_FEEDRATE 800    // (mm/m)
3471
+    #define MMU2_CAN_LOAD_FEEDRATE 800    // (mm/min)
3472
     #define MMU2_CAN_LOAD_SEQUENCE \
3472
     #define MMU2_CAN_LOAD_SEQUENCE \
3473
       {  0.1, MMU2_CAN_LOAD_FEEDRATE }, \
3473
       {  0.1, MMU2_CAN_LOAD_FEEDRATE }, \
3474
       {  60.0, MMU2_CAN_LOAD_FEEDRATE }, \
3474
       {  60.0, MMU2_CAN_LOAD_FEEDRATE }, \

Loading…
Cancel
Save