Commit 75a85141 authored by MagoKimbra's avatar MagoKimbra

Fix servo endstop width DELTA

parent 9016f36c
...@@ -44,7 +44,7 @@ ...@@ -44,7 +44,7 @@
// ONLY BAUDRATE 115200 // ONLY BAUDRATE 115200
//#define FIRMWARE_TEST //#define FIRMWARE_TEST
// Some particular clients re-start sending commands only after receiving a 'wait' when there is a bed serial-connection. // Some particular clients re-start sending commands only after receiving a 'wait' when there is a bad serial-connection.
//#define NO_TIMEOUTS 1000 // Milliseconds //#define NO_TIMEOUTS 1000 // Milliseconds
//#define ADVANCED_OK // Uncomment to include more info in ok command //#define ADVANCED_OK // Uncomment to include more info in ok command
/***********************************************************************/ /***********************************************************************/
......
...@@ -301,26 +301,26 @@ ...@@ -301,26 +301,26 @@
* If you have enabled the Auto bed levelling this add the Support for * * If you have enabled the Auto bed levelling this add the Support for *
* a dedicated Z PROBE endstop separate from the Z MIN endstop. * * a dedicated Z PROBE endstop separate from the Z MIN endstop. *
* If you would like to use both a Z PROBE and a Z MIN endstop together * * If you would like to use both a Z PROBE and a Z MIN endstop together *
* or just a Z PROBE with a custom pin, uncomment #define Z_PROBE_ENDSTOP * * or just a Z PROBE with a custom pin, uncomment #define Z PROBE ENDSTOP *
* and read the instructions below. * * and read the instructions below. *
* * * *
* If you want to still use the Z min endstop for homing, * * If you want to still use the Z min endstop for homing, *
* disable Z_SAFE_HOMING. * * disable Z SAFE HOMING. *
* Eg: to park the head outside the bed area when homing with G28. * * Eg: to park the head outside the bed area when homing with G28. *
* * * *
* WARNING: The Z MIN endstop will need to set properly as it would * * WARNING: The Z MIN endstop will need to set properly as it would *
* without a Z PROBE to prevent head crashes and premature stopping * * without a Z PROBE to prevent head crashes and premature stopping *
* during a print. * * during a print. *
* To use a separte Z PROBE endstop, you must have a Z_PROBE_PIN * * To use a separte Z PROBE endstop, you must have a Z PROBE PIN *
* defined in the pins.h file for your control board. * * defined in the pins.h file for your control board. *
* If you are using a servo based Z PROBE, you will need to enable * * If you are using a servo based Z PROBE, you will need to enable *
* NUM_SERVOS, SERVO_ENDSTOPS and SERVO_ENDSTOPS_ANGLES in * * NUM SERVOS, SERVO ENDSTOPS and SERVO ENDSTOPS ANGLES in *
* Configuration_Feature R/C Servo section. * * Configuration_Feature R/C Servo section. *
* * * *
* WARNING: Setting the wrong pin may have unexpected and potentially * * WARNING: Setting the wrong pin may have unexpected and potentially *
* disastrous outcomes. Use with caution and do your homework. * * disastrous outcomes. Use with caution and do your homework. *
* * * *
* Uncomment Z_PROBE_ENDSTOP to enable. * * Uncomment Z PROBE ENDSTOP to enable. *
* * * *
*****************************************************************************************/ *****************************************************************************************/
//#define Z_PROBE_ENDSTOP //#define Z_PROBE_ENDSTOP
......
...@@ -225,12 +225,6 @@ ...@@ -225,12 +225,6 @@
#define DEFAULT_bedKi .023 #define DEFAULT_bedKi .023
#define DEFAULT_bedKd 305.4 #define DEFAULT_bedKd 305.4
// 120v 250W silicone heater into 4mm borosilicate (MendelMax 1.5+)
// from pidautotune
//#define DEFAULT_bedKp 97.1
//#define DEFAULT_bedKi 1.41
//#define DEFAULT_bedKd 1675.16
// FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles. // FIND YOUR OWN: "M303 E-1 C8 S90" to run autotune on the bed at 90 degreesC for 8 cycles.
//#define PID_BED_DEBUG // Sends debug data to the serial port. //#define PID_BED_DEBUG // Sends debug data to the serial port.
......
...@@ -2847,7 +2847,7 @@ static void clean_up_after_endstop_move() { ...@@ -2847,7 +2847,7 @@ static void clean_up_after_endstop_move() {
} }
do_blocking_move_to_x(oldXpos); // return to position before docking do_blocking_move_to_x(oldXpos); // return to position before docking
} }
#endif //Z_PROBE_SLED #endif // Z_PROBE_SLED
#if HAS(TEMP_0) || HAS(TEMP_BED) || ENABLED(HEATER_0_USES_MAX6675) #if HAS(TEMP_0) || HAS(TEMP_BED) || ENABLED(HEATER_0_USES_MAX6675)
void print_heaterstates() { void print_heaterstates() {
...@@ -6213,13 +6213,13 @@ inline void gcode_M226() { ...@@ -6213,13 +6213,13 @@ inline void gcode_M226() {
*/ */
inline void gcode_M400() { st_synchronize(); } inline void gcode_M400() { st_synchronize(); }
#if ENABLED(AUTO_BED_LEVELING_FEATURE) && HASNT(Z_PROBE_SLED) && HAS(SERVO_ENDSTOPS) #if HAS(SERVO_ENDSTOPS)
/** /**
* M401: Engage Z Servo endstop if available * M401: Engage Z Servo endstop if available
*/ */
inline void gcode_M401() { inline void gcode_M401() {
#if HAS(SERVO_ENDSTOPS) #if ENABLED(AUTO_BED_LEVELING_FEATURE) && HASNT(Z_PROBE_SLED)
raise_z_for_servo(); raise_z_for_servo();
#endif #endif
deploy_z_probe(); deploy_z_probe();
...@@ -6229,13 +6229,17 @@ inline void gcode_M400() { st_synchronize(); } ...@@ -6229,13 +6229,17 @@ inline void gcode_M400() { st_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(SERVO_ENDSTOPS) #if ENABLED(AUTO_BED_LEVELING_FEATURE) && HASNT(Z_PROBE_SLED)
raise_z_for_servo(); raise_z_for_servo();
#endif #endif
#if MECH(DELTA)
retract_z_probe();
#else
stow_z_probe(false); stow_z_probe(false);
#endif
} }
#endif // AUTO_BED_LEVELING_FEATURE && (HAS(SERVO_ENDSTOPS) && !Z_PROBE_SLED) #endif // HAS(SERVO_ENDSTOPS)
#if ENABLED(FILAMENT_SENSOR) #if ENABLED(FILAMENT_SENSOR)
......
...@@ -3789,7 +3789,7 @@ ...@@ -3789,7 +3789,7 @@
#if MB(MINITRONICS) #if MB(MINITRONICS)
#define KNOWN_BOARD 1 #define KNOWN_BOARD 1
#ifndef __AVR_ATmega1280__ #ifndef __AVR_ATmega1281__
#error Oops! Make sure you have 'Minitronics ' selected from the 'Tools -> Boards' menu. #error Oops! Make sure you have 'Minitronics ' selected from the 'Tools -> Boards' menu.
#endif #endif
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment