From 5cbe0244c592c848229a3711b995344504f6a8a2 Mon Sep 17 00:00:00 2001 From: Scott Lahteine Date: Fri, 19 May 2017 13:48:16 -0500 Subject: [PATCH] Fixes for spindle/laser and SCARA probe bounds --- Marlin/Conditionals_post.h | 6 ++++++ Marlin/pins_RAMPS.h | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/Marlin/Conditionals_post.h b/Marlin/Conditionals_post.h index a4ae28ff34..9fcd944ac0 100644 --- a/Marlin/Conditionals_post.h +++ b/Marlin/Conditionals_post.h @@ -788,6 +788,12 @@ #define MAX_PROBE_X ( DELTA_PRINTABLE_RADIUS) #define MIN_PROBE_Y (-DELTA_PRINTABLE_RADIUS) #define MAX_PROBE_Y ( DELTA_PRINTABLE_RADIUS) + #elif IS_SCARA + #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2) + #define MIN_PROBE_X (-SCARA_PRINTABLE_RADIUS) + #define MAX_PROBE_X ( SCARA_PRINTABLE_RADIUS) + #define MIN_PROBE_Y (-SCARA_PRINTABLE_RADIUS) + #define MAX_PROBE_Y ( SCARA_PRINTABLE_RADIUS) #else // Boundaries for probing based on set limits #define MIN_PROBE_X (max(X_MIN_POS, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER)) diff --git a/Marlin/pins_RAMPS.h b/Marlin/pins_RAMPS.h index 9bd1a252c3..d1502e7d97 100644 --- a/Marlin/pins_RAMPS.h +++ b/Marlin/pins_RAMPS.h @@ -375,7 +375,7 @@ // // M3/M4/M5 - Spindle/Laser Control // -#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE_PIN) +#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE) #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first #define SPINDLE_LASER_ENABLE_PIN 4 // Pin should have a pullup/pulldown! #define SPINDLE_LASER_PWM_PIN 6 // MUST BE HARDWARE PWM