HAS_Z_ENDSTOP_SERVO => HAS_Z_SERVO_ENDSTOP
This commit is contained in:
parent
47ce810f52
commit
1bed392c68
@ -373,8 +373,8 @@
|
|||||||
#define MAX_PROBE_Y (min(Y_MAX_POS, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
#define MAX_PROBE_Y (min(Y_MAX_POS, Y_MAX_POS + Y_PROBE_OFFSET_FROM_EXTRUDER))
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define HAS_Z_ENDSTOP_SERVO (defined(Z_ENDSTOP_SERVO_NR) && Z_ENDSTOP_SERVO_NR >= 0)
|
#define HAS_Z_SERVO_ENDSTOP (defined(Z_ENDSTOP_SERVO_NR) && Z_ENDSTOP_SERVO_NR >= 0)
|
||||||
#define SERVO_LEVELING (ENABLED(AUTO_BED_LEVELING_FEATURE) && HAS_Z_ENDSTOP_SERVO)
|
#define SERVO_LEVELING (ENABLED(AUTO_BED_LEVELING_FEATURE) && HAS_Z_SERVO_ENDSTOP)
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Sled Options
|
* Sled Options
|
||||||
@ -769,7 +769,7 @@
|
|||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))
|
#define PROBE_SELECTED (ENABLED(FIX_MOUNTED_PROBE) || ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))
|
||||||
|
|
||||||
#define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)))
|
#define PROBE_PIN_CONFIGURED (HAS_Z_MIN_PROBE_PIN || (HAS_Z_MIN && ENABLED(Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN)))
|
||||||
|
|
||||||
|
@ -391,7 +391,7 @@ static uint8_t target_extruder;
|
|||||||
};
|
};
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAS_Z_ENDSTOP_SERVO
|
#if HAS_Z_SERVO_ENDSTOP
|
||||||
const int z_servo_angle[2] = Z_SERVO_ANGLES;
|
const int z_servo_angle[2] = Z_SERVO_ANGLES;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -746,7 +746,7 @@ void servo_init() {
|
|||||||
servo[3].detach();
|
servo[3].detach();
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
#if HAS_Z_ENDSTOP_SERVO
|
#if HAS_Z_SERVO_ENDSTOP
|
||||||
|
|
||||||
endstops.enable_z_probe(false);
|
endstops.enable_z_probe(false);
|
||||||
|
|
||||||
@ -760,7 +760,7 @@ void servo_init() {
|
|||||||
*
|
*
|
||||||
*/
|
*/
|
||||||
STOW_Z_SERVO();
|
STOW_Z_SERVO();
|
||||||
#endif // HAS_Z_ENDSTOP_SERVO
|
#endif // HAS_Z_SERVO_ENDSTOP
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -1829,7 +1829,7 @@ static void setup_for_endstop_move() {
|
|||||||
|
|
||||||
if (endstops.z_probe_enabled) return;
|
if (endstops.z_probe_enabled) return;
|
||||||
|
|
||||||
#if HAS_Z_ENDSTOP_SERVO
|
#if HAS_Z_SERVO_ENDSTOP
|
||||||
|
|
||||||
// Engage Z Servo endstop if enabled
|
// Engage Z Servo endstop if enabled
|
||||||
DEPLOY_Z_SERVO();
|
DEPLOY_Z_SERVO();
|
||||||
@ -1916,7 +1916,7 @@ static void setup_for_endstop_move() {
|
|||||||
}
|
}
|
||||||
|
|
||||||
static void stow_z_probe(bool doRaise = true) {
|
static void stow_z_probe(bool doRaise = true) {
|
||||||
#if !(HAS_Z_ENDSTOP_SERVO && (Z_RAISE_AFTER_PROBING > 0))
|
#if !(HAS_Z_SERVO_ENDSTOP && (Z_RAISE_AFTER_PROBING > 0))
|
||||||
UNUSED(doRaise);
|
UNUSED(doRaise);
|
||||||
#endif
|
#endif
|
||||||
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
||||||
@ -1925,7 +1925,7 @@ static void setup_for_endstop_move() {
|
|||||||
|
|
||||||
if (!endstops.z_probe_enabled) return;
|
if (!endstops.z_probe_enabled) return;
|
||||||
|
|
||||||
#if HAS_Z_ENDSTOP_SERVO
|
#if HAS_Z_SERVO_ENDSTOP
|
||||||
|
|
||||||
// Retract Z Servo endstop if enabled
|
// Retract Z Servo endstop if enabled
|
||||||
#if Z_RAISE_AFTER_PROBING > 0
|
#if Z_RAISE_AFTER_PROBING > 0
|
||||||
@ -2156,7 +2156,7 @@ static void setup_for_endstop_move() {
|
|||||||
|
|
||||||
#endif // DELTA
|
#endif // DELTA
|
||||||
|
|
||||||
#if HAS_Z_ENDSTOP_SERVO && DISABLED(Z_PROBE_SLED)
|
#if HAS_Z_SERVO_ENDSTOP
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Raise Z to a minimum height to make room for a servo to move
|
* Raise Z to a minimum height to make room for a servo to move
|
||||||
@ -2283,7 +2283,7 @@ static void homeaxis(AxisEnum axis) {
|
|||||||
#define _Z_STOW (stow_z_probe())
|
#define _Z_STOW (stow_z_probe())
|
||||||
#define _Z_SERVO_TEST (axis != Z_AXIS) // already deployed Z
|
#define _Z_SERVO_TEST (axis != Z_AXIS) // already deployed Z
|
||||||
#define _Z_SERVO_SUBTEST false // Z will never be invoked
|
#define _Z_SERVO_SUBTEST false // Z will never be invoked
|
||||||
#elif HAS_Z_ENDSTOP_SERVO
|
#elif HAS_Z_SERVO_ENDSTOP
|
||||||
#define _Z_DEPLOY do{ raise_z_for_servo(Z_RAISE_BEFORE_PROBING); DEPLOY_Z_SERVO(); endstops.z_probe_enabled = true; }while(0)
|
#define _Z_DEPLOY do{ raise_z_for_servo(Z_RAISE_BEFORE_PROBING); DEPLOY_Z_SERVO(); endstops.z_probe_enabled = true; }while(0)
|
||||||
#define _Z_STOW do{ raise_z_for_servo(Z_RAISE_AFTER_PROBING); STOW_Z_SERVO(); endstops.z_probe_enabled = false; }while(0)
|
#define _Z_STOW do{ raise_z_for_servo(Z_RAISE_AFTER_PROBING); STOW_Z_SERVO(); endstops.z_probe_enabled = false; }while(0)
|
||||||
#define _Z_SERVO_TEST true // Z not deployed yet
|
#define _Z_SERVO_TEST true // Z not deployed yet
|
||||||
@ -2291,7 +2291,7 @@ static void homeaxis(AxisEnum axis) {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
// Homing Z towards the bed? Deploy the Z probe or endstop.
|
// Homing Z towards the bed? Deploy the Z probe or endstop.
|
||||||
#if ENABLED(Z_PROBE_SLED) || SERVO_LEVELING || ENABLED(FIX_MOUNTED_PROBE) || HAS_Z_ENDSTOP_SERVO
|
#if ENABLED(Z_PROBE_SLED) || SERVO_LEVELING || ENABLED(FIX_MOUNTED_PROBE) || HAS_Z_SERVO_ENDSTOP
|
||||||
if (axis == Z_AXIS && axis_home_dir < 0) {
|
if (axis == Z_AXIS && axis_home_dir < 0) {
|
||||||
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
||||||
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> SERVO_LEVELING > " STRINGIFY(_Z_DEPLOY));
|
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> SERVO_LEVELING > " STRINGIFY(_Z_DEPLOY));
|
||||||
@ -2414,7 +2414,7 @@ static void homeaxis(AxisEnum axis) {
|
|||||||
axis_homed[axis] = true;
|
axis_homed[axis] = true;
|
||||||
|
|
||||||
// Put away the Z probe
|
// Put away the Z probe
|
||||||
#if ENABLED(Z_PROBE_SLED) || SERVO_LEVELING || ENABLED(FIX_MOUNTED_PROBE) || HAS_Z_ENDSTOP_SERVO
|
#if ENABLED(Z_PROBE_SLED) || SERVO_LEVELING || ENABLED(FIX_MOUNTED_PROBE) || HAS_Z_SERVO_ENDSTOP
|
||||||
if (axis == Z_AXIS && axis_home_dir < 0) {
|
if (axis == Z_AXIS && axis_home_dir < 0) {
|
||||||
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
#if ENABLED(DEBUG_LEVELING_FEATURE)
|
||||||
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> SERVO_LEVELING > " STRINGIFY(_Z_STOW));
|
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> SERVO_LEVELING > " STRINGIFY(_Z_STOW));
|
||||||
@ -3764,7 +3764,7 @@ inline void gcode_G28() {
|
|||||||
#endif
|
#endif
|
||||||
|
|
||||||
current_position[Z_AXIS] = -zprobe_zoffset + (z_tmp - real_z)
|
current_position[Z_AXIS] = -zprobe_zoffset + (z_tmp - real_z)
|
||||||
#if HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED)
|
#if HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED)
|
||||||
+ Z_RAISE_AFTER_PROBING
|
+ Z_RAISE_AFTER_PROBING
|
||||||
#endif
|
#endif
|
||||||
;
|
;
|
||||||
@ -3779,7 +3779,7 @@ inline void gcode_G28() {
|
|||||||
// Sled assembly for Cartesian bots
|
// Sled assembly for Cartesian bots
|
||||||
#if ENABLED(Z_PROBE_SLED)
|
#if ENABLED(Z_PROBE_SLED)
|
||||||
dock_sled(true); // dock the sled
|
dock_sled(true); // dock the sled
|
||||||
#elif !HAS_Z_ENDSTOP_SERVO && DISABLED(Z_PROBE_ALLEN_KEY) && DISABLED(Z_PROBE_SLED)
|
#elif !HAS_Z_SERVO_ENDSTOP && DISABLED(Z_PROBE_ALLEN_KEY) && DISABLED(Z_PROBE_SLED)
|
||||||
// Raise Z axis for non-delta and non servo based probes
|
// Raise Z axis for non-delta and non servo based probes
|
||||||
raise_z_after_probing();
|
raise_z_after_probing();
|
||||||
#endif
|
#endif
|
||||||
@ -3823,7 +3823,7 @@ inline void gcode_G28() {
|
|||||||
* G30: Do a single Z probe at the current XY
|
* G30: Do a single Z probe at the current XY
|
||||||
*/
|
*/
|
||||||
inline void gcode_G30() {
|
inline void gcode_G30() {
|
||||||
#if HAS_Z_ENDSTOP_SERVO
|
#if HAS_Z_SERVO_ENDSTOP
|
||||||
raise_z_for_servo(Z_RAISE_BEFORE_PROBING);
|
raise_z_for_servo(Z_RAISE_BEFORE_PROBING);
|
||||||
#endif
|
#endif
|
||||||
deploy_z_probe(); // Engage Z Servo endstop if available. Z_PROBE_SLED is missed here.
|
deploy_z_probe(); // Engage Z Servo endstop if available. Z_PROBE_SLED is missed here.
|
||||||
@ -3845,7 +3845,7 @@ inline void gcode_G28() {
|
|||||||
|
|
||||||
clean_up_after_endstop_move(); // Too early. must be done after the stowing.
|
clean_up_after_endstop_move(); // Too early. must be done after the stowing.
|
||||||
|
|
||||||
#if HAS_Z_ENDSTOP_SERVO
|
#if HAS_Z_SERVO_ENDSTOP
|
||||||
raise_z_for_servo(Z_RAISE_AFTER_PROBING);
|
raise_z_for_servo(Z_RAISE_AFTER_PROBING);
|
||||||
#endif
|
#endif
|
||||||
stow_z_probe(false); // Retract Z Servo endstop if available. Z_PROBE_SLED is missed here.
|
stow_z_probe(false); // Retract Z Servo endstop if available. Z_PROBE_SLED is missed here.
|
||||||
@ -5980,13 +5980,13 @@ inline void gcode_M303() {
|
|||||||
*/
|
*/
|
||||||
inline void gcode_M400() { stepper.synchronize(); }
|
inline void gcode_M400() { stepper.synchronize(); }
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && DISABLED(Z_PROBE_SLED) && (HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_ALLEN_KEY))
|
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && DISABLED(Z_PROBE_SLED) && (HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_ALLEN_KEY))
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* M401: Engage Z Servo endstop if available
|
* M401: Engage Z Servo endstop if available
|
||||||
*/
|
*/
|
||||||
inline void gcode_M401() {
|
inline void gcode_M401() {
|
||||||
#if HAS_Z_ENDSTOP_SERVO
|
#if HAS_Z_SERVO_ENDSTOP
|
||||||
raise_z_for_servo(Z_RAISE_BEFORE_PROBING);
|
raise_z_for_servo(Z_RAISE_BEFORE_PROBING);
|
||||||
#endif
|
#endif
|
||||||
deploy_z_probe();
|
deploy_z_probe();
|
||||||
@ -5996,13 +5996,13 @@ inline void gcode_M400() { stepper.synchronize(); }
|
|||||||
* M402: Retract Z Servo endstop if enabled
|
* M402: Retract Z Servo endstop if enabled
|
||||||
*/
|
*/
|
||||||
inline void gcode_M402() {
|
inline void gcode_M402() {
|
||||||
#if HAS_Z_ENDSTOP_SERVO
|
#if HAS_Z_SERVO_ENDSTOP
|
||||||
raise_z_for_servo(Z_RAISE_AFTER_PROBING);
|
raise_z_for_servo(Z_RAISE_AFTER_PROBING);
|
||||||
#endif
|
#endif
|
||||||
stow_z_probe(false);
|
stow_z_probe(false);
|
||||||
}
|
}
|
||||||
|
|
||||||
#endif // AUTO_BED_LEVELING_FEATURE && (HAS_Z_ENDSTOP_SERVO || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
|
#endif // AUTO_BED_LEVELING_FEATURE && (HAS_Z_SERVO_ENDSTOP || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
|
|
||||||
@ -7299,14 +7299,14 @@ void process_next_command() {
|
|||||||
gcode_M400();
|
gcode_M400();
|
||||||
break;
|
break;
|
||||||
|
|
||||||
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && (HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_ALLEN_KEY)) && DISABLED(Z_PROBE_SLED)
|
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && (HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_ALLEN_KEY)) && DISABLED(Z_PROBE_SLED)
|
||||||
case 401:
|
case 401:
|
||||||
gcode_M401();
|
gcode_M401();
|
||||||
break;
|
break;
|
||||||
case 402:
|
case 402:
|
||||||
gcode_M402();
|
gcode_M402();
|
||||||
break;
|
break;
|
||||||
#endif // AUTO_BED_LEVELING_FEATURE && (HAS_Z_ENDSTOP_SERVO || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
|
#endif // AUTO_BED_LEVELING_FEATURE && (HAS_Z_SERVO_ENDSTOP || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
|
||||||
|
|
||||||
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
#if ENABLED(FILAMENT_WIDTH_SENSOR)
|
||||||
case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or display nominal filament width
|
case 404: //M404 Enter the nominal filament width (3mm, 1.75mm ) N<3.0> or display nominal filament width
|
||||||
|
@ -173,7 +173,7 @@
|
|||||||
#if defined(NUM_SERVOS) && NUM_SERVOS > 0
|
#if defined(NUM_SERVOS) && NUM_SERVOS > 0
|
||||||
#if NUM_SERVOS > 4
|
#if NUM_SERVOS > 4
|
||||||
#error "The maximum number of SERVOS in Marlin is 4."
|
#error "The maximum number of SERVOS in Marlin is 4."
|
||||||
#elif HAS_Z_ENDSTOP_SERVO && Z_ENDSTOP_SERVO_NR >= NUM_SERVOS
|
#elif HAS_Z_SERVO_ENDSTOP && Z_ENDSTOP_SERVO_NR >= NUM_SERVOS
|
||||||
#error "Z_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS."
|
#error "Z_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS."
|
||||||
#endif
|
#endif
|
||||||
#endif
|
#endif
|
||||||
@ -181,7 +181,7 @@
|
|||||||
/**
|
/**
|
||||||
* Servo deactivation depends on servo endstops
|
* Servo deactivation depends on servo endstops
|
||||||
*/
|
*/
|
||||||
#if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) && !HAS_Z_ENDSTOP_SERVO
|
#if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) && !HAS_Z_SERVO_ENDSTOP
|
||||||
#error "Z_ENDSTOP_SERVO_NR is required for DEACTIVATE_SERVOS_AFTER_MOVE."
|
#error "Z_ENDSTOP_SERVO_NR is required for DEACTIVATE_SERVOS_AFTER_MOVE."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
@ -246,10 +246,10 @@
|
|||||||
/**
|
/**
|
||||||
* Only allow one probe option to be defined
|
* Only allow one probe option to be defined
|
||||||
*/
|
*/
|
||||||
#if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
|
#if (ENABLED(FIX_MOUNTED_PROBE) && (ENABLED(MECHANICAL_PROBE) || ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \
|
||||||
|| (ENABLED(MECHANICAL_PROBE) && (ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
|
|| (ENABLED(MECHANICAL_PROBE) && (ENABLED(Z_PROBE_ALLEN_KEY) || HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \
|
||||||
|| (ENABLED(Z_PROBE_ALLEN_KEY) && (HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))) \
|
|| (ENABLED(Z_PROBE_ALLEN_KEY) && (HAS_Z_SERVO_ENDSTOP || ENABLED(Z_PROBE_SLED))) \
|
||||||
|| (HAS_Z_ENDSTOP_SERVO && ENABLED(Z_PROBE_SLED))
|
|| (HAS_Z_SERVO_ENDSTOP && ENABLED(Z_PROBE_SLED))
|
||||||
#error "Please define only one type of probe: Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE."
|
#error "Please define only one type of probe: Z Servo, MECHANICAL_PROBE, Z_PROBE_ALLEN_KEY, Z_PROBE_SLED, or FIX_MOUNTED_PROBE."
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user