forksand
/
marlin-lulzbot-laser
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Remove support for XY servo endstops

Browse Source
master
Scott Lahteine 8 years ago
parent cabb71ff38
commit 47ce810f52
23 changed files with 114 additions and 204 deletions
Show Stats Download Patch File Download Diff File

2
.travis.yml
Unescape View File

@ -104,7 +104,7 @@ script:
# #
# Test AUTO_BED_LEVELING & DEBUG_LEVELING_FEATURE with Servos # Test AUTO_BED_LEVELING & DEBUG_LEVELING_FEATURE with Servos
# #
- opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR SERVO_ENDSTOP_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE - opt_enable NUM_SERVOS Z_ENDSTOP_SERVO_NR Z_SERVO_ANGLES DEACTIVATE_SERVOS_AFTER_MOVE
- build_marlin - build_marlin
# #
# Test EEPROM_SETTINGS, EEPROM_CHITCHAT, M100_FREE_MEMORY_WATCHER, # Test EEPROM_SETTINGS, EEPROM_CHITCHAT, M100_FREE_MEMORY_WATCHER,

10
Marlin/Conditionals.h
Unescape View File

@ -764,19 +764,9 @@
#define HAS_BUZZER (PIN_EXISTS(BEEPER) || defined(LCD_USE_I2C_BUZZER)) #define HAS_BUZZER (PIN_EXISTS(BEEPER) || defined(LCD_USE_I2C_BUZZER))
#if HAS_SERVOS #if HAS_SERVOS
#ifndef X_ENDSTOP_SERVO_NR
#define X_ENDSTOP_SERVO_NR -1
#endif
#ifndef Y_ENDSTOP_SERVO_NR
#define Y_ENDSTOP_SERVO_NR -1
#endif
#ifndef Z_ENDSTOP_SERVO_NR #ifndef Z_ENDSTOP_SERVO_NR
#define Z_ENDSTOP_SERVO_NR -1 #define Z_ENDSTOP_SERVO_NR -1
#endif #endif
#if X_ENDSTOP_SERVO_NR >= 0 || Y_ENDSTOP_SERVO_NR >= 0 || HAS_Z_ENDSTOP_SERVO
#define HAS_SERVO_ENDSTOPS
#define SERVO_ENDSTOP_IDS { X_ENDSTOP_SERVO_NR, Y_ENDSTOP_SERVO_NR, Z_ENDSTOP_SERVO_NR }
#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_ENDSTOP_SERVO || ENABLED(Z_PROBE_SLED))

6
Marlin/Configuration.h
Unescape View File

@ -420,7 +420,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1164,10 +1164,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

165
Marlin/Marlin_main.cpp
Unescape View File

