From d5adb83e7664077cde01d176d5512b53c380f82e Mon Sep 17 00:00:00 2001 From: Jeffeb3 Date: Thu, 27 Aug 2020 20:26:19 -0600 Subject: [PATCH 1/3] Change LR to be dual XZ. Set up the probe the way Matthew Andres, and others have defined. --- src/configs/V1CNC_Rambo_DualLR | 2 +- src/configs/V1CNC_Skr1p3_DualLR_2209 | 2 +- src/configs/V1CNC_Skr1p3_DualLR_8825 | 2 +- src/configs/V1CNC_SkrPro_DualLR_2209 | 2 +- src/configs/accessories/dual-drivers-on-xz | 35 ++++++++++++++++++++++ src/configs/accessories/dual-drivers-on-yz | 7 +++++ 6 files changed, 46 insertions(+), 4 deletions(-) create mode 100755 src/configs/accessories/dual-drivers-on-xz diff --git a/src/configs/V1CNC_Rambo_DualLR b/src/configs/V1CNC_Rambo_DualLR index ae0118c7..430a6db0 100755 --- a/src/configs/V1CNC_Rambo_DualLR +++ b/src/configs/V1CNC_Rambo_DualLR @@ -10,6 +10,6 @@ $CFGDIR/common/v1-base-config $CFGDIR/common/cnc-config $CFGDIR/boards/rambo $CFGDIR/accessories/reprap_discount_full_graphic_lcd -$CFGDIR/accessories/dual-drivers-on-yz +$CFGDIR/accessories/dual-drivers-on-xz export PLATFORMIO_ENV=rambo diff --git a/src/configs/V1CNC_Skr1p3_DualLR_2209 b/src/configs/V1CNC_Skr1p3_DualLR_2209 index 7275744a..31833732 100755 --- a/src/configs/V1CNC_Skr1p3_DualLR_2209 +++ b/src/configs/V1CNC_Skr1p3_DualLR_2209 @@ -12,6 +12,6 @@ $CFGDIR/boards/skr_1p3 $CFGDIR/accessories/dummy-extruder $CFGDIR/accessories/tmc2209 $CFGDIR/accessories/reprap_discount_full_graphic_lcd -$CFGDIR/accessories/dual-drivers-on-yz +$CFGDIR/accessories/dual-drivers-on-xz export PLATFORMIO_ENV=LPC1768 diff --git a/src/configs/V1CNC_Skr1p3_DualLR_8825 b/src/configs/V1CNC_Skr1p3_DualLR_8825 index 2d97534d..259f0703 100755 --- a/src/configs/V1CNC_Skr1p3_DualLR_8825 +++ b/src/configs/V1CNC_Skr1p3_DualLR_8825 @@ -12,6 +12,6 @@ $CFGDIR/boards/skr_1p3 $CFGDIR/accessories/dummy-extruder $CFGDIR/accessories/drv8825 $CFGDIR/accessories/reprap_discount_full_graphic_lcd -$CFGDIR/accessories/dual-drivers-on-yz +$CFGDIR/accessories/dual-drivers-on-xz export PLATFORMIO_ENV=LPC1768 diff --git a/src/configs/V1CNC_SkrPro_DualLR_2209 b/src/configs/V1CNC_SkrPro_DualLR_2209 index 6ab79564..5438041a 100755 --- a/src/configs/V1CNC_SkrPro_DualLR_2209 +++ b/src/configs/V1CNC_SkrPro_DualLR_2209 @@ -12,6 +12,6 @@ $CFGDIR/boards/skr_pro $CFGDIR/accessories/dummy-extruder $CFGDIR/accessories/tmc2209 $CFGDIR/accessories/reprap_discount_full_graphic_lcd -$CFGDIR/accessories/dual-drivers-on-yz +$CFGDIR/accessories/dual-drivers-on-xz export PLATFORMIO_ENV=BIGTREE_SKR_PRO diff --git a/src/configs/accessories/dual-drivers-on-xz b/src/configs/accessories/dual-drivers-on-xz new file mode 100755 index 00000000..063602f6 --- /dev/null +++ b/src/configs/accessories/dual-drivers-on-xz @@ -0,0 +1,35 @@ +opt_set EXTRUDERS "0" +opt_set X_MIN_ENDSTOP_INVERTING "false" +opt_set Y_MIN_ENDSTOP_INVERTING "false" +opt_set X_MAX_ENDSTOP_INVERTING "false" +opt_set Y_MAX_ENDSTOP_INVERTING "false" +opt_set Z_MAX_ENDSTOP_INVERTING "false" +opt_set Z_MIN_ENDSTOP_INVERTING "true" + +opt_set Z_HOME_DIR "+1" + +opt_set NUM_Z_STEPPER_DRIVERS "2" + +# Z Min probe configuration. +opt_set Z_MIN_PROBE_PIN "Z_MIN_PIN" +opt_disable \ + Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +opt_set USER_DESC_4 "\"Probe Z min\"" +opt_set USER_GCODE_4 "\"G38.2 Z0\"" + +opt_set Z2_USE_ENDSTOP "YMAX" + +opt_enable \ + MIN_SOFTWARE_ENDSTOPS \ + MIN_SOFTWARE_ENDSTOP_Z \ + SOFT_ENDSTOPS_MENU_ITEM \ + USE_XMAX_PLUG \ + USE_YMAX_PLUG \ + USE_ZMAX_PLUG \ + X_DUAL_STEPPER_DRIVERS \ + X_DUAL_ENDSTOPS \ + Z_MULTI_ENDSTOPS \ + G38_PROBE_TARGET \ + FIX_MOUNTED_PROBE + +echo "- Configured for Dual XZ" >> README.md diff --git a/src/configs/accessories/dual-drivers-on-yz b/src/configs/accessories/dual-drivers-on-yz index 770329ac..a7233fd1 100755 --- a/src/configs/accessories/dual-drivers-on-yz +++ b/src/configs/accessories/dual-drivers-on-yz @@ -10,6 +10,13 @@ opt_set Z_HOME_DIR "+1" opt_set NUM_Z_STEPPER_DRIVERS "2" +# Z Min probe configuration. +opt_set Z_MIN_PROBE_PIN "Z_MIN_PIN" +opt_disable \ + Z_MIN_PROBE_USES_Z_MIN_ENDSTOP_PIN +opt_set USER_DESC_4 "\"Probe Z min\"" +opt_set USER_GCODE_4 "\"G38.2 Z0\"" + opt_enable \ MIN_SOFTWARE_ENDSTOPS \ MIN_SOFTWARE_ENDSTOP_Z \ From 96c42a0f5fb979b92a186a3d7897d1e577fdf201 Mon Sep 17 00:00:00 2001 From: Jeffeb3 Date: Thu, 27 Aug 2020 20:57:03 -0600 Subject: [PATCH 2/3] Fix for Z2_USE_ENDSTOP problem. --- src/configs/accessories/dual-drivers-on-xz | 2 +- src/configs/accessories/tmc2130 | 1 + src/configs/accessories/tmc2209 | 1 + 3 files changed, 3 insertions(+), 1 deletion(-) diff --git a/src/configs/accessories/dual-drivers-on-xz b/src/configs/accessories/dual-drivers-on-xz index 063602f6..0bc84f1b 100755 --- a/src/configs/accessories/dual-drivers-on-xz +++ b/src/configs/accessories/dual-drivers-on-xz @@ -17,7 +17,7 @@ opt_disable \ opt_set USER_DESC_4 "\"Probe Z min\"" opt_set USER_GCODE_4 "\"G38.2 Z0\"" -opt_set Z2_USE_ENDSTOP "YMAX" +opt_set Z2_USE_ENDSTOP "_YMAX_" opt_enable \ MIN_SOFTWARE_ENDSTOPS \ diff --git a/src/configs/accessories/tmc2130 b/src/configs/accessories/tmc2130 index ab533751..ad053226 100755 --- a/src/configs/accessories/tmc2130 +++ b/src/configs/accessories/tmc2130 @@ -20,6 +20,7 @@ opt_set Y_CURRENT 900 opt_set Z_CURRENT 900 opt_set X2_CURRENT 900 opt_set Y2_CURRENT 900 +opt_set Z2_CURRENT 900 opt_enable \ TMC_USE_SW_SPI \ diff --git a/src/configs/accessories/tmc2209 b/src/configs/accessories/tmc2209 index cced1c06..a028406c 100755 --- a/src/configs/accessories/tmc2209 +++ b/src/configs/accessories/tmc2209 @@ -20,6 +20,7 @@ opt_set Y_CURRENT 900 opt_set Z_CURRENT 900 opt_set X2_CURRENT 900 opt_set Y2_CURRENT 900 +opt_set Z2_CURRENT 900 opt_enable \ MONITOR_DRIVER_STATUS \ From 4d95f06ea42d0d0956be00eae35fde83f33b026d Mon Sep 17 00:00:00 2001 From: Jeffeb3 Date: Fri, 28 Aug 2020 11:02:15 -0600 Subject: [PATCH 3/3] Undo the xz change. --- src/configs/V1CNC_Rambo_DualLR | 2 +- src/configs/V1CNC_Skr1p3_DualLR_2209 | 2 +- src/configs/V1CNC_Skr1p3_DualLR_8825 | 2 +- src/configs/V1CNC_SkrPro_DualLR_2209 | 2 +- 4 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/configs/V1CNC_Rambo_DualLR b/src/configs/V1CNC_Rambo_DualLR index 430a6db0..ae0118c7 100755 --- a/src/configs/V1CNC_Rambo_DualLR +++ b/src/configs/V1CNC_Rambo_DualLR @@ -10,6 +10,6 @@ $CFGDIR/common/v1-base-config $CFGDIR/common/cnc-config $CFGDIR/boards/rambo $CFGDIR/accessories/reprap_discount_full_graphic_lcd -$CFGDIR/accessories/dual-drivers-on-xz +$CFGDIR/accessories/dual-drivers-on-yz export PLATFORMIO_ENV=rambo diff --git a/src/configs/V1CNC_Skr1p3_DualLR_2209 b/src/configs/V1CNC_Skr1p3_DualLR_2209 index 31833732..7275744a 100755 --- a/src/configs/V1CNC_Skr1p3_DualLR_2209 +++ b/src/configs/V1CNC_Skr1p3_DualLR_2209 @@ -12,6 +12,6 @@ $CFGDIR/boards/skr_1p3 $CFGDIR/accessories/dummy-extruder $CFGDIR/accessories/tmc2209 $CFGDIR/accessories/reprap_discount_full_graphic_lcd -$CFGDIR/accessories/dual-drivers-on-xz +$CFGDIR/accessories/dual-drivers-on-yz export PLATFORMIO_ENV=LPC1768 diff --git a/src/configs/V1CNC_Skr1p3_DualLR_8825 b/src/configs/V1CNC_Skr1p3_DualLR_8825 index 259f0703..2d97534d 100755 --- a/src/configs/V1CNC_Skr1p3_DualLR_8825 +++ b/src/configs/V1CNC_Skr1p3_DualLR_8825 @@ -12,6 +12,6 @@ $CFGDIR/boards/skr_1p3 $CFGDIR/accessories/dummy-extruder $CFGDIR/accessories/drv8825 $CFGDIR/accessories/reprap_discount_full_graphic_lcd -$CFGDIR/accessories/dual-drivers-on-xz +$CFGDIR/accessories/dual-drivers-on-yz export PLATFORMIO_ENV=LPC1768 diff --git a/src/configs/V1CNC_SkrPro_DualLR_2209 b/src/configs/V1CNC_SkrPro_DualLR_2209 index 5438041a..6ab79564 100755 --- a/src/configs/V1CNC_SkrPro_DualLR_2209 +++ b/src/configs/V1CNC_SkrPro_DualLR_2209 @@ -12,6 +12,6 @@ $CFGDIR/boards/skr_pro $CFGDIR/accessories/dummy-extruder $CFGDIR/accessories/tmc2209 $CFGDIR/accessories/reprap_discount_full_graphic_lcd -$CFGDIR/accessories/dual-drivers-on-xz +$CFGDIR/accessories/dual-drivers-on-yz export PLATFORMIO_ENV=BIGTREE_SKR_PRO