mirror of
https://github.com/MarlinFirmware/Marlin.git
synced 2025-02-25 02:18:12 +00:00
[1.1.x] G33 MIN_STEPS_PER_SEGMENT (#10385)
This commit is contained in:
parent
db81a1d4a2
commit
6e30d1bef1
11 changed files with 12 additions and 10 deletions
Marlin
Marlin_main.cppSanityCheck.hultralcd.cpp
example_configurations/delta
FLSUN
Hatchbox_Alpha
generic
kossel_mini
kossel_pro
kossel_xl
|
@ -3095,7 +3095,7 @@ static 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
|
||||||
|
|
|
@ -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 needs to be at least 1"
|
||||||
#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)
|
||||||
|
|
|
@ -529,7 +529,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).
|
||||||
|
|
|
@ -529,7 +529,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).
|
||||||
|
|
|
@ -529,7 +529,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).
|
||||||
|
|
|
@ -534,7 +534,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).
|
||||||
|
|
|
@ -519,7 +519,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).
|
||||||
|
|
|
@ -519,7 +519,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).
|
||||||
|
|
|
@ -505,7 +505,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).
|
||||||
|
|
|
@ -523,7 +523,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).
|
||||||
|
|
|
@ -2715,7 +2715,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);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue