Fixes for spindle/laser and SCARA probe bounds

8 years ago · 5cbe0244c5
parent 1f52c9f5df
commit 5cbe0244c5
2 changed files with 7 additions and 1 deletions
--- 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))
--- 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