Browse Source

[2.0.x] G33 MIN_STEPS_PER_SEGMENT (#10386)

Luc Van Daele 7 years ago
parent
commit
12785583d0

+ 1
- 1
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h View File

538
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
538
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
539
     #define DELTA_CALIBRATION_RADIUS 73.5 // mm
539
     #define DELTA_CALIBRATION_RADIUS 73.5 // mm
540
     // Set the steprate for papertest probing
540
     // Set the steprate for papertest probing
541
-    #define PROBE_MANUALLY_STEP (MIN_STEPS_PER_SEGMENT / DEFAULT_XYZ_STEPS_PER_UNIT)
541
+    #define PROBE_MANUALLY_STEP 0.05 // mm
542
   #endif
542
   #endif
543
 
543
 
544
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
544
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).

+ 1
- 1
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h View File

538
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
538
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
539
     #define DELTA_CALIBRATION_RADIUS 63 // mm
539
     #define DELTA_CALIBRATION_RADIUS 63 // mm
540
     // Set the steprate for papertest probing
540
     // Set the steprate for papertest probing
541
-    #define PROBE_MANUALLY_STEP (MIN_STEPS_PER_SEGMENT / DEFAULT_XYZ_STEPS_PER_UNIT)
541
+    #define PROBE_MANUALLY_STEP 0.05 // mm
542
   #endif
542
   #endif
543
 
543
 
544
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
544
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).

+ 1
- 1
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h View File

538
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
538
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
539
     #define DELTA_CALIBRATION_RADIUS 73.5 // mm
539
     #define DELTA_CALIBRATION_RADIUS 73.5 // mm
540
     // Set the steprate for papertest probing
540
     // Set the steprate for papertest probing
541
-    #define PROBE_MANUALLY_STEP (MIN_STEPS_PER_SEGMENT / DEFAULT_XYZ_STEPS_PER_UNIT)
541
+    #define PROBE_MANUALLY_STEP 0.05 // mm
542
   #endif
542
   #endif
543
 
543
 
544
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
544
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).

+ 1
- 1
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h View File

543
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
543
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
544
     #define DELTA_CALIBRATION_RADIUS 121.5 // mm
544
     #define DELTA_CALIBRATION_RADIUS 121.5 // mm
545
     // Set the steprate for papertest probing
545
     // Set the steprate for papertest probing
546
-    #define PROBE_MANUALLY_STEP (MIN_STEPS_PER_SEGMENT / DEFAULT_XYZ_STEPS_PER_UNIT)
546
+    #define PROBE_MANUALLY_STEP 0.05 // mm
547
   #endif
547
   #endif
548
 
548
 
549
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
549
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).

+ 1
- 1
Marlin/src/config/examples/delta/generic/Configuration.h View File

528
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
528
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
529
     #define DELTA_CALIBRATION_RADIUS 121.5 // mm
529
     #define DELTA_CALIBRATION_RADIUS 121.5 // mm
530
     // Set the steprate for papertest probing
530
     // Set the steprate for papertest probing
531
-    #define PROBE_MANUALLY_STEP (MIN_STEPS_PER_SEGMENT / DEFAULT_XYZ_STEPS_PER_UNIT)
531
+    #define PROBE_MANUALLY_STEP 0.05 // mm
532
   #endif
532
   #endif
533
 
533
 
534
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
534
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).

+ 1
- 1
Marlin/src/config/examples/delta/kossel_mini/Configuration.h View File

528
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
528
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
529
     #define DELTA_CALIBRATION_RADIUS 78.0 // mm
529
     #define DELTA_CALIBRATION_RADIUS 78.0 // mm
530
     // Set the steprate for papertest probing
530
     // Set the steprate for papertest probing
531
-    #define PROBE_MANUALLY_STEP (MIN_STEPS_PER_SEGMENT / DEFAULT_XYZ_STEPS_PER_UNIT)
531
+    #define PROBE_MANUALLY_STEP 0.05 // mm
532
   #endif
532
   #endif
533
 
533
 
534
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
534
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).

+ 1
- 1
Marlin/src/config/examples/delta/kossel_pro/Configuration.h View File

514
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
514
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
515
     #define DELTA_CALIBRATION_RADIUS 110.0 // mm
