Browse Source

No Z_MULTI_ENDSTOPS when HOMING_Z_WITH_PROBE (#20254)

Jason Smith 4 years ago
parent
commit
e9431b5445
No account linked to committer's email address
2 changed files with 3 additions and 6 deletions
  1. 2
    0
      Marlin/src/inc/SanityCheck.h
  2. 1
    6
      buildroot/tests/DUE-tests

+ 2
- 0
Marlin/src/inc/SanityCheck.h View File

2006
   #error "Enable USE_ZMIN_PLUG when homing Z to MIN."
2006
   #error "Enable USE_ZMIN_PLUG when homing Z to MIN."
2007
 #elif Z_HOME_DIR > 0 && ENABLED(USE_PROBE_FOR_Z_HOMING)
2007
 #elif Z_HOME_DIR > 0 && ENABLED(USE_PROBE_FOR_Z_HOMING)
2008
   #error "Z_HOME_DIR must be -1 when homing Z with the probe."
2008
   #error "Z_HOME_DIR must be -1 when homing Z with the probe."
2009
+#elif BOTH(HOMING_Z_WITH_PROBE, Z_MULTI_ENDSTOPS)
2010
+  #error "Z_MULTI_ENDSTOPS is incompatible with USE_PROBE_FOR_Z_HOMING."
2009
 #elif Z_HOME_DIR > 0 && DISABLED(USE_ZMAX_PLUG)
2011
 #elif Z_HOME_DIR > 0 && DISABLED(USE_ZMAX_PLUG)
2010
   #error "Enable USE_ZMAX_PLUG when homing Z to MAX."
2012
   #error "Enable USE_ZMAX_PLUG when homing Z to MAX."
2011
 #endif
2013
 #endif

+ 1
- 6
buildroot/tests/DUE-tests View File

41
 restore_configs
41
 restore_configs
42
 opt_set MOTHERBOARD BOARD_RADDS
42
 opt_set MOTHERBOARD BOARD_RADDS
43
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG ENDSTOPPULLUPS BLTOUCH AUTO_BED_LEVELING_BILINEAR \
43
 opt_enable USE_XMAX_PLUG USE_YMAX_PLUG ENDSTOPPULLUPS BLTOUCH AUTO_BED_LEVELING_BILINEAR \
44
-           Z_MULTI_ENDSTOPS Z_STEPPER_AUTO_ALIGN Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS \
45
-           Z_SAFE_HOMING
44
+           Z_STEPPER_AUTO_ALIGN Z_STEPPER_ALIGN_KNOWN_STEPPER_POSITIONS Z_SAFE_HOMING
46
            #TOUCH_UI_FTDI_EVE LCD_ALEPHOBJECTS_CLCD_UI OTHER_PIN_LAYOUT
45
            #TOUCH_UI_FTDI_EVE LCD_ALEPHOBJECTS_CLCD_UI OTHER_PIN_LAYOUT
47
 opt_set NUM_Z_STEPPER_DRIVERS 3
46
 opt_set NUM_Z_STEPPER_DRIVERS 3
48
-opt_add Z2_MAX_ENDSTOP_INVERTING false
49
-opt_add Z3_MAX_ENDSTOP_INVERTING false
50
-opt_add Z2_MAX_PIN 2
51
-opt_add Z3_MAX_PIN 3
52
 pins_set ramps/RAMPS X_MAX_PIN -1
47
 pins_set ramps/RAMPS X_MAX_PIN -1
53
 pins_set ramps/RAMPS Y_MAX_PIN -1
48
 pins_set ramps/RAMPS Y_MAX_PIN -1
54
 exec_test $1 $2 "RADDS with ABL (Bilinear), Triple Z Axis, Z_STEPPER_AUTO_ALIGN" "$3"
49
 exec_test $1 $2 "RADDS with ABL (Bilinear), Triple Z Axis, Z_STEPPER_AUTO_ALIGN" "$3"

Loading…
Cancel
Save