Browse Source

Fixes for spindle/laser and SCARA probe bounds

Scott Lahteine 7 years ago
parent
commit
5cbe0244c5
2 changed files with 7 additions and 1 deletions
  1. 6
    0
      Marlin/Conditionals_post.h
  2. 1
    1
      Marlin/pins_RAMPS.h

+ 6
- 0
Marlin/Conditionals_post.h View File

788
     #define MAX_PROBE_X ( DELTA_PRINTABLE_RADIUS)
788
     #define MAX_PROBE_X ( DELTA_PRINTABLE_RADIUS)
789
     #define MIN_PROBE_Y (-DELTA_PRINTABLE_RADIUS)
789
     #define MIN_PROBE_Y (-DELTA_PRINTABLE_RADIUS)
790
     #define MAX_PROBE_Y ( DELTA_PRINTABLE_RADIUS)
790
     #define MAX_PROBE_Y ( DELTA_PRINTABLE_RADIUS)
791
+  #elif IS_SCARA
792
+    #define SCARA_PRINTABLE_RADIUS (SCARA_LINKAGE_1 + SCARA_LINKAGE_2)
793
+    #define MIN_PROBE_X (-SCARA_PRINTABLE_RADIUS)
794
+    #define MAX_PROBE_X ( SCARA_PRINTABLE_RADIUS)
795
+    #define MIN_PROBE_Y (-SCARA_PRINTABLE_RADIUS)
796
+    #define MAX_PROBE_Y ( SCARA_PRINTABLE_RADIUS)
791
   #else
797
   #else
792
     // Boundaries for probing based on set limits
798
     // Boundaries for probing based on set limits
793
     #define MIN_PROBE_X (max(X_MIN_POS, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))
799
     #define MIN_PROBE_X (max(X_MIN_POS, X_MIN_POS + X_PROBE_OFFSET_FROM_EXTRUDER))

+ 1
- 1
Marlin/pins_RAMPS.h View File

375
 //
375
 //
376
 // M3/M4/M5 - Spindle/Laser Control
376
 // M3/M4/M5 - Spindle/Laser Control
377
 //
377
 //
378
-#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE_PIN)
378
+#if ENABLED(SPINDLE_LASER_ENABLE) && !PIN_EXISTS(SPINDLE_LASER_ENABLE)
379
   #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
379
   #if !defined(NUM_SERVOS) || NUM_SERVOS == 0 // try to use servo connector first
380
     #define SPINDLE_LASER_ENABLE_PIN  4  // Pin should have a pullup/pulldown!
380
     #define SPINDLE_LASER_ENABLE_PIN  4  // Pin should have a pullup/pulldown!
381
     #define SPINDLE_LASER_PWM_PIN     6  // MUST BE HARDWARE PWM
381
     #define SPINDLE_LASER_PWM_PIN     6  // MUST BE HARDWARE PWM

Loading…
Cancel
Save