515
     #define DELTA_CALIBRATION_RADIUS 110.0 // mm
516
     // Set the steprate for papertest probing
516
     // Set the steprate for papertest probing
517
-    #define PROBE_MANUALLY_STEP (MIN_STEPS_PER_SEGMENT / DEFAULT_XYZ_STEPS_PER_UNIT)
517
+    #define PROBE_MANUALLY_STEP 0.05 // mm
518
   #endif
518
   #endif
519
 
519
 
520
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
520
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).

+ 1
- 1
Marlin/src/config/examples/delta/kossel_xl/Configuration.h View File

532
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
532
     // Set the radius for the calibration probe points - max DELTA_PRINTABLE_RADIUS for non-eccentric probes
533
     #define DELTA_CALIBRATION_RADIUS 121.5 // mm
533
     #define DELTA_CALIBRATION_RADIUS 121.5 // mm
534
     // Set the steprate for papertest probing
534
     // Set the steprate for papertest probing
535
-    #define PROBE_MANUALLY_STEP (MIN_STEPS_PER_SEGMENT / DEFAULT_XYZ_STEPS_PER_UNIT)
535
+    #define PROBE_MANUALLY_STEP 0.05 // mm
536
   #endif
536
   #endif
537
 
537
 
538
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).
538
   // Print surface diameter/2 minus unreachable space (avoid collisions with vertical towers).

+ 2
- 0
Marlin/src/inc/SanityCheck.h View File

181
   #error "MANUAL_PROBE_Z_RANGE is now LCD_PROBE_Z_RANGE. Please update your configuration."
181
   #error "MANUAL_PROBE_Z_RANGE is now LCD_PROBE_Z_RANGE. Please update your configuration."
182
 #elif !defined(MIN_STEPS_PER_SEGMENT)
182
 #elif !defined(MIN_STEPS_PER_SEGMENT)
183
   #error Please replace "const int dropsegments" with "#define MIN_STEPS_PER_SEGMENT" (and increase by 1) in Configuration_adv.h.
183
   #error Please replace "const int dropsegments" with "#define MIN_STEPS_PER_SEGMENT" (and increase by 1) in Configuration_adv.h.
184
+#elif MIN_STEPS_PER_SEGMENT <= 0
185
+  #error "MIN_STEPS_PER_SEGMENT must be at least 1. Please update your Configuration_adv.h."
184
 #elif defined(PREVENT_DANGEROUS_EXTRUDE)
186
 #elif defined(PREVENT_DANGEROUS_EXTRUDE)
185
   #error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration."
187
   #error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration."
186
 #elif defined(SCARA)
188
 #elif defined(SCARA)

+ 1
- 1
Marlin/src/lcd/ultralcd.cpp View File

2721
       do_blocking_move_to_xy(rx, ry);
2721
       do_blocking_move_to_xy(rx, ry);
2722
 
2722
 
2723
       lcd_synchronize();
2723
       lcd_synchronize();
2724
-      move_menu_scale = PROBE_MANUALLY_STEP;
2724
+      move_menu_scale = max(PROBE_MANUALLY_STEP, MIN_STEPS_PER_SEGMENT / float(DEFAULT_XYZ_STEPS_PER_UNIT));
2725
       lcd_goto_screen(lcd_move_z);
2725
       lcd_goto_screen(lcd_move_z);
2726
     }
2726
     }
2727
 
2727
 

+ 1
- 1
Marlin/src/module/motion.cpp View File

1354
       #if ENABLED(DEBUG_LEVELING_FEATURE)
1354
       #if ENABLED(DEBUG_LEVELING_FEATURE)
1355
         if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("delta_endstop_adj:");
1355
         if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("delta_endstop_adj:");
1356
       #endif
1356
       #endif
1357
-      do_homing_move(axis, delta_endstop_adj[axis] - MIN_STEPS_PER_SEGMENT / planner.axis_steps_per_mm[axis] * Z_HOME_DIR);
1357
+      do_homing_move(axis, delta_endstop_adj[axis] - (MIN_STEPS_PER_SEGMENT + 1) * planner.steps_to_mm[axis] * Z_HOME_DIR);
1358
     }
1358
     }
1359
 
1359
 
1360
   #else
1360
   #else

Loading…
Cancel
Save