@ -391,9 +391,8 @@ static uint8_t target_extruder;
}; };
#endif #endif
#if ENABLED(HAS_SERVO_ENDSTOPS) #if HAS_Z_ENDSTOP_SERVO
const int servo_endstop_id[] = SERVO_ENDSTOP_IDS; const int z_servo_angle[2] = Z_SERVO_ANGLES;
const int servo_endstop_angle[][2] = SERVO_ENDSTOP_ANGLES;
#endif #endif
#if ENABLED(BARICUDA) #if ENABLED(BARICUDA)
@ -488,10 +487,8 @@ static bool send_ok[BUFSIZE];
#if HAS_SERVOS #if HAS_SERVOS
Servo servo[NUM_SERVOS]; Servo servo[NUM_SERVOS];
#define MOVE_SERVO(I, P) servo[I].move(P) #define MOVE_SERVO(I, P) servo[I].move(P)
#define SERVO_ENDSTOP_EXISTS(I) (servo_endstop_id[I] >= 0) #define DEPLOY_Z_SERVO() MOVE_SERVO(Z_ENDSTOP_SERVO_NR, z_servo_angle[0])
#define MOVE_SERVO_ENDSTOP(I, J) MOVE_SERVO(servo_endstop_id[I], servo_endstop_angle[I][J]) #define STOW_Z_SERVO() MOVE_SERVO(Z_ENDSTOP_SERVO_NR, z_servo_angle[1])
#define DEPLOY_SERVO_ENDSTOP(I) MOVE_SERVO_ENDSTOP(I, 0)
#define STOW_SERVO_ENDSTOP(I) MOVE_SERVO_ENDSTOP(I, 1)
#endif #endif
#ifdef CHDK #ifdef CHDK
@ -749,14 +746,12 @@ void servo_init() {
servo[3].detach(); servo[3].detach();
#endif #endif
#if ENABLED(HAS_SERVO_ENDSTOPS) #if HAS_Z_ENDSTOP_SERVO
endstops.enable_z_probe(false); endstops.enable_z_probe(false);
/** /**
* Set position of all defined Servo Endstops * Set position of Z Servo Endstop
*
* ** UNSAFE! - NEEDS UPDATE! **
* *
* The servo might be deployed and positioned too low to stow * The servo might be deployed and positioned too low to stow
* when starting up the machine or rebooting the board. * when starting up the machine or rebooting the board.
@ -764,11 +759,8 @@ void servo_init() {
* homing has been done - no homing with z-probe without init! * homing has been done - no homing with z-probe without init!
* *
*/ */
for (int i = 0; i < 3; i++) STOW_Z_SERVO();
if (SERVO_ENDSTOP_EXISTS(i)) #endif // HAS_Z_ENDSTOP_SERVO
STOW_SERVO_ENDSTOP(i);
#endif // HAS_SERVO_ENDSTOPS
} }
@ -1837,11 +1829,10 @@ static void setup_for_endstop_move() {
if (endstops.z_probe_enabled) return; if (endstops.z_probe_enabled) return;
#if ENABLED(HAS_SERVO_ENDSTOPS) #if HAS_Z_ENDSTOP_SERVO
// Engage Z Servo endstop if enabled // Engage Z Servo endstop if enabled
if (SERVO_ENDSTOP_EXISTS(Z_AXIS)) DEPLOY_Z_SERVO();
DEPLOY_SERVO_ENDSTOP(Z_AXIS);
#elif ENABLED(Z_PROBE_ALLEN_KEY) #elif ENABLED(Z_PROBE_ALLEN_KEY)
feedrate = Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE; feedrate = Z_PROBE_ALLEN_KEY_DEPLOY_1_FEEDRATE;
@ -1925,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 !(ENABLED(HAS_SERVO_ENDSTOPS) && (Z_RAISE_AFTER_PROBING > 0)) #if !(HAS_Z_ENDSTOP_SERVO && (Z_RAISE_AFTER_PROBING > 0))
UNUSED(doRaise); UNUSED(doRaise);
#endif #endif
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
@ -1934,21 +1925,18 @@ static void setup_for_endstop_move() {
if (!endstops.z_probe_enabled) return; if (!endstops.z_probe_enabled) return;
#if ENABLED(HAS_SERVO_ENDSTOPS) #if HAS_Z_ENDSTOP_SERVO
// Retract Z Servo endstop if enabled // Retract Z Servo endstop if enabled
if (SERVO_ENDSTOP_EXISTS(Z_AXIS)) { #if Z_RAISE_AFTER_PROBING > 0
if (doRaise) {
#if Z_RAISE_AFTER_PROBING > 0 raise_z_after_probing(); // this also updates current_position
if (doRaise) { stepper.synchronize();
raise_z_after_probing(); // this also updates current_position }
stepper.synchronize(); #endif
}
#endif
// Change the Z servo angle // Change the Z servo angle
STOW_SERVO_ENDSTOP(Z_AXIS); STOW_Z_SERVO();
}
#elif ENABLED(Z_PROBE_ALLEN_KEY) #elif ENABLED(Z_PROBE_ALLEN_KEY)
@ -2168,16 +2156,25 @@ static void setup_for_endstop_move() {
#endif // DELTA #endif // DELTA
#if ENABLED(HAS_SERVO_ENDSTOPS) && DISABLED(Z_PROBE_SLED) #if HAS_Z_ENDSTOP_SERVO && DISABLED(Z_PROBE_SLED)
void raise_z_for_servo() { /**
float zpos = current_position[Z_AXIS], z_dest = Z_RAISE_BEFORE_PROBING; * Raise Z to a minimum height to make room for a servo to move
/** *
* The zprobe_zoffset is negative any switch below the nozzle, so * zprobe_zoffset: Negative of the Z height where the probe engages
* multiply by Z_HOME_DIR (-1) to move enough away from bed for the probe * z_dest: The before / after probing raise distance
*/ *
z_dest += axis_homed[Z_AXIS] ? zprobe_zoffset * Z_HOME_DIR : zpos; * The zprobe_zoffset is negative for a switch below the nozzle, so
if (zpos < z_dest) do_blocking_move_to_z(z_dest); // also updates current_position * multiply by Z_HOME_DIR (-1) to move enough away from the bed.
*/
void raise_z_for_servo(float z_dest) {
z_dest += home_offset[Z_AXIS];
if ((Z_HOME_DIR) < 0 && zprobe_zoffset < 0)
z_dest -= zprobe_zoffset;
if (z_dest > current_position[Z_AXIS])
do_blocking_move_to_z(z_dest); // also updates current_position
} }
#endif #endif
@ -2277,23 +2274,24 @@ static void homeaxis(AxisEnum axis) {
sync_plan_position(); sync_plan_position();
#if ENABLED(Z_PROBE_SLED) #if ENABLED(Z_PROBE_SLED)
#define _Z_SERVO_TEST (axis != Z_AXIS) // already deployed Z
#define _Z_SERVO_SUBTEST false // Z will never be invoked
#define _Z_DEPLOY (dock_sled(false)) #define _Z_DEPLOY (dock_sled(false))
#define _Z_STOW (dock_sled(true)) #define _Z_STOW (dock_sled(true))
#elif SERVO_LEVELING || ENABLED(FIX_MOUNTED_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 SERVO_LEVELING || ENABLED(FIX_MOUNTED_PROBE)
#define _Z_DEPLOY (deploy_z_probe()) #define _Z_DEPLOY (deploy_z_probe())
#define _Z_STOW (stow_z_probe()) #define _Z_STOW (stow_z_probe())
#elif ENABLED(HAS_SERVO_ENDSTOPS) #define _Z_SERVO_TEST (axis != Z_AXIS) // already deployed Z
#define _Z_SERVO_SUBTEST false // Z will never be invoked
#elif HAS_Z_ENDSTOP_SERVO
#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_SERVO_TEST true // Z not deployed yet #define _Z_SERVO_TEST true // Z not deployed yet
#define _Z_SERVO_SUBTEST (axis == Z_AXIS) // Z is a probe #define _Z_SERVO_SUBTEST (axis == Z_AXIS) // Z is a probe
#endif #endif
// If there's a Z probe that needs deployment... // Homing Z towards the bed? Deploy the Z probe or endstop.
#if ENABLED(Z_PROBE_SLED) || SERVO_LEVELING || ENABLED(FIX_MOUNTED_PROBE) #if ENABLED(Z_PROBE_SLED) || SERVO_LEVELING || ENABLED(FIX_MOUNTED_PROBE) || HAS_Z_ENDSTOP_SERVO
// ...and homing Z towards the bed? Deploy it.
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));
@ -2302,14 +2300,6 @@ static void homeaxis(AxisEnum axis) {
} }
#endif #endif
#if ENABLED(HAS_SERVO_ENDSTOPS)
// Engage an X, Y (or Z) Servo endstop if enabled
if (_Z_SERVO_TEST && SERVO_ENDSTOP_EXISTS(axis)) {
DEPLOY_SERVO_ENDSTOP(axis);
if (_Z_SERVO_SUBTEST) endstops.z_probe_enabled = true;
}
#endif
// Set a flag for Z motor locking // Set a flag for Z motor locking
#if ENABLED(Z_DUAL_ENDSTOPS) #if ENABLED(Z_DUAL_ENDSTOPS)
if (axis == Z_AXIS) stepper.set_homing_flag(true); if (axis == Z_AXIS) stepper.set_homing_flag(true);
@ -2423,8 +2413,8 @@ static void homeaxis(AxisEnum axis) {
axis_known_position[axis] = true; axis_known_position[axis] = true;
axis_homed[axis] = true; axis_homed[axis] = true;
// Put away the Z probe with a function // Put away the Z probe
#if ENABLED(Z_PROBE_SLED) || SERVO_LEVELING || ENABLED(FIX_MOUNTED_PROBE) #if ENABLED(Z_PROBE_SLED) || SERVO_LEVELING || ENABLED(FIX_MOUNTED_PROBE) || HAS_Z_ENDSTOP_SERVO
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));
@ -2433,33 +2423,6 @@ static void homeaxis(AxisEnum axis) {
} }
#endif #endif
// Retract X, Y (or Z) Servo endstop if enabled
#if ENABLED(HAS_SERVO_ENDSTOPS)
if (_Z_SERVO_TEST && SERVO_ENDSTOP_EXISTS(axis)) {
// Raise the servo probe before stow outside ABL context.
// This is a workaround to allow use of a Servo Probe without
// ABL until more global probe handling is implemented.
#if Z_RAISE_AFTER_PROBING > 0
if (axis == Z_AXIS) {
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) SERIAL_ECHOPAIR("Raise Z (after) by ", Z_RAISE_AFTER_PROBING);
#endif
current_position[Z_AXIS] = Z_RAISE_AFTER_PROBING;
feedrate = homing_feedrate[Z_AXIS];
line_to_current_position();
stepper.synchronize();
}
#endif
#if ENABLED(DEBUG_LEVELING_FEATURE)
if (DEBUGGING(LEVELING)) SERIAL_ECHOLNPGM("> SERVO_ENDSTOPS > Stow with servo.move()");
#endif
STOW_SERVO_ENDSTOP(axis);
if (_Z_SERVO_SUBTEST) endstops.enable_z_probe(false);
}
#endif // HAS_SERVO_ENDSTOPS
} }
#if ENABLED(DEBUG_LEVELING_FEATURE) #if ENABLED(DEBUG_LEVELING_FEATURE)
@ -3801,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 ENABLED(HAS_SERVO_ENDSTOPS) || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED) #if HAS_Z_ENDSTOP_SERVO || ENABLED(Z_PROBE_ALLEN_KEY) || ENABLED(Z_PROBE_SLED)
+ Z_RAISE_AFTER_PROBING + Z_RAISE_AFTER_PROBING
#endif #endif
; ;
@ -3816,11 +3779,9 @@ 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
#else #elif !HAS_Z_ENDSTOP_SERVO && 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
#if DISABLED(HAS_SERVO_ENDSTOPS) && DISABLED(Z_PROBE_ALLEN_KEY) && DISABLED(Z_PROBE_SLED) raise_z_after_probing();
raise_z_after_probing();
#endif
#endif #endif
#endif // !DELTA #endif // !DELTA
@ -3862,8 +3823,8 @@ 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 ENABLED(HAS_SERVO_ENDSTOPS) #if HAS_Z_ENDSTOP_SERVO
raise_z_for_servo(); 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.
@ -3884,8 +3845,8 @@ 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 ENABLED(HAS_SERVO_ENDSTOPS) #if HAS_Z_ENDSTOP_SERVO
raise_z_for_servo(); 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.
@ -6019,14 +5980,14 @@ 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) && (ENABLED(HAS_SERVO_ENDSTOPS) || ENABLED(Z_PROBE_ALLEN_KEY)) #if ENABLED(AUTO_BED_LEVELING_FEATURE) && DISABLED(Z_PROBE_SLED) && (HAS_Z_ENDSTOP_SERVO || 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 ENABLED(HAS_SERVO_ENDSTOPS) #if HAS_Z_ENDSTOP_SERVO
raise_z_for_servo(); raise_z_for_servo(Z_RAISE_BEFORE_PROBING);
#endif #endif
deploy_z_probe(); deploy_z_probe();
} }
@ -6035,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 ENABLED(HAS_SERVO_ENDSTOPS) #if HAS_Z_ENDSTOP_SERVO
raise_z_for_servo(); raise_z_for_servo(Z_RAISE_AFTER_PROBING);
#endif #endif
stow_z_probe(false); stow_z_probe(false);
} }
#endif // AUTO_BED_LEVELING_FEATURE && (ENABLED(HAS_SERVO_ENDSTOPS) || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED #endif // AUTO_BED_LEVELING_FEATURE && (HAS_Z_ENDSTOP_SERVO || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED
#if ENABLED(FILAMENT_WIDTH_SENSOR) #if ENABLED(FILAMENT_WIDTH_SENSOR)
@ -7338,14 +7299,14 @@ void process_next_command() {
gcode_M400(); gcode_M400();
break; break;
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && (ENABLED(HAS_SERVO_ENDSTOPS) || ENABLED(Z_PROBE_ALLEN_KEY)) && DISABLED(Z_PROBE_SLED) #if ENABLED(AUTO_BED_LEVELING_FEATURE) && (HAS_Z_ENDSTOP_SERVO || 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 && (ENABLED(HAS_SERVO_ENDSTOPS) || Z_PROBE_ALLEN_KEY) && !Z_PROBE_SLED #endif // AUTO_BED_LEVELING_FEATURE && (HAS_Z_ENDSTOP_SERVO || 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

27
Marlin/SanityCheck.h
Unescape View File

@ -170,26 +170,19 @@
/** /**
* Limited number of servos * Limited number of servos
*/ */
#if NUM_SERVOS > 4
#error "The maximum number of SERVOS in Marlin is 4."
#endif
#if defined(NUM_SERVOS) && NUM_SERVOS > 0 #if defined(NUM_SERVOS) && NUM_SERVOS > 0
#if X_ENDSTOP_SERVO_NR >= 0 || Y_ENDSTOP_SERVO_NR >= 0 || Z_ENDSTOP_SERVO_NR >= 0 #if NUM_SERVOS > 4
#if X_ENDSTOP_SERVO_NR >= NUM_SERVOS #error "The maximum number of SERVOS in Marlin is 4."
#error "X_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS." #elif HAS_Z_ENDSTOP_SERVO && Z_ENDSTOP_SERVO_NR >= NUM_SERVOS
#elif Y_ENDSTOP_SERVO_NR >= NUM_SERVOS #error "Z_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS."
#error "Y_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS."
#elif Z_ENDSTOP_SERVO_NR >= NUM_SERVOS
#error "Z_ENDSTOP_SERVO_NR must be smaller than NUM_SERVOS."
#endif
#endif #endif
#endif #endif
/** /**
* Servo deactivation depends on servo endstops * Servo deactivation depends on servo endstops
*/ */
#if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) && DISABLED(HAS_SERVO_ENDSTOPS) #if ENABLED(DEACTIVATE_SERVOS_AFTER_MOVE) && !HAS_Z_ENDSTOP_SERVO
#error "At least one of the ?_ENDSTOP_SERVO_NR is required for DEACTIVATE_SERVOS_AFTER_MOVE." #error "Z_ENDSTOP_SERVO_NR is required for DEACTIVATE_SERVOS_AFTER_MOVE."
#endif #endif
/** /**
@ -288,8 +281,8 @@
//#if Z_ENDSTOP_SERVO_NR < 0 //#if Z_ENDSTOP_SERVO_NR < 0
// #error "You must have Z_ENDSTOP_SERVO_NR set to at least 0 or above to use Z_MIN_PROBE_ENDSTOP." // #error "You must have Z_ENDSTOP_SERVO_NR set to at least 0 or above to use Z_MIN_PROBE_ENDSTOP."
//#endif //#endif
//#ifndef SERVO_ENDSTOP_ANGLES //#ifndef Z_SERVO_ANGLES
// #error "You must have SERVO_ENDSTOP_ANGLES defined for Z Extend and Retract to use Z_MIN_PROBE_ENDSTOP." // #error "You must have Z_SERVO_ANGLES defined for Z Extend and Retract to use Z_MIN_PROBE_ENDSTOP."
//#endif //#endif
#endif #endif
@ -613,6 +606,10 @@
#error "PID_PARAMS_PER_EXTRUDER is deprecated. Use PID_PARAMS_PER_HOTEND instead." #error "PID_PARAMS_PER_EXTRUDER is deprecated. Use PID_PARAMS_PER_HOTEND instead."
#elif defined(EXTRUDER_WATTS) #elif defined(EXTRUDER_WATTS)
#error "EXTRUDER_WATTS is deprecated. Use HOTEND_WATTS instead." #error "EXTRUDER_WATTS is deprecated. Use HOTEND_WATTS instead."
#elif defined(SERVO_ENDSTOP_ANGLES)
#error "SERVO_ENDSTOP_ANGLES is deprecated. Use Z_SERVO_ANGLES instead."
#elif defined(X_ENDSTOP_SERVO_NR) || defined(Y_ENDSTOP_SERVO_NR)
#error "X_ENDSTOP_SERVO_NR and Y_ENDSTOP_SERVO_NR are deprecated and should be removed."
#endif #endif
#endif //SANITYCHECK_H #endif //SANITYCHECK_H

6
Marlin/example_configurations/Felix/Configuration.h
Unescape View File

@ -402,7 +402,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1147,10 +1147,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/Felix/DUAL/Configuration.h
Unescape View File

@ -400,7 +400,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1145,10 +1145,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/Hephestos/Configuration.h
Unescape View File

@ -412,7 +412,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1156,10 +1156,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/Hephestos_2/Configuration.h
Unescape View File

@ -414,7 +414,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1158,10 +1158,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/K8200/Configuration.h
Unescape View File

@ -437,7 +437,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1181,10 +1181,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/RepRapWorld/Megatronics/Configuration.h
Unescape View File

@ -420,7 +420,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1164,10 +1164,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/RigidBot/Configuration.h
Unescape View File

@ -414,7 +414,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1161,10 +1161,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/SCARA/Configuration.h
Unescape View File

@ -428,7 +428,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1172,10 +1172,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/TAZ4/Configuration.h
Unescape View File

@ -441,7 +441,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1185,10 +1185,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/WITBOX/Configuration.h
Unescape View File

@ -412,7 +412,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1156,10 +1156,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/adafruit/ST7565/Configuration.h
Unescape View File

@ -420,7 +420,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1164,10 +1164,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/delta/biv2.5/Configuration.h
Unescape View File

@ -462,7 +462,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1253,10 +1253,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/delta/generic/Configuration.h
Unescape View File

@ -462,7 +462,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1247,10 +1247,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/delta/kossel_mini/Configuration.h
Unescape View File

@ -462,7 +462,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1250,10 +1250,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/delta/kossel_pro/Configuration.h
Unescape View File

@ -451,7 +451,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1250,10 +1250,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/delta/kossel_xl/Configuration.h
Unescape View File

@ -460,7 +460,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1252,10 +1252,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/makibox/Configuration.h
Unescape View File

@ -423,7 +423,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1167,10 +1167,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = false; // set to true to invert the l
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

6
Marlin/example_configurations/tvrrug/Round2/Configuration.h
Unescape View File

@ -410,7 +410,7 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN. // To use a separate Z probe, your board must define a Z_MIN_PROBE_PIN.
// //
// For a servo-based Z probe, you must set up servo support below, including // For a servo-based Z probe, you must set up servo support below, including
// NUM_SERVOS, Z_ENDSTOP_SERVO_NR and SERVO_ENDSTOP_ANGLES. // NUM_SERVOS, Z_ENDSTOP_SERVO_NR and Z_SERVO_ANGLES.
// //
// - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin. // - RAMPS 1.3/1.4 boards may be able to use the 5V, GND, and Aux4->D32 pin.
// - Use 5V for powered (usu. inductive) sensors. // - Use 5V for powered (usu. inductive) sensors.
@ -1158,10 +1158,8 @@ const bool Z_MIN_PROBE_ENDSTOP_INVERTING = true; // set to true to invert the lo
// This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes. // This allows for servo actuated endstops, primary usage is for the Z Axis to eliminate calibration or bed height changes.
// Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500. // Use M851 to set the Z probe vertical offset from the nozzle. Store that setting with M500.
// //
//#define X_ENDSTOP_SERVO_NR 1
//#define Y_ENDSTOP_SERVO_NR 2
//#define Z_ENDSTOP_SERVO_NR 0 //#define Z_ENDSTOP_SERVO_NR 0
//#define SERVO_ENDSTOP_ANGLES {{0,0}, {0,0}, {70,0}} // X,Y,Z Axis Extend and Retract angles //#define Z_SERVO_ANGLES {70,0} // Z Servo Extend and Retract angles
// Servo deactivation // Servo deactivation
// //

Write Preview
Loading…
Cancel
Save