SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

[2.0.x] G33 MIN_STEPS_PER_SEGMENT (#10386)

Browse source
This commit is contained in:
Luc Van Daele 2018-04-13 03:22:29 +02:00 committed by Scott Lahteine
parent c96412a78f
commit 12785583d0
11 changed files with 12 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/config/examples/delta/FLSUN/auto_calibrate/Configuration.h
View file

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

2
Marlin/src/config/examples/delta/FLSUN/kossel/Configuration.h
View file

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

2
Marlin/src/config/examples/delta/FLSUN/kossel_mini/Configuration.h
View file

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

2
Marlin/src/config/examples/delta/Hatchbox_Alpha/Configuration.h
View file

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

2
Marlin/src/config/examples/delta/generic/Configuration.h
View file

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

2
Marlin/src/config/examples/delta/kossel_mini/Configuration.h
View file

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

2
Marlin/src/config/examples/delta/kossel_pro/Configuration.h
View file

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

2
Marlin/src/config/examples/delta/kossel_xl/Configuration.h
View file

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

2
Marlin/src/inc/SanityCheck.h
View file

@ -181,6 +181,8 @@
#error "MANUAL_PROBE_Z_RANGE is now LCD_PROBE_Z_RANGE. Please update your configuration." #error "MANUAL_PROBE_Z_RANGE is now LCD_PROBE_Z_RANGE. Please update your configuration."
#elif !defined(MIN_STEPS_PER_SEGMENT) #elif !defined(MIN_STEPS_PER_SEGMENT)
#error Please replace "const int dropsegments" with "#define MIN_STEPS_PER_SEGMENT" (and increase by 1) in Configuration_adv.h. #error Please replace "const int dropsegments" with "#define MIN_STEPS_PER_SEGMENT" (and increase by 1) in Configuration_adv.h.
#elif MIN_STEPS_PER_SEGMENT <= 0
#error "MIN_STEPS_PER_SEGMENT must be at least 1. Please update your Configuration_adv.h."
#elif defined(PREVENT_DANGEROUS_EXTRUDE) #elif defined(PREVENT_DANGEROUS_EXTRUDE)
#error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration." #error "PREVENT_DANGEROUS_EXTRUDE is now PREVENT_COLD_EXTRUSION. Please update your configuration."
#elif defined(SCARA) #elif defined(SCARA)

2
Marlin/src/lcd/ultralcd.cpp
View file

@ -2721,7 +2721,7 @@ void kill_screen(const char* lcd_msg) {
do_blocking_move_to_xy(rx, ry); do_blocking_move_to_xy(rx, ry);
lcd_synchronize(); lcd_synchronize();
move_menu_scale = PROBE_MANUALLY_STEP; move_menu_scale = max(PROBE_MANUALLY_STEP, MIN_STEPS_PER_SEGMENT / float(DEFAULT_XYZ_STEPS_PER_UNIT));
lcd_goto_screen(lcd_move_z); lcd_goto_screen(lcd_move_z);
} }

2
Marlin/src/module/motion.cpp
View file

@ -1354,7 +1354,7 @@ void homeaxis(const AxisEnum axis) {
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("delta_endstop_adj:"); if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("delta_endstop_adj:");
#endif #endif
do_homing_move(axis, delta_endstop_adj[axis] - MIN_STEPS_PER_SEGMENT / planner.axis_steps_per_mm[axis] * Z_HOME_DIR); do_homing_move(axis, delta_endstop_adj[axis] - (MIN_STEPS_PER_SEGMENT + 1) * planner.steps_to_mm[axis] * Z_HOME_DIR);
} }
#else #else