From 3e15fb340998023133aa07cf657c7748b2a5b71f Mon Sep 17 00:00:00 2001 From: Mitch Bradley Date: Sat, 8 Aug 2020 13:15:35 -1000 Subject: [PATCH] Eliminated unused USE_GANGED_AXES (#526) --- Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h | 3 +-- Grbl_Esp32/src/Machines/lowrider_v1p2.h | 4 ---- Grbl_Esp32/src/Machines/mpcnc_v1p1.h | 2 -- Grbl_Esp32/src/Machines/mpcnc_v1p2.h | 2 -- Grbl_Esp32/src/Machines/spi_daisy_4axis_xyyz.h | 3 --- 5 files changed, 1 insertion(+), 13 deletions(-) diff --git a/Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h b/Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h index 24a227e8..04387ec3 100644 --- a/Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h +++ b/Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h @@ -19,6 +19,7 @@ You should have received a copy of the GNU General Public License along with Grbl_ESP32. If not, see . */ + #define MACHINE_NAME "ESP32 I2S XXYYZZ Axis Driver Board (StepStick)" #ifdef N_AXIS @@ -58,8 +59,6 @@ #define STEPPER_RESET GPIO_NUM_19 -#define USE_GANGED_AXES // allow two motors on an axis - #define X_DISABLE_PIN I2SO(0) #define X_DIRECTION_PIN I2SO(1) #define X_STEP_PIN I2SO(2) diff --git a/Grbl_Esp32/src/Machines/lowrider_v1p2.h b/Grbl_Esp32/src/Machines/lowrider_v1p2.h index 8566b8b3..29b6f186 100644 --- a/Grbl_Esp32/src/Machines/lowrider_v1p2.h +++ b/Grbl_Esp32/src/Machines/lowrider_v1p2.h @@ -22,12 +22,8 @@ along with Grbl_ESP32. If not, see . */ - - #define MACHINE_NAME "LOWRIDER_V1P2" -#define USE_GANGED_AXES // allow two motors on an axis - #define X_STEP_PIN GPIO_NUM_27 // use Z labeled connector #define X_DIRECTION_PIN GPIO_NUM_33 // use Z labeled connector diff --git a/Grbl_Esp32/src/Machines/mpcnc_v1p1.h b/Grbl_Esp32/src/Machines/mpcnc_v1p1.h index 09303f51..57f522a1 100644 --- a/Grbl_Esp32/src/Machines/mpcnc_v1p1.h +++ b/Grbl_Esp32/src/Machines/mpcnc_v1p1.h @@ -30,8 +30,6 @@ #define MACHINE_NAME "MPCNC_V1P1" -#define USE_GANGED_AXES // allow two motors on an axis - #define X_STEP_PIN GPIO_NUM_12 #define X2_STEP_PIN GPIO_NUM_22 // ganged motor #define X_AXIS_SQUARING diff --git a/Grbl_Esp32/src/Machines/mpcnc_v1p2.h b/Grbl_Esp32/src/Machines/mpcnc_v1p2.h index d0eddccf..fcf44169 100644 --- a/Grbl_Esp32/src/Machines/mpcnc_v1p2.h +++ b/Grbl_Esp32/src/Machines/mpcnc_v1p2.h @@ -31,8 +31,6 @@ #define MACHINE_NAME "MPCNC_V1P2" -#define USE_GANGED_AXES // allow two motors on an axis - #define X_STEP_PIN GPIO_NUM_12 #define X2_STEP_PIN GPIO_NUM_22 // ganged motor #define X_AXIS_SQUARING diff --git a/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyyz.h b/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyyz.h index 8957e5fe..710895b3 100644 --- a/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyyz.h +++ b/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyyz.h @@ -42,9 +42,6 @@ // The hardware enable pin is tied to ground #define USE_TRINAMIC_ENABLE -// allow two motors on an axis -#define USE_GANGED_AXES - // Y motor connects to the 1st driver #define X_TRINAMIC_DRIVER 2130 // Which Driver Type? #define X_RSENSE TMC2130_RSENSE_DEFAULT