From 5120ebfe1348a1b400ff0700786f0148768b5f70 Mon Sep 17 00:00:00 2001 From: Stefan de Bruijn Date: Sun, 1 Nov 2020 09:30:50 +0100 Subject: [PATCH] Changed all machine definitions --- Grbl_Esp32/src/CoolantControl.cpp | 2 +- Grbl_Esp32/src/Machines/3axis_rs485.h | 38 +++--- Grbl_Esp32/src/Machines/3axis_v3.h | 38 +++--- Grbl_Esp32/src/Machines/3axis_v4.h | 38 +++--- Grbl_Esp32/src/Machines/3axis_xyx.h | 38 +++--- .../src/Machines/4axis_external_driver.h | 40 +++---- .../Machines/6_pack_Lowrider_stepstick_v1.h | 94 +++++++-------- .../src/Machines/6_pack_MPCNC_stepstick_v1.h | 94 +++++++-------- .../src/Machines/6_pack_stepstick_XYZ_v1.h | 88 +++++++------- Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h | 108 ++++++++--------- .../src/Machines/6_pack_trinamic_stallguard.h | 110 +++++++++--------- Grbl_Esp32/src/Machines/atari_1020.h | 28 ++--- Grbl_Esp32/src/Machines/espduino.h | 36 +++--- Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h | 82 ++++++------- Grbl_Esp32/src/Machines/i2s_out_xyzabc.h | 86 +++++++------- .../src/Machines/i2s_out_xyzabc_trinamic.h | 78 ++++++------- Grbl_Esp32/src/Machines/lowrider_v1p2.h | 42 +++---- Grbl_Esp32/src/Machines/midtbot.h | 16 +-- .../src/Machines/mpcnc_laser_module_v1p2.h | 38 +++--- Grbl_Esp32/src/Machines/mpcnc_v1p1.h | 44 +++---- Grbl_Esp32/src/Machines/mpcnc_v1p2.h | 44 +++---- Grbl_Esp32/src/Machines/pen_laser.h | 18 +-- Grbl_Esp32/src/Machines/polar_coaster.h | 20 ++-- .../src/Machines/spi_daisy_4axis_xyyz.h | 32 ++--- Grbl_Esp32/src/Machines/spi_daisy_4axis_xyz.h | 28 ++--- .../src/Machines/spi_daisy_4axis_xyza.h | 34 +++--- Grbl_Esp32/src/Machines/tapster_3.h | 18 +-- .../src/Machines/tapster_pro_6P_trinamic.h | 62 +++++----- .../src/Machines/tapster_pro_stepstick.h | 40 +++---- Grbl_Esp32/src/Machines/template.h | 44 +++---- Grbl_Esp32/src/Machines/test_drive.h | 4 +- Grbl_Esp32/src/Machines/tmc2130_pen.h | 22 ++-- 32 files changed, 752 insertions(+), 752 deletions(-) diff --git a/Grbl_Esp32/src/CoolantControl.cpp b/Grbl_Esp32/src/CoolantControl.cpp index e510dda3..5fd1d5d6 100644 --- a/Grbl_Esp32/src/CoolantControl.cpp +++ b/Grbl_Esp32/src/CoolantControl.cpp @@ -30,7 +30,7 @@ void coolant_init() { grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Flood coolant on pin %s", CoolantFloodPin->get().name().c_str()); grbl_msg_sendf(CLIENT_SERIAL, MsgLevel::Info, "Mist coolant on pin %s", CoolantMistPin->get().name().c_str()); init_message = false; -} + } CoolantFloodPin->get().setAttr(Pin::Attr::Output); CoolantMistPin->get().setAttr(Pin::Attr::Output); diff --git a/Grbl_Esp32/src/Machines/3axis_rs485.h b/Grbl_Esp32/src/Machines/3axis_rs485.h index 39a565cb..48581b93 100644 --- a/Grbl_Esp32/src/Machines/3axis_rs485.h +++ b/Grbl_Esp32/src/Machines/3axis_rs485.h @@ -30,30 +30,30 @@ */ #define MACHINE_NAME "ESP32_XYZ_RS485" -#define X_STEP_PIN GPIO_NUM_4 // labeled X -#define X_DIRECTION_PIN GPIO_NUM_16 // labeled X -#define Y_STEP_PIN GPIO_NUM_17 // labeled Y -#define Y_DIRECTION_PIN GPIO_NUM_18 // labeled Y -#define Y2_STEP_PIN GPIO_NUM_19 // labeled Y2 -#define Y2_DIRECTION_PIN GPIO_NUM_21 // labeled Y2 -#define Z_STEP_PIN GPIO_NUM_22 // labeled Z -#define Z_DIRECTION_PIN GPIO_NUM_23 // labeled Z +#define X_STEP_PIN "gpio.4" // labeled X +#define X_DIRECTION_PIN "gpio.16" // labeled X +#define Y_STEP_PIN "gpio.17" // labeled Y +#define Y_DIRECTION_PIN "gpio.18" // labeled Y +#define Y2_STEP_PIN "gpio.19" // labeled Y2 +#define Y2_DIRECTION_PIN "gpio.21" // labeled Y2 +#define Z_STEP_PIN "gpio.22" // labeled Z +#define Z_DIRECTION_PIN "gpio.23" // labeled Z #define SPINDLE_TYPE SpindleType::H2A -#define VFD_RS485_TXD_PIN GPIO_NUM_13 // RS485 TX -#define VFD_RS485_RTS_PIN GPIO_NUM_15 // RS485 RTS -#define VFD_RS485_RXD_PIN GPIO_NUM_2 // RS485 RX +#define VFD_RS485_TXD_PIN "gpio.13" // RS485 TX +#define VFD_RS485_RTS_PIN "gpio.15" // RS485 RTS +#define VFD_RS485_RXD_PIN "gpio.2" // RS485 RX -#define X_LIMIT_PIN GPIO_NUM_33 -#define Y_LIMIT_PIN GPIO_NUM_32 -#define Y2_LIMIT_PIN GPIO_NUM_35 -#define Z_LIMIT_PIN GPIO_NUM_34 +#define X_LIMIT_PIN "gpio.33" +#define Y_LIMIT_PIN "gpio.32" +#define Y2_LIMIT_PIN "gpio.35" +#define Z_LIMIT_PIN "gpio.34" // Set $Homing/Cycle0=X and $Homing/Cycle=XY -#define PROBE_PIN GPIO_NUM_14 // labeled Probe -#define CONTROL_RESET_PIN GPIO_NUM_27 // labeled Reset -#define CONTROL_FEED_HOLD_PIN GPIO_NUM_26 // labeled Hold -#define CONTROL_CYCLE_START_PIN GPIO_NUM_25 // labeled Start +#define PROBE_PIN "gpio.14" // labeled Probe +#define CONTROL_RESET_PIN "gpio.27" // labeled Reset +#define CONTROL_FEED_HOLD_PIN "gpio.26" // labeled Hold +#define CONTROL_CYCLE_START_PIN "gpio.25" // labeled Start // #define VFD_DEBUG_MODE diff --git a/Grbl_Esp32/src/Machines/3axis_v3.h b/Grbl_Esp32/src/Machines/3axis_v3.h index 7ed13584..631568c0 100644 --- a/Grbl_Esp32/src/Machines/3axis_v3.h +++ b/Grbl_Esp32/src/Machines/3axis_v3.h @@ -28,30 +28,30 @@ #define MACHINE_NAME "ESP32_V3.5" -#define X_STEP_PIN GPIO_NUM_12 -#define X_DIRECTION_PIN GPIO_NUM_26 -#define Y_STEP_PIN GPIO_NUM_14 -#define Y_DIRECTION_PIN GPIO_NUM_25 -#define Z_STEP_PIN GPIO_NUM_27 -#define Z_DIRECTION_PIN GPIO_NUM_33 +#define X_STEP_PIN "gpio.12" +#define X_DIRECTION_PIN "gpio.26" +#define Y_STEP_PIN "gpio.14" +#define Y_DIRECTION_PIN "gpio.25" +#define Z_STEP_PIN "gpio.27" +#define Z_DIRECTION_PIN "gpio.33" -#define X_LIMIT_PIN GPIO_NUM_2 // labeled X Limit -#define Y_LIMIT_PIN GPIO_NUM_4 // labeled Y Limit -#define Z_LIMIT_PIN GPIO_NUM_15 // labeled Z Limit +#define X_LIMIT_PIN "gpio.2" // labeled X Limit +#define Y_LIMIT_PIN "gpio.4" // labeled Y Limit +#define Z_LIMIT_PIN "gpio.15" // labeled Z Limit // OK to comment out to use pin for other features -#define STEPPERS_DISABLE_PIN GPIO_NUM_13 +#define STEPPERS_DISABLE_PIN "gpio.13" #define SPINDLE_TYPE SpindleType::PWM -#define SPINDLE_OUTPUT_PIN GPIO_NUM_17 // labeled SpinPWM +#define SPINDLE_OUTPUT_PIN "gpio.17" // labeled SpinPWM -#define SPINDLE_ENABLE_PIN GPIO_NUM_22 // labeled SpinEnbl +#define SPINDLE_ENABLE_PIN "gpio.22" // labeled SpinEnbl -#define COOLANT_MIST_PIN GPIO_NUM_21 // labeled Mist -#define COOLANT_FLOOD_PIN GPIO_NUM_16 // labeled Flood -#define PROBE_PIN GPIO_NUM_32 // labeled Probe +#define COOLANT_MIST_PIN "gpio.21" // labeled Mist +#define COOLANT_FLOOD_PIN "gpio.16" // labeled Flood +#define PROBE_PIN "gpio.32" // labeled Probe -#define CONTROL_SAFETY_DOOR_PIN GPIO_NUM_35 // labeled Door, needs external pullup -#define CONTROL_RESET_PIN GPIO_NUM_34 // labeled Reset, needs external pullup -#define CONTROL_FEED_HOLD_PIN GPIO_NUM_36 // labeled Hold, needs external pullup -#define CONTROL_CYCLE_START_PIN GPIO_NUM_39 // labeled Start, needs external pullup +#define CONTROL_SAFETY_DOOR_PIN "gpio.35" // labeled Door, needs external pullup +#define CONTROL_RESET_PIN "gpio.34" // labeled Reset, needs external pullup +#define CONTROL_FEED_HOLD_PIN "gpio.36" // labeled Hold, needs external pullup +#define CONTROL_CYCLE_START_PIN "gpio.39" // labeled Start, needs external pullup diff --git a/Grbl_Esp32/src/Machines/3axis_v4.h b/Grbl_Esp32/src/Machines/3axis_v4.h index 7b817180..82a9f5fd 100644 --- a/Grbl_Esp32/src/Machines/3axis_v4.h +++ b/Grbl_Esp32/src/Machines/3axis_v4.h @@ -28,34 +28,34 @@ #define MACHINE_NAME "ESP32_V4" -#define X_STEP_PIN GPIO_NUM_12 -#define X_DIRECTION_PIN GPIO_NUM_14 -#define Y_STEP_PIN GPIO_NUM_26 -#define Y_DIRECTION_PIN GPIO_NUM_15 -#define Z_STEP_PIN GPIO_NUM_27 -#define Z_DIRECTION_PIN GPIO_NUM_33 +#define X_STEP_PIN "gpio.12" +#define X_DIRECTION_PIN "gpio.14" +#define Y_STEP_PIN "gpio.26" +#define Y_DIRECTION_PIN "gpio.15" +#define Z_STEP_PIN "gpio.27" +#define Z_DIRECTION_PIN "gpio.33" -#define X_LIMIT_PIN GPIO_NUM_17 -#define Y_LIMIT_PIN GPIO_NUM_4 -#define Z_LIMIT_PIN GPIO_NUM_16 +#define X_LIMIT_PIN "gpio.17" +#define Y_LIMIT_PIN "gpio.4" +#define Z_LIMIT_PIN "gpio.16" // OK to comment out to use pin for other features -#define STEPPERS_DISABLE_PIN GPIO_NUM_13 +#define STEPPERS_DISABLE_PIN "gpio.13" #define SPINDLE_TYPE SpindleType::PWM -#define SPINDLE_OUTPUT_PIN GPIO_NUM_2 // labeled SpinPWM -#define SPINDLE_ENABLE_PIN GPIO_NUM_22 // labeled SpinEnbl +#define SPINDLE_OUTPUT_PIN "gpio.2" // labeled SpinPWM +#define SPINDLE_ENABLE_PIN "gpio.22" // labeled SpinEnbl -#define COOLANT_MIST_PIN GPIO_NUM_21 // labeled Mist -#define COOLANT_FLOOD_PIN GPIO_NUM_25 // labeled Flood -#define PROBE_PIN GPIO_NUM_32 // labeled Probe +#define COOLANT_MIST_PIN "gpio.21" // labeled Mist +#define COOLANT_FLOOD_PIN "gpio.25" // labeled Flood +#define PROBE_PIN "gpio.32" // labeled Probe /* -#define CONTROL_SAFETY_DOOR_PIN GPIO_NUM_35 // labeled Door, needs external pullup -#define CONTROL_RESET_PIN GPIO_NUM_34 // labeled Reset, needs external pullup -#define CONTROL_FEED_HOLD_PIN GPIO_NUM_36 // labeled Hold, needs external pullup -#define CONTROL_CYCLE_START_PIN GPIO_NUM_39 // labeled Start, needs external pullup +#define CONTROL_SAFETY_DOOR_PIN "gpio.35" // labeled Door, needs external pullup +#define CONTROL_RESET_PIN "gpio.34" // labeled Reset, needs external pullup +#define CONTROL_FEED_HOLD_PIN "gpio.36" // labeled Hold, needs external pullup +#define CONTROL_CYCLE_START_PIN "gpio.39" // labeled Start, needs external pullup */ diff --git a/Grbl_Esp32/src/Machines/3axis_xyx.h b/Grbl_Esp32/src/Machines/3axis_xyx.h index f7b9bda9..b028364b 100644 --- a/Grbl_Esp32/src/Machines/3axis_xyx.h +++ b/Grbl_Esp32/src/Machines/3axis_xyx.h @@ -28,32 +28,32 @@ */ #define MACHINE_NAME "ESP32_V4_XYX" -#define X_STEP_PIN GPIO_NUM_26 /* labeled Y */ -#define X_DIRECTION_PIN GPIO_NUM_15 /* labeled Y */ -#define Y_STEP_PIN GPIO_NUM_12 /* labeled X */ -#define Y_DIRECTION_PIN GPIO_NUM_14 /* labeled X */ -#define Y2_STEP_PIN GPIO_NUM_27 /* labeled Z */ -#define Y2_DIRECTION_PIN GPIO_NUM_33 /* labeled Z */ +#define X_STEP_PIN "gpio.26" /* labeled Y */ +#define X_DIRECTION_PIN "gpio.15" /* labeled Y */ +#define Y_STEP_PIN "gpio.12" /* labeled X */ +#define Y_DIRECTION_PIN "gpio.14" /* labeled X */ +#define Y2_STEP_PIN "gpio.27" /* labeled Z */ +#define Y2_DIRECTION_PIN "gpio.33" /* labeled Z */ #define SPINDLE_TYPE SpindleType::PWM -#define SPINDLE_OUTPUT_PIN GPIO_NUM_2 -#define SPINDLE_ENABLE_PIN GPIO_NUM_22 +#define SPINDLE_OUTPUT_PIN "gpio.2" +#define SPINDLE_ENABLE_PIN "gpio.22" -#define X_LIMIT_PIN GPIO_NUM_17 -#define Y_LIMIT_PIN GPIO_NUM_4 -// #define Z_LIMIT_PIN GPIO_NUM_16 +#define X_LIMIT_PIN "gpio.17" +#define Y_LIMIT_PIN "gpio.4" +// #define Z_LIMIT_PIN "gpio.16" -#define STEPPERS_DISABLE_PIN GPIO_NUM_13 +#define STEPPERS_DISABLE_PIN "gpio.13" -#define COOLANT_MIST_PIN GPIO_NUM_21 -#define COOLANT_FLOOD_PIN GPIO_NUM_25 +#define COOLANT_MIST_PIN "gpio.21" +#define COOLANT_FLOOD_PIN "gpio.25" // see versions for X and Z -#define PROBE_PIN GPIO_NUM_32 +#define PROBE_PIN "gpio.32" -#define CONTROL_SAFETY_DOOR_PIN GPIO_NUM_35 // needs external pullup -#define CONTROL_RESET_PIN GPIO_NUM_34 // needs external pullup -#define CONTROL_FEED_HOLD_PIN GPIO_NUM_36 // needs external pullup -#define CONTROL_CYCLE_START_PIN GPIO_NUM_39 // needs external pullup +#define CONTROL_SAFETY_DOOR_PIN "gpio.35" // needs external pullup +#define CONTROL_RESET_PIN "gpio.34" // needs external pullup +#define CONTROL_FEED_HOLD_PIN "gpio.36" // needs external pullup +#define CONTROL_CYCLE_START_PIN "gpio.39" // needs external pullup diff --git a/Grbl_Esp32/src/Machines/4axis_external_driver.h b/Grbl_Esp32/src/Machines/4axis_external_driver.h index 7ad2713e..31e80e93 100644 --- a/Grbl_Esp32/src/Machines/4axis_external_driver.h +++ b/Grbl_Esp32/src/Machines/4axis_external_driver.h @@ -32,36 +32,36 @@ #endif #define N_AXIS 4 -#define X_STEP_PIN GPIO_NUM_0 -#define X_DIRECTION_PIN GPIO_NUM_2 -#define Y_STEP_PIN GPIO_NUM_26 -#define Y_DIRECTION_PIN GPIO_NUM_15 -#define Z_STEP_PIN GPIO_NUM_27 -#define Z_DIRECTION_PIN GPIO_NUM_33 -#define A_STEP_PIN GPIO_NUM_12 -#define A_DIRECTION_PIN GPIO_NUM_14 -#define STEPPERS_DISABLE_PIN GPIO_NUM_13 +#define X_STEP_PIN "gpio.0" +#define X_DIRECTION_PIN "gpio.2" +#define Y_STEP_PIN "gpio.26" +#define Y_DIRECTION_PIN "gpio.15" +#define Z_STEP_PIN "gpio.27" +#define Z_DIRECTION_PIN "gpio.33" +#define A_STEP_PIN "gpio.12" +#define A_DIRECTION_PIN "gpio.14" +#define STEPPERS_DISABLE_PIN "gpio.13" /* #define SPINDLE_TYPE SpindleType::PWM // only one spindle at a time */ -#define SPINDLE_OUTPUT_PIN GPIO_NUM_25 -#define SPINDLE_ENABLE_PIN GPIO_NUM_22 +#define SPINDLE_OUTPUT_PIN "gpio.25" +#define SPINDLE_ENABLE_PIN "gpio.22" #define SPINDLE_TYPE SpindleType::HUANYANG // only one spindle at a time -#define VFD_RS485_TXD_PIN GPIO_NUM_17 -#define VFD_RS485_RXD_PIN GPIO_NUM_4 -#define VFD_RS485_RTS_PIN GPIO_NUM_16 +#define VFD_RS485_TXD_PIN "gpio.17" +#define VFD_RS485_RXD_PIN "gpio.4" +#define VFD_RS485_RTS_PIN "gpio.16" -#define X_LIMIT_PIN GPIO_NUM_34 -#define Y_LIMIT_PIN GPIO_NUM_35 -#define Z_LIMIT_PIN GPIO_NUM_36 +#define X_LIMIT_PIN "gpio.34" +#define Y_LIMIT_PIN "gpio.35" +#define Z_LIMIT_PIN "gpio.36" #if (N_AXIS != 3) - #define A_LIMIT_PIN GPIO_NUM_39 + #define A_LIMIT_PIN "gpio.39" #endif -#define PROBE_PIN GPIO_NUM_32 -#define COOLANT_MIST_PIN GPIO_NUM_21 +#define PROBE_PIN "gpio.32" +#define COOLANT_MIST_PIN "gpio.21" diff --git a/Grbl_Esp32/src/Machines/6_pack_Lowrider_stepstick_v1.h b/Grbl_Esp32/src/Machines/6_pack_Lowrider_stepstick_v1.h index 9e935607..dc2bbbc8 100644 --- a/Grbl_Esp32/src/Machines/6_pack_Lowrider_stepstick_v1.h +++ b/Grbl_Esp32/src/Machines/6_pack_Lowrider_stepstick_v1.h @@ -35,40 +35,40 @@ #define USE_STEPSTICK // makes sure MS1,2,3 !reset and !sleep are set -#define I2S_OUT_BCK GPIO_NUM_22 -#define I2S_OUT_WS GPIO_NUM_17 -#define I2S_OUT_DATA GPIO_NUM_21 +#define I2S_OUT_BCK "gpio.22" +#define I2S_OUT_WS "gpio.17" +#define I2S_OUT_DATA "gpio.21" -#define X_STEPPER_MS3 I2SO(3) // Labeled X_CS -#define Y_STEPPER_MS3 I2SO(6) // Y_CS -#define Z_STEPPER_MS3 I2SO(11) // Z_CS -#define X2_STEPPER_MS3 I2SO(14) // A_CS -#define Y2_STEPPER_MS3 I2SO(19) // B_CS +#define X_STEPPER_MS3 "i2so.3" // Labeled X_CS +#define Y_STEPPER_MS3 "i2so.6" // Y_CS +#define Z_STEPPER_MS3 "i2so.11" // Z_CS +#define X2_STEPPER_MS3 "i2so.14" // A_CS +#define Y2_STEPPER_MS3 "i2so.19" // B_CS // Motor Socket #1 -#define X_DISABLE_PIN I2SO(0) -#define X_DIRECTION_PIN I2SO(1) -#define X_STEP_PIN I2SO(2) +#define X_DISABLE_PIN "i2so.0" +#define X_DIRECTION_PIN "i2so.1" +#define X_STEP_PIN "i2so.2" // Motor Socket #2 -#define Y_DIRECTION_PIN I2SO(4) -#define Y_STEP_PIN I2SO(5) -#define Y_DISABLE_PIN I2SO(7) +#define Y_DIRECTION_PIN "i2so.4" +#define Y_STEP_PIN "i2so.5" +#define Y_DISABLE_PIN "i2so.7" // Motor Socket #3 -#define Y2_DISABLE_PIN I2SO(8) -#define Y2_DIRECTION_PIN I2SO(9) -#define Y2_STEP_PIN I2SO(10) +#define Y2_DISABLE_PIN "i2so.8" +#define Y2_DIRECTION_PIN "i2so.9" +#define Y2_STEP_PIN "i2so.10" // Motor Socket #4 -#define Z_DIRECTION_PIN I2SO(12) -#define Z_STEP_PIN I2SO(13) -#define Z_DISABLE_PIN I2SO(15) +#define Z_DIRECTION_PIN "i2so.12" +#define Z_STEP_PIN "i2so.13" +#define Z_DISABLE_PIN "i2so.15" // Motor Socket #5 -#define Z2_DISABLE_PIN I2SO(16) -#define Z2_DIRECTION_PIN I2SO(17) -#define Z2_STEP_PIN I2SO(18) +#define Z2_DISABLE_PIN "i2so.16" +#define Z2_DIRECTION_PIN "i2so.17" +#define Z2_STEP_PIN "i2so.18" /* @@ -78,46 +78,46 @@ Click on each module to get example for using the modules in the sockets Socket #1 -#1 GPIO_NUM_33 -#2 GPIO_NUM_32 -#3 GPIO_NUM_35 (input only) -#4 GPIO_NUM_34 (input only) +#1 "gpio.33" +#2 "gpio.32" +#3 "gpio.35" (input only) +#4 "gpio.34" (input only) Socket #2 -#1 GPIO_NUM_2 -#2 GPIO_NUM_25 -#3 GPIO_NUM_39 (input only) -#4 GPIO_NUM_36 (input only) +#1 "gpio.2" +#2 "gpio.25" +#3 "gpio.39" (input only) +#4 "gpio.36" (input only) Socket #3 -#1 GPIO_NUM_26 -#2 GPIO_NUM_4 -#3 GPIO_NUM_16 -#4 GPIO_NUM_27 +#1 "gpio.26" +#2 "gpio.4" +#3 "gpio.16" +#4 "gpio.27" Socket #4 -#1 GPIO_NUM_14 -#2 GPIO_NUM_13 -#3 GPIO_NUM_15 -#4 GPIO_NUM_12 +#1 "gpio.14" +#2 "gpio.13" +#3 "gpio.15" +#4 "gpio.12" Socket #5 -#1 I2SO(24) (output only) -#2 I2SO(25) (output only) -#3 I2SO26) (output only) +#1 "i2so.24" (output only) +#2 "i2so.25" (output only) +#3 "i2so.26" (output only) */ // 4x Input Module in Socket #1 // https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-Switch-Input-module -#define X_LIMIT_PIN GPIO_NUM_33 -#define Y_LIMIT_PIN GPIO_NUM_32 -#define Y2_LIMIT_PIN GPIO_NUM_35 -#define Z_LIMIT_PIN GPIO_NUM_34 +#define X_LIMIT_PIN "gpio.33" +#define Y_LIMIT_PIN "gpio.32" +#define Y2_LIMIT_PIN "gpio.35" +#define Z_LIMIT_PIN "gpio.34" // 4x Input Module in Socket #2 // https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-Switch-Input-module -#define Z2_LIMIT_PIN GPIO_NUM_2 +#define Z2_LIMIT_PIN "gpio.2" // === Default settings diff --git a/Grbl_Esp32/src/Machines/6_pack_MPCNC_stepstick_v1.h b/Grbl_Esp32/src/Machines/6_pack_MPCNC_stepstick_v1.h index 034dade2..80c3aa78 100644 --- a/Grbl_Esp32/src/Machines/6_pack_MPCNC_stepstick_v1.h +++ b/Grbl_Esp32/src/Machines/6_pack_MPCNC_stepstick_v1.h @@ -35,40 +35,40 @@ #define USE_STEPSTICK // makes sure MS1,2,3 !reset and !sleep are set -#define I2S_OUT_BCK GPIO_NUM_22 -#define I2S_OUT_WS GPIO_NUM_17 -#define I2S_OUT_DATA GPIO_NUM_21 +#define I2S_OUT_BCK "gpio.22" +#define I2S_OUT_WS "gpio.17" +#define I2S_OUT_DATA "gpio.21" -#define X_STEPPER_MS3 I2SO(3) // Labeled X_CS -#define Y_STEPPER_MS3 I2SO(6) // Y_CS -#define Z_STEPPER_MS3 I2SO(11) // Z_CS -#define X2_STEPPER_MS3 I2SO(14) // A_CS -#define Y2_STEPPER_MS3 I2SO(19) // B_CS +#define X_STEPPER_MS3 "i2so.3" // Labeled X_CS +#define Y_STEPPER_MS3 "i2so.6" // Y_CS +#define Z_STEPPER_MS3 "i2so.11" // Z_CS +#define X2_STEPPER_MS3 "i2so.14" // A_CS +#define Y2_STEPPER_MS3 "i2so.19" // B_CS // Motor Socket #1 -#define X_DISABLE_PIN I2SO(0) -#define X_DIRECTION_PIN I2SO(1) -#define X_STEP_PIN I2SO(2) +#define X_DISABLE_PIN "i2so.0" +#define X_DIRECTION_PIN "i2so.1" +#define X_STEP_PIN "i2so.2" // Motor Socket #2 -#define Y_DIRECTION_PIN I2SO(4) -#define Y_STEP_PIN I2SO(5) -#define Y_DISABLE_PIN I2SO(7) +#define Y_DIRECTION_PIN "i2so.4" +#define Y_STEP_PIN "i2so.5" +#define Y_DISABLE_PIN "i2so.7" // Motor Socket #3 -#define Z_DISABLE_PIN I2SO(8) -#define Z_DIRECTION_PIN I2SO(9) -#define Z_STEP_PIN I2SO(10) +#define Z_DISABLE_PIN "i2so.8" +#define Z_DIRECTION_PIN "i2so.9" +#define Z_STEP_PIN "i2so.10" // Motor Socket #4 -#define X2_DIRECTION_PIN I2SO(12) -#define X2_STEP_PIN I2SO(13) -#define X2_DISABLE_PIN I2SO(15) +#define X2_DIRECTION_PIN "i2so.12" +#define X2_STEP_PIN "i2so.13" +#define X2_DISABLE_PIN "i2so.15" // Motor Socket #5 -#define Y2_DISABLE_PIN I2SO(16) -#define Y2_DIRECTION_PIN I2SO(17) -#define Y2_STEP_PIN I2SO(18) +#define Y2_DISABLE_PIN "i2so.16" +#define Y2_DIRECTION_PIN "i2so.17" +#define Y2_STEP_PIN "i2so.18" /* @@ -78,46 +78,46 @@ Click on each module to get example for using the modules in the sockets Socket #1 -#1 GPIO_NUM_33 -#2 GPIO_NUM_32 -#3 GPIO_NUM_35 (input only) -#4 GPIO_NUM_34 (input only) +#1 "gpio.33" +#2 "gpio.32" +#3 "gpio.35" (input only) +#4 "gpio.34" (input only) Socket #2 -#1 GPIO_NUM_2 -#2 GPIO_NUM_25 -#3 GPIO_NUM_39 (input only) -#4 GPIO_NUM_36 (input only) +#1 "gpio.2" +#2 "gpio.25" +#3 "gpio.39" (input only) +#4 "gpio.36" (input only) Socket #3 -#1 GPIO_NUM_26 -#2 GPIO_NUM_4 -#3 GPIO_NUM_16 -#4 GPIO_NUM_27 +#1 "gpio.26" +#2 "gpio.4" +#3 "gpio.16" +#4 "gpio.27" Socket #4 -#1 GPIO_NUM_14 -#2 GPIO_NUM_13 -#3 GPIO_NUM_15 -#4 GPIO_NUM_12 +#1 "gpio.14" +#2 "gpio.13" +#3 "gpio.15" +#4 "gpio.12" Socket #5 -#1 I2SO(24) (output only) -#2 I2SO(25) (output only) -#3 I2SO26) (output only) +#1 "i2so.24" (output only) +#2 "i2so.25" (output only) +#3 "i2so.26" (output only) */ // 4x Input Module in Socket #1 // https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-Switch-Input-module -#define X_LIMIT_PIN GPIO_NUM_33 -#define Y_LIMIT_PIN GPIO_NUM_32 -#define Z_LIMIT_PIN GPIO_NUM_35 -#define X2_LIMIT_PIN GPIO_NUM_34 +#define X_LIMIT_PIN "gpio.33" +#define Y_LIMIT_PIN "gpio.32" +#define Z_LIMIT_PIN "gpio.35" +#define X2_LIMIT_PIN "gpio.34" // 4x Input Module in Socket #2 // https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-Switch-Input-module -#define Y2_LIMIT_PIN GPIO_NUM_2 +#define Y2_LIMIT_PIN "gpio.2" // === Default settings diff --git a/Grbl_Esp32/src/Machines/6_pack_stepstick_XYZ_v1.h b/Grbl_Esp32/src/Machines/6_pack_stepstick_XYZ_v1.h index a258d32f..a70b59c8 100644 --- a/Grbl_Esp32/src/Machines/6_pack_stepstick_XYZ_v1.h +++ b/Grbl_Esp32/src/Machines/6_pack_stepstick_XYZ_v1.h @@ -37,28 +37,28 @@ #define USE_STEPSTICK // makes sure MS1,2,3 !reset and !sleep are set -#define I2S_OUT_BCK GPIO_NUM_22 -#define I2S_OUT_WS GPIO_NUM_17 -#define I2S_OUT_DATA GPIO_NUM_21 +#define I2S_OUT_BCK "gpio.22" +#define I2S_OUT_WS "gpio.17" +#define I2S_OUT_DATA "gpio.21" -#define X_STEPPER_MS3 I2SO(3) // X_CS -#define Y_STEPPER_MS3 I2SO(6) // Y_CS -#define Z_STEPPER_MS3 I2SO(11) // Z_CS +#define X_STEPPER_MS3 "i2so.3" // X_CS +#define Y_STEPPER_MS3 "i2so.6" // Y_CS +#define Z_STEPPER_MS3 "i2so.11" // Z_CS // Motor Socket #1 -#define X_DISABLE_PIN I2SO(0) -#define X_DIRECTION_PIN I2SO(1) -#define X_STEP_PIN I2SO(2) +#define X_DISABLE_PIN "i2so.0" +#define X_DIRECTION_PIN "i2so.1" +#define X_STEP_PIN "i2so.2" // Motor Socket #2 -#define Y_DIRECTION_PIN I2SO(4) -#define Y_STEP_PIN I2SO(5) -#define Y_DISABLE_PIN I2SO(7) +#define Y_DIRECTION_PIN "i2so.4" +#define Y_STEP_PIN "i2so.5" +#define Y_DISABLE_PIN "i2so.7" // Motor Socket #3 -#define Z_DISABLE_PIN I2SO(8) -#define Z_DIRECTION_PIN I2SO(9) -#define Z_STEP_PIN I2SO(10) +#define Z_DISABLE_PIN "i2so.8" +#define Z_DIRECTION_PIN "i2so.9" +#define Z_STEP_PIN "i2so.10" /* Socket I/O reference @@ -68,56 +68,56 @@ Socket #1 -#1 GPIO_NUM_33 -#2 GPIO_NUM_32 -#3 GPIO_NUM_35 (input only) -#4 GPIO_NUM_34 (input only) +#1 "gpio.33" +#2 "gpio.32" +#3 "gpio.35" (input only) +#4 "gpio.34" (input only) Socket #2 -#1 GPIO_NUM_2 -#2 GPIO_NUM_25 -#3 GPIO_NUM_39 (input only) -#4 GPIO_NUM_36 (input only) +#1 "gpio.2" +#2 "gpio.25" +#3 "gpio.39" (input only) +#4 "gpio.36" (input only) Socket #3 -#1 GPIO_NUM_26 -#2 GPIO_NUM_4 -#3 GPIO_NUM_16 -#4 GPIO_NUM_27 +#1 "gpio.26" +#2 "gpio.4" +#3 "gpio.16" +#4 "gpio.27" Socket #4 -#1 GPIO_NUM_14 -#2 GPIO_NUM_13 -#3 GPIO_NUM_15 -#4 GPIO_NUM_12 +#1 "gpio.14" +#2 "gpio.13" +#3 "gpio.15" +#4 "gpio.12" Socket #5 -#1 I2SO(24) (output only) -#2 I2SO(25) (output only) -#3 I2SO26) (output only) +#1 "i2so.24" (output only) +#2 "i2so.25" (output only) +#3 "i2so.26" (output only) */ // 4x Input Module in Socket #1 // https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-Switch-Input-module -#define X_LIMIT_PIN GPIO_NUM_33 -#define Y_LIMIT_PIN GPIO_NUM_32 -#define Z_LIMIT_PIN GPIO_NUM_35 +#define X_LIMIT_PIN "gpio.33" +#define Y_LIMIT_PIN "gpio.32" +#define Z_LIMIT_PIN "gpio.35" // // 4x Input Module in Socket #2 // // https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-Switch-Input-module -// #define X_LIMIT_PIN GPIO_NUM_2 -// #define Y_LIMIT_PIN GPIO_NUM_25 -// #define Z_LIMIT_PIN GPIO_NUM_39 +// #define X_LIMIT_PIN "gpio.2" +// #define Y_LIMIT_PIN "gpio.25" +// #define Z_LIMIT_PIN "gpio.39" // // 4x Input Module in Socket #3 // // https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-Switch-Input-module -// #define CONTROL_CYCLE_START_PIN GPIO_NUM_26 -// #define CONTROL_FEED_HOLD_PIN GPIO_NUM_4 -// #define CONTROL_RESET_PIN GPIO_NUM_16 -// #define CONTROL_SAFETY_DOOR_PIN GPIO_NUM_27 +// #define CONTROL_CYCLE_START_PIN "gpio.26" +// #define CONTROL_FEED_HOLD_PIN "gpio.4" +// #define CONTROL_RESET_PIN "gpio.16" +// #define CONTROL_SAFETY_DOOR_PIN "gpio.27" // //#define INVERT_CONTROL_PIN_MASK B0000 // ================= Setting Defaults ========================== diff --git a/Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h b/Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h index caf673be..76b82c99 100644 --- a/Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h +++ b/Grbl_Esp32/src/Machines/6_pack_stepstick_v1.h @@ -35,47 +35,47 @@ #define USE_STEPSTICK // makes sure MS1,2,3 !reset and !sleep are set -#define I2S_OUT_BCK GPIO_NUM_22 -#define I2S_OUT_WS GPIO_NUM_17 -#define I2S_OUT_DATA GPIO_NUM_21 +#define I2S_OUT_BCK "gpio.22" +#define I2S_OUT_WS "gpio.17" +#define I2S_OUT_DATA "gpio.21" -#define X_STEPPER_MS3 I2SO(3) // X_CS -#define Y_STEPPER_MS3 I2SO(6) // Y_CS -#define Z_STEPPER_MS3 I2SO(11) // Z_CS -#define A_STEPPER_MS3 I2SO(14) // A_CS -#define B_STEPPER_MS3 I2SO(19) // B_CS -#define C_STEPPER_MS3 I2SO(22) // C_CS +#define X_STEPPER_MS3 "i2so.3" // X_CS +#define Y_STEPPER_MS3 "i2so.6" // Y_CS +#define Z_STEPPER_MS3 "i2so.11" // Z_CS +#define A_STEPPER_MS3 "i2so.14" // A_CS +#define B_STEPPER_MS3 "i2so.19" // B_CS +#define C_STEPPER_MS3 "i2so.22" // C_CS // Motor Socket #1 -#define X_DISABLE_PIN I2SO(0) -#define X_DIRECTION_PIN I2SO(1) -#define X_STEP_PIN I2SO(2) +#define X_DISABLE_PIN "i2so.0" +#define X_DIRECTION_PIN "i2so.1" +#define X_STEP_PIN "i2so.2" // Motor Socket #2 -#define Y_DIRECTION_PIN I2SO(4) -#define Y_STEP_PIN I2SO(5) -#define Y_DISABLE_PIN I2SO(7) +#define Y_DIRECTION_PIN "i2so.4" +#define Y_STEP_PIN "i2so.5" +#define Y_DISABLE_PIN "i2so.7" // Motor Socket #3 -#define Z_DISABLE_PIN I2SO(8) -#define Z_DIRECTION_PIN I2SO(9) -#define Z_STEP_PIN I2SO(10) +#define Z_DISABLE_PIN "i2so.8" +#define Z_DIRECTION_PIN "i2so.9" +#define Z_STEP_PIN "i2so.10" // Motor Socket #4 -#define A_DIRECTION_PIN I2SO(12) -#define A_STEP_PIN I2SO(13) -#define A_DISABLE_PIN I2SO(15) +#define A_DIRECTION_PIN "i2so.12" +#define A_STEP_PIN "i2so.13" +#define A_DISABLE_PIN "i2so.15" // Motor Socket #5 -#define B_DISABLE_PIN I2SO(16) -#define B_DIRECTION_PIN I2SO(17) -#define B_STEP_PIN I2SO(18) +#define B_DISABLE_PIN "i2so.16" +#define B_DIRECTION_PIN "i2so.17" +#define B_STEP_PIN "i2so.18" // Motor Socket #5 -#define C_DIRECTION_PIN I2SO(20) -#define C_STEP_PIN I2SO(21) -#define C_DISABLE_PIN I2SO(23) +#define C_DIRECTION_PIN "i2so.20" +#define C_STEP_PIN "i2so.21" +#define C_DISABLE_PIN "i2so.23" /* @@ -86,51 +86,51 @@ Socket #1 -#1 GPIO_NUM_33 -#2 GPIO_NUM_32 -#3 GPIO_NUM_35 (input only) -#4 GPIO_NUM_34 (input only) +#1 "gpio.33" +#2 "gpio.32" +#3 "gpio.35" (input only) +#4 "gpio.34" (input only) Socket #2 -#1 GPIO_NUM_2 -#2 GPIO_NUM_25 -#3 GPIO_NUM_39 (input only) -#4 GPIO_NUM_36 (input only) +#1 "gpio.2" +#2 "gpio.25" +#3 "gpio.39" (input only) +#4 "gpio.36" (input only) Socket #3 -#1 GPIO_NUM_26 -#2 GPIO_NUM_4 -#3 GPIO_NUM_16 -#4 GPIO_NUM_27 +#1 "gpio.26" +#2 "gpio.4" +#3 "gpio.16" +#4 "gpio.27" Socket #4 -#1 GPIO_NUM_14 -#2 GPIO_NUM_13 -#3 GPIO_NUM_15 -#4 GPIO_NUM_12 +#1 "gpio.14" +#2 "gpio.13" +#3 "gpio.15" +#4 "gpio.12" Socket #5 -#1 I2SO(24) (output only) -#2 I2SO(25) (output only) -#3 I2SO26) (output only) +#1 "i2so.24" (output only) +#2 "i2so.25" (output only) +#3 "i2so.26" (output only) */ // 4x Input Module in Socket #1 // https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-Switch-Input-module -#define X_LIMIT_PIN GPIO_NUM_33 -#define Y_LIMIT_PIN GPIO_NUM_32 -#define Z_LIMIT_PIN GPIO_NUM_35 -#define PROBE_PIN GPIO_NUM_34 +#define X_LIMIT_PIN "gpio.33" +#define Y_LIMIT_PIN "gpio.32" +#define Z_LIMIT_PIN "gpio.35" +#define PROBE_PIN "gpio.34" // 5V output CNC module in socket #3 // https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-5V-Buffered-Output-Module #define SPINDLE_TYPE SpindleType::PWM -#define SPINDLE_OUTPUT_PIN GPIO_NUM_26 -#define SPINDLE_ENABLE_PIN GPIO_NUM_4 -#define SPINDLE_DIR_PIN GPIO_NUM_16 -#define COOLANT_MIST_PIN GPIO_NUM_27 +#define SPINDLE_OUTPUT_PIN "gpio.26" +#define SPINDLE_ENABLE_PIN "gpio.4" +#define SPINDLE_DIR_PIN "gpio.16" +#define COOLANT_MIST_PIN "gpio.27" // === Default settings #define DEFAULT_STEP_PULSE_MICROSECONDS I2S_OUT_USEC_PER_PULSE diff --git a/Grbl_Esp32/src/Machines/6_pack_trinamic_stallguard.h b/Grbl_Esp32/src/Machines/6_pack_trinamic_stallguard.h index 83518936..920954c7 100644 --- a/Grbl_Esp32/src/Machines/6_pack_trinamic_stallguard.h +++ b/Grbl_Esp32/src/Machines/6_pack_trinamic_stallguard.h @@ -28,59 +28,59 @@ #define USE_I2S_STEPS //#define DEFAULT_STEPPER ST_I2S_STATIC -#define I2S_OUT_BCK GPIO_NUM_22 -#define I2S_OUT_WS GPIO_NUM_17 -#define I2S_OUT_DATA GPIO_NUM_21 +#define I2S_OUT_BCK "gpio.22" +#define I2S_OUT_WS "gpio.17" +#define I2S_OUT_DATA "gpio.21" #define TRINAMIC_RUN_MODE Motors::TrinamicMode::CoolStep #define TRINAMIC_HOMING_MODE Motors::TrinamicMode::StallGuard // Motor Socket #1 #define X_TRINAMIC_DRIVER 2130 -#define X_DISABLE_PIN I2SO(0) -#define X_DIRECTION_PIN I2SO(1) -#define X_STEP_PIN I2SO(2) -#define X_CS_PIN I2SO(3) +#define X_DISABLE_PIN "i2so.0" +#define X_DIRECTION_PIN "i2so.1" +#define X_STEP_PIN "i2so.2" +#define X_CS_PIN "i2so.3" #define X_RSENSE TMC2130_RSENSE_DEFAULT // Motor Socket #2 #define Y_TRINAMIC_DRIVER X_TRINAMIC_DRIVER -#define Y_DIRECTION_PIN I2SO(4) -#define Y_STEP_PIN I2SO(5) -#define Y_DISABLE_PIN I2SO(7) -#define Y_CS_PIN I2SO(6) +#define Y_DIRECTION_PIN "i2so.4" +#define Y_STEP_PIN "i2so.5" +#define Y_DISABLE_PIN "i2so.7" +#define Y_CS_PIN "i2so.6" #define Y_RSENSE X_RSENSE // Motor Socket #3 #define Z_TRINAMIC_DRIVER X_TRINAMIC_DRIVER -#define Z_DISABLE_PIN I2SO(8) -#define Z_DIRECTION_PIN I2SO(9) -#define Z_STEP_PIN I2SO(10) -#define Z_CS_PIN I2SO(11) +#define Z_DISABLE_PIN "i2so.8" +#define Z_DIRECTION_PIN "i2so.9" +#define Z_STEP_PIN "i2so.10" +#define Z_CS_PIN "i2so.11" #define Z_RSENSE X_RSENSE // Motor Socket #4 #define A_TRINAMIC_DRIVER X_TRINAMIC_DRIVER -#define A_DIRECTION_PIN I2SO(12) -#define A_STEP_PIN I2SO(13) -#define A_DISABLE_PIN I2SO(15) -#define A_CS_PIN I2SO(14) +#define A_DIRECTION_PIN "i2so.12" +#define A_STEP_PIN "i2so.13" +#define A_DISABLE_PIN "i2so.15" +#define A_CS_PIN "i2so.14" #define A_RSENSE X_RSENSE // Motor Socket #5 #define B_TRINAMIC_DRIVER X_TRINAMIC_DRIVER -#define B_DISABLE_PIN I2SO(16) -#define B_DIRECTION_PIN I2SO(17) -#define B_STEP_PIN I2SO(18) -#define B_CS_PIN I2SO(19) +#define B_DISABLE_PIN "i2so.16" +#define B_DIRECTION_PIN "i2so.17" +#define B_STEP_PIN "i2so.18" +#define B_CS_PIN "i2so.19" #define B_RSENSE X_RSENSE // Motor Socket #6 #define C_TRINAMIC_DRIVER X_TRINAMIC_DRIVER -#define C_DIRECTION_PIN I2SO(20) -#define C_STEP_PIN I2SO(21) -#define C_DISABLE_PIN I2SO(23) -#define C_CS_PIN I2SO(22) +#define C_DIRECTION_PIN "i2so.20" +#define C_STEP_PIN "i2so.21" +#define C_DISABLE_PIN "i2so.23" +#define C_CS_PIN "i2so.22" #define C_RSENSE X_RSENSE /* @@ -90,55 +90,55 @@ Click on each module to get example for using the modules in the sockets Socket #1 -#1 GPIO_NUM_33 (Sg1) -#2 GPIO_NUM_32 (Sg2) -#3 GPIO_NUM_35 (Sg3) (input only) -#4 GPIO_NUM_34 (Sg4) (input only) +#1 "gpio.33" (Sg1) +#2 "gpio.32" (Sg2) +#3 "gpio.35" (Sg3) (input only) +#4 "gpio.34" (Sg4) (input only) Socket #2 -#1 GPIO_NUM_2 -#2 GPIO_NUM_25 -#3 GPIO_NUM_39 (Sg5) (input only) -#4 GPIO_NUM_36 (Sg6) (input only) +#1 "gpio.2" +#2 "gpio.25" +#3 "gpio.39" (Sg5) (input only) +#4 "gpio.36" (Sg6) (input only) Socket #3 -#1 GPIO_NUM_26 -#2 GPIO_NUM_4 -#3 GPIO_NUM_16 -#4 GPIO_NUM_27 +#1 "gpio.26" +#2 "gpio.4" +#3 "gpio.16" +#4 "gpio.27" Socket #4 -#1 GPIO_NUM_14 -#2 GPIO_NUM_13 -#3 GPIO_NUM_15 -#4 GPIO_NUM_12 +#1 "gpio.14" +#2 "gpio.13" +#3 "gpio.15" +#4 "gpio.12" Socket #5 -#1 I2SO(24) (output only) -#2 I2SO(25) (output only) -#3 I2SO26) (output only) +#1 "i2so.24" (output only) +#2 "i2so.25" (output only) +#3 "i2so.26" (output only) */ // Socket #1 (Empty) // Install StallGuard Jumpers -#define X_LIMIT_PIN GPIO_NUM_33 // Sg1 -#define Y_LIMIT_PIN GPIO_NUM_32 // Sg2 -#define Z_LIMIT_PIN GPIO_NUM_35 // Sg3 -#define A_LIMIT_PIN GPIO_NUM_34 // Sg4 +#define X_LIMIT_PIN "gpio.33" // Sg1 +#define Y_LIMIT_PIN "gpio.32" // Sg2 +#define Z_LIMIT_PIN "gpio.35" // Sg3 +#define A_LIMIT_PIN "gpio.34" // Sg4 // Socket #2 (Empty) // Install StallGuard Jumpers -#define B_LIMIT_PIN GPIO_NUM_39 // Sg5 -#define C_LIMIT_PIN GPIO_NUM_36 // Sg6 +#define B_LIMIT_PIN "gpio.39" // Sg5 +#define C_LIMIT_PIN "gpio.36" // Sg6 // 0-10v CNC Module in Socket #3 // https://github.com/bdring/6-Pack_CNC_Controller/wiki/0-10V-Output-Module #define SPINDLE_TYPE SpindleType::PWM -#define SPINDLE_OUTPUT_PIN GPIO_NUM_26 -#define SPINDLE_ENABLE_PIN GPIO_NUM_4 -#define SPINDLE_DIR_PIN GPIO_NUM_16 +#define SPINDLE_OUTPUT_PIN "gpio.26" +#define SPINDLE_ENABLE_PIN "gpio.4" +#define SPINDLE_DIR_PIN "gpio.16" // === Default settings #define DEFAULT_STEP_PULSE_MICROSECONDS I2S_OUT_USEC_PER_PULSE diff --git a/Grbl_Esp32/src/Machines/atari_1020.h b/Grbl_Esp32/src/Machines/atari_1020.h index eecc2146..8846b691 100644 --- a/Grbl_Esp32/src/Machines/atari_1020.h +++ b/Grbl_Esp32/src/Machines/atari_1020.h @@ -40,24 +40,24 @@ #endif #define X_UNIPOLAR -#define X_PIN_PHASE_0 GPIO_NUM_13 -#define X_PIN_PHASE_1 GPIO_NUM_21 -#define X_PIN_PHASE_2 GPIO_NUM_16 -#define X_PIN_PHASE_3 GPIO_NUM_22 +#define X_PIN_PHASE_0 "gpio.13" +#define X_PIN_PHASE_1 "gpio.21" +#define X_PIN_PHASE_2 "gpio.16" +#define X_PIN_PHASE_3 "gpio.22" #define Y_UNIPOLAR -#define Y_PIN_PHASE_0 GPIO_NUM_25 -#define Y_PIN_PHASE_1 GPIO_NUM_27 -#define Y_PIN_PHASE_2 GPIO_NUM_26 -#define Y_PIN_PHASE_3 GPIO_NUM_32 +#define Y_PIN_PHASE_0 "gpio.25" +#define Y_PIN_PHASE_1 "gpio.27" +#define Y_PIN_PHASE_2 "gpio.26" +#define Y_PIN_PHASE_3 "gpio.32" -#define SOLENOID_DIRECTION_PIN GPIO_NUM_4 -#define SOLENOID_PEN_PIN GPIO_NUM_2 +#define SOLENOID_DIRECTION_PIN "gpio.4" +#define SOLENOID_PEN_PIN "gpio.2" // this 'bot only homes the X axis // Set $Homing/Cycle0=0 -#define REED_SW_PIN GPIO_NUM_17 +#define REED_SW_PIN "gpio.17" #ifndef ENABLE_CONTROL_SW_DEBOUNCE #define ENABLE_CONTROL_SW_DEBOUNCE @@ -68,9 +68,9 @@ #endif #define INVERT_CONTROL_PIN_MASK B01110000 -#define MACRO_BUTTON_0_PIN GPIO_NUM_34 // Pen Switch -#define MACRO_BUTTON_1_PIN GPIO_NUM_35 // Color Switch -#define MACRO_BUTTON_2_PIN GPIO_NUM_36 // Paper Switch +#define MACRO_BUTTON_0_PIN "gpio.34" // Pen Switch +#define MACRO_BUTTON_1_PIN "gpio.35" // Color Switch +#define MACRO_BUTTON_2_PIN "gpio.36" // Paper Switch #ifdef DEFAULTS_GENERIC #undef DEFAULTS_GENERIC // undefine generic then define each default below diff --git a/Grbl_Esp32/src/Machines/espduino.h b/Grbl_Esp32/src/Machines/espduino.h index 7bc6b8a4..14ae5491 100644 --- a/Grbl_Esp32/src/Machines/espduino.h +++ b/Grbl_Esp32/src/Machines/espduino.h @@ -30,32 +30,32 @@ #define MACHINE_NAME "ESPDUINO_32" -#define X_STEP_PIN GPIO_NUM_26 -#define X_DIRECTION_PIN GPIO_NUM_16 +#define X_STEP_PIN "gpio.26" +#define X_DIRECTION_PIN "gpio.16" -#define Y_STEP_PIN GPIO_NUM_25 -#define Y_DIRECTION_PIN GPIO_NUM_27 +#define Y_STEP_PIN "gpio.25" +#define Y_DIRECTION_PIN "gpio.27" -#define Z_STEP_PIN GPIO_NUM_17 -#define Z_DIRECTION_PIN GPIO_NUM_14 +#define Z_STEP_PIN "gpio.17" +#define Z_DIRECTION_PIN "gpio.14" // OK to comment out to use pin for other features -#define STEPPERS_DISABLE_PIN GPIO_NUM_12 +#define STEPPERS_DISABLE_PIN "gpio.12" #define SPINDLE_TYPE SpindleType::PWM -#define SPINDLE_OUTPUT_PIN GPIO_NUM_19 +#define SPINDLE_OUTPUT_PIN "gpio.19" -#define SPINDLE_DIR_PIN GPIO_NUM_18 +#define SPINDLE_DIR_PIN "gpio.18" -#define COOLANT_FLOOD_PIN GPIO_NUM_34 -#define COOLANT_MIST_PIN GPIO_NUM_36 +#define COOLANT_FLOOD_PIN "gpio.34" +#define COOLANT_MIST_PIN "gpio.36" -#define X_LIMIT_PIN GPIO_NUM_13 -#define Y_LIMIT_PIN GPIO_NUM_5 -#define Z_LIMIT_PIN GPIO_NUM_19 +#define X_LIMIT_PIN "gpio.13" +#define Y_LIMIT_PIN "gpio.5" +#define Z_LIMIT_PIN "gpio.19" -#define PROBE_PIN GPIO_NUM_39 +#define PROBE_PIN "gpio.39" -#define CONTROL_RESET_PIN GPIO_NUM_2 -#define CONTROL_FEED_HOLD_PIN GPIO_NUM_4 -#define CONTROL_CYCLE_START_PIN GPIO_NUM_35 // ESP32 needs external pullup +#define CONTROL_RESET_PIN "gpio.2" +#define CONTROL_FEED_HOLD_PIN "gpio.4" +#define CONTROL_CYCLE_START_PIN "gpio.35" // ESP32 needs external pullup diff --git a/Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h b/Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h index cc30f6ed..9cdb982d 100644 --- a/Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h +++ b/Grbl_Esp32/src/Machines/i2s_out_xxyyzz.h @@ -40,63 +40,63 @@ #define USE_STEPSTICK // makes sure MS1,2,3 !reset and !sleep are set -#define I2S_OUT_BCK GPIO_NUM_22 -#define I2S_OUT_WS GPIO_NUM_17 -#define I2S_OUT_DATA GPIO_NUM_21 +#define I2S_OUT_BCK "gpio.22" +#define I2S_OUT_WS "gpio.17" +#define I2S_OUT_DATA "gpio.21" -#define STEPPER_MS1 GPIO_NUM_23 // MOSI -#define STEPPER_MS2 GPIO_NUM_18 // SCK +#define STEPPER_MS1 "gpio.23" // MOSI +#define STEPPER_MS2 "gpio.18" // SCK -#define STEPPER_X_MS3 I2SO(3) // X_CS -#define STEPPER_Y_MS3 I2SO(6) // Y_CS -#define STEPPER_Z_MS3 I2SO(11) // Z_CS -#define STEPPER_A_MS3 I2SO(14) // A_CS -#define STEPPER_B_MS3 I2SO(19) // B_CS -#define STEPPER_C_MS3 I2SO(22) // C_CS +#define STEPPER_X_MS3 "i2so.3" // X_CS +#define STEPPER_Y_MS3 "i2so.6" // Y_CS +#define STEPPER_Z_MS3 "i2so.11" // Z_CS +#define STEPPER_A_MS3 "i2so.14" // A_CS +#define STEPPER_B_MS3 "i2so.19" // B_CS +#define STEPPER_C_MS3 "i2so.22" // C_CS -#define STEPPER_RESET GPIO_NUM_19 +#define STEPPER_RESET "gpio.19" -#define X_DISABLE_PIN I2SO(0) -#define X_DIRECTION_PIN I2SO(1) -#define X_STEP_PIN I2SO(2) +#define X_DISABLE_PIN "i2so.0" +#define X_DIRECTION_PIN "i2so.1" +#define X_STEP_PIN "i2so.2" -#define X2_DIRECTION_PIN I2SO(4) -#define X2_STEP_PIN I2SO(5) -#define X2_DISABLE_PIN I2SO(7) +#define X2_DIRECTION_PIN "i2so.4" +#define X2_STEP_PIN "i2so.5" +#define X2_DISABLE_PIN "i2so.7" -#define Y_DISABLE_PIN I2SO(8) -#define Y_DIRECTION_PIN I2SO(9) -#define Y_STEP_PIN I2SO(10) +#define Y_DISABLE_PIN "i2so.8" +#define Y_DIRECTION_PIN "i2so.9" +#define Y_STEP_PIN "i2so.10" -#define Y2_DIRECTION_PIN I2SO(12) -#define Y2_STEP_PIN I2SO(13) -#define Y2_DISABLE_PIN I2SO(15) +#define Y2_DIRECTION_PIN "i2so.12" +#define Y2_STEP_PIN "i2so.13" +#define Y2_DISABLE_PIN "i2so.15" -#define Z_DISABLE_PIN I2SO(16) -#define Z_DIRECTION_PIN I2SO(17) -#define Z_STEP_PIN I2SO(18) +#define Z_DISABLE_PIN "i2so.16" +#define Z_DIRECTION_PIN "i2so.17" +#define Z_STEP_PIN "i2so.18" -#define Z2_DIRECTION_PIN I2SO(20) -#define Z2_STEP_PIN I2SO(21) -#define Z2_DISABLE_PIN I2SO(23) +#define Z2_DIRECTION_PIN "i2so.20" +#define Z2_STEP_PIN "i2so.21" +#define Z2_DISABLE_PIN "i2so.23" #define SPINDLE_TYPE SpindleType::PWM // only one spindle at a time -#define SPINDLE_OUTPUT_PIN GPIO_NUM_26 -#define SPINDLE_ENABLE_PIN GPIO_NUM_4 -#define SPINDLE_DIR_PIN GPIO_NUM_16 +#define SPINDLE_OUTPUT_PIN "gpio.26" +#define SPINDLE_ENABLE_PIN "gpio.4" +#define SPINDLE_DIR_PIN "gpio.16" -#define X_LIMIT_PIN GPIO_NUM_36 -#define Y_LIMIT_PIN GPIO_NUM_39 -#define Z_LIMIT_PIN GPIO_NUM_34 -//#define A_LIMIT_PIN GPIO_NUM_35 -//#define B_LIMIT_PIN GPIO_NUM_32 -//#define C_LIMIT_PIN GPIO_NUM_33 +#define X_LIMIT_PIN "gpio.36" +#define Y_LIMIT_PIN "gpio.39" +#define Z_LIMIT_PIN "gpio.34" +//#define A_LIMIT_PIN "gpio.35" +//#define B_LIMIT_PIN "gpio.32" +//#define C_LIMIT_PIN "gpio.33" -#define PROBE_PIN GPIO_NUM_25 +#define PROBE_PIN "gpio.25" -#define COOLANT_MIST_PIN GPIO_NUM_2 +#define COOLANT_MIST_PIN "gpio.2" // === Default settings #define DEFAULT_STEP_PULSE_MICROSECONDS I2S_OUT_USEC_PER_PULSE diff --git a/Grbl_Esp32/src/Machines/i2s_out_xyzabc.h b/Grbl_Esp32/src/Machines/i2s_out_xyzabc.h index 37872267..867f5e1e 100644 --- a/Grbl_Esp32/src/Machines/i2s_out_xyzabc.h +++ b/Grbl_Esp32/src/Machines/i2s_out_xyzabc.h @@ -39,65 +39,65 @@ #define USE_STEPSTICK // makes sure MS1,2,3 !reset and !sleep are set -#define I2S_OUT_BCK GPIO_NUM_22 -#define I2S_OUT_WS GPIO_NUM_17 -#define I2S_OUT_DATA GPIO_NUM_21 +#define I2S_OUT_BCK "gpio.22" +#define I2S_OUT_WS "gpio.17" +#define I2S_OUT_DATA "gpio.21" -#define STEPPER_MS1 GPIO_NUM_23 // MOSI -#define STEPPER_MS2 GPIO_NUM_18 // SCK +#define STEPPER_MS1 "gpio.23" // MOSI +#define STEPPER_MS2 "gpio.18" // SCK -#define STEPPER_X_MS3 I2SO(3) // X_CS -#define STEPPER_Y_MS3 I2SO(6) // Y_CS -#define STEPPER_Z_MS3 I2SO(11) // Z_CS -#define STEPPER_A_MS3 I2SO(14) // A_CS -#define STEPPER_B_MS3 I2SO(19) // B_CS -#define STEPPER_C_MS3 I2SO(22) // C_CS +#define STEPPER_X_MS3 "i2so.3" // X_CS +#define STEPPER_Y_MS3 "i2so.6" // Y_CS +#define STEPPER_Z_MS3 "i2so.11" // Z_CS +#define STEPPER_A_MS3 "i2so.14" // A_CS +#define STEPPER_B_MS3 "i2so.19" // B_CS +#define STEPPER_C_MS3 "i2so.22" // C_CS -#define STEPPER_RESET GPIO_NUM_19 +#define STEPPER_RESET "gpio.19" -#define X_DISABLE_PIN I2SO(0) -#define X_DIRECTION_PIN I2SO(1) -#define X_STEP_PIN I2SO(2) +#define X_DISABLE_PIN "i2so.0" +#define X_DIRECTION_PIN "i2so.1" +#define X_STEP_PIN "i2so.2" -#define Y_DIRECTION_PIN I2SO(4) -#define Y_STEP_PIN I2SO(5) -#define Y_DISABLE_PIN I2SO(7) +#define Y_DIRECTION_PIN "i2so.4" +#define Y_STEP_PIN "i2so.5" +#define Y_DISABLE_PIN "i2so.7" -#define Z_DISABLE_PIN I2SO(8) -#define Z_DIRECTION_PIN I2SO(9) -#define Z_STEP_PIN I2SO(10) +#define Z_DISABLE_PIN "i2so.8" +#define Z_DIRECTION_PIN "i2so.9" +#define Z_STEP_PIN "i2so.10" -#define A_DIRECTION_PIN I2SO(12) -#define A_STEP_PIN I2SO(13) -#define A_DISABLE_PIN I2SO(15) +#define A_DIRECTION_PIN "i2so.12" +#define A_STEP_PIN "i2so.13" +#define A_DISABLE_PIN "i2so.15" -#define B_DISABLE_PIN I2SO(16) -#define B_DIRECTION_PIN I2SO(17) -#define B_STEP_PIN I2SO(18) -//#define B_CS_PIN I2SO(19) +#define B_DISABLE_PIN "i2so.16" +#define B_DIRECTION_PIN "i2so.17" +#define B_STEP_PIN "i2so.18" +//#define B_CS_PIN "i2so.19" -#define C_DIRECTION_PIN I2SO(20) -#define C_STEP_PIN I2SO(21) -//#define C_CS_PIN I2SO(22) -#define C_DISABLE_PIN I2SO(23) +#define C_DIRECTION_PIN "i2so.20" +#define C_STEP_PIN "i2so.21" +//#define C_CS_PIN "i2so.22" +#define C_DISABLE_PIN "i2so.23" #define SPINDLE_TYPE SpindleType::PWM // only one spindle at a time -#define SPINDLE_OUTPUT_PIN GPIO_NUM_26 -#define SPINDLE_ENABLE_PIN GPIO_NUM_4 -#define SPINDLE_DIR_PIN GPIO_NUM_16 +#define SPINDLE_OUTPUT_PIN "gpio.26" +#define SPINDLE_ENABLE_PIN "gpio.4" +#define SPINDLE_DIR_PIN "gpio.16" -#define X_LIMIT_PIN GPIO_NUM_36 -#define Y_LIMIT_PIN GPIO_NUM_39 -#define Z_LIMIT_PIN GPIO_NUM_34 -#define A_LIMIT_PIN GPIO_NUM_35 -#define B_LIMIT_PIN GPIO_NUM_32 -#define C_LIMIT_PIN GPIO_NUM_33 +#define X_LIMIT_PIN "gpio.36" +#define Y_LIMIT_PIN "gpio.39" +#define Z_LIMIT_PIN "gpio.34" +#define A_LIMIT_PIN "gpio.35" +#define B_LIMIT_PIN "gpio.32" +#define C_LIMIT_PIN "gpio.33" -#define PROBE_PIN GPIO_NUM_25 +#define PROBE_PIN "gpio.25" -#define COOLANT_MIST_PIN GPIO_NUM_2 +#define COOLANT_MIST_PIN "gpio.2" diff --git a/Grbl_Esp32/src/Machines/i2s_out_xyzabc_trinamic.h b/Grbl_Esp32/src/Machines/i2s_out_xyzabc_trinamic.h index 3d5cffb7..0da63d73 100644 --- a/Grbl_Esp32/src/Machines/i2s_out_xyzabc_trinamic.h +++ b/Grbl_Esp32/src/Machines/i2s_out_xyzabc_trinamic.h @@ -33,74 +33,74 @@ #define USE_I2S_STEPS //#define DEFAULT_STEPPER ST_I2S_STATIC -#define I2S_OUT_BCK GPIO_NUM_22 -#define I2S_OUT_WS GPIO_NUM_17 -#define I2S_OUT_DATA GPIO_NUM_21 +#define I2S_OUT_BCK "gpio.22" +#define I2S_OUT_WS "gpio.17" +#define I2S_OUT_DATA "gpio.21" #define TRINAMIC_RUN_MODE TrinamicMode :: CoolStep #define TRINAMIC_HOMING_MODE TrinamicMode :: CoolStep #define X_TRINAMIC_DRIVER 2130 -#define X_DISABLE_PIN I2SO(0) -#define X_DIRECTION_PIN I2SO(1) -#define X_STEP_PIN I2SO(2) -#define X_CS_PIN I2SO(3) +#define X_DISABLE_PIN "i2so.0" +#define X_DIRECTION_PIN "i2so.1" +#define X_STEP_PIN "i2so.2" +#define X_CS_PIN "i2so.3" #define X_RSENSE TMC2130_RSENSE_DEFAULT #define Y_TRINAMIC_DRIVER 2130 -#define Y_DIRECTION_PIN I2SO(4) -#define Y_STEP_PIN I2SO(5) -#define Y_DISABLE_PIN I2SO(7) -#define Y_CS_PIN I2SO(6) +#define Y_DIRECTION_PIN "i2so.4" +#define Y_STEP_PIN "i2so.5" +#define Y_DISABLE_PIN "i2so.7" +#define Y_CS_PIN "i2so.6" #define Y_RSENSE X_RSENSE #define Z_TRINAMIC_DRIVER 2130 -#define Z_DISABLE_PIN I2SO(8) -#define Z_DIRECTION_PIN I2SO(9) -#define Z_STEP_PIN I2SO(10) -#define Z_CS_PIN I2SO(11) +#define Z_DISABLE_PIN "i2so.8" +#define Z_DIRECTION_PIN "i2so.9" +#define Z_STEP_PIN "i2so.10" +#define Z_CS_PIN "i2so.11" #define Z_RSENSE X_RSENSE #define A_TRINAMIC_DRIVER 2130 -#define A_DIRECTION_PIN I2SO(12) -#define A_STEP_PIN I2SO(13) -#define A_DISABLE_PIN I2SO(15) -#define A_CS_PIN I2SO(14) +#define A_DIRECTION_PIN "i2so.12" +#define A_STEP_PIN "i2so.13" +#define A_DISABLE_PIN "i2so.15" +#define A_CS_PIN "i2so.14" #define A_RSENSE X_RSENSE #define B_TRINAMIC_DRIVER 2130 -#define B_DISABLE_PIN I2SO(16) -#define B_DIRECTION_PIN I2SO(17) -#define B_STEP_PIN I2SO(18) -#define B_CS_PIN I2SO(19) +#define B_DISABLE_PIN "i2so.16" +#define B_DIRECTION_PIN "i2so.17" +#define B_STEP_PIN "i2so.18" +#define B_CS_PIN "i2so.19" #define B_RSENSE X_RSENSE #define C_TRINAMIC_DRIVER 2130 -#define C_DIRECTION_PIN I2SO(20) -#define C_STEP_PIN I2SO(21) -#define C_DISABLE_PIN I2SO(23) -#define C_CS_PIN I2SO(22) +#define C_DIRECTION_PIN "i2so.20" +#define C_STEP_PIN "i2so.21" +#define C_DISABLE_PIN "i2so.23" +#define C_CS_PIN "i2so.22" #define C_RSENSE X_RSENSE /* #define SPINDLE_TYPE SpindleType::PWM // only one spindle at a time -#define SPINDLE_OUTPUT_PIN GPIO_NUM_26 -#define SPINDLE_ENABLE_PIN GPIO_NUM_4 -#define SPINDLE_DIR_PIN GPIO_NUM_16 +#define SPINDLE_OUTPUT_PIN "gpio.26" +#define SPINDLE_ENABLE_PIN "gpio.4" +#define SPINDLE_DIR_PIN "gpio.16" */ -#define X_LIMIT_PIN GPIO_NUM_33 -#define Y_LIMIT_PIN GPIO_NUM_32 -#define Z_LIMIT_PIN GPIO_NUM_35 -#define A_LIMIT_PIN GPIO_NUM_34 -#define B_LIMIT_PIN GPIO_NUM_39 -#define C_LIMIT_PIN GPIO_NUM_36 +#define X_LIMIT_PIN "gpio.33" +#define Y_LIMIT_PIN "gpio.32" +#define Z_LIMIT_PIN "gpio.35" +#define A_LIMIT_PIN "gpio.34" +#define B_LIMIT_PIN "gpio.39" +#define C_LIMIT_PIN "gpio.36" #define SPINDLE_TYPE SpindleType::RELAY -#define SPINDLE_OUTPUT_PIN GPIO_NUM_26 +#define SPINDLE_OUTPUT_PIN "gpio.26" -#define PROBE_PIN GPIO_NUM_25 +#define PROBE_PIN "gpio.25" -#define COOLANT_MIST_PIN GPIO_NUM_2 +#define COOLANT_MIST_PIN "gpio.2" // === Default settings #define DEFAULT_STEP_PULSE_MICROSECONDS I2S_OUT_USEC_PER_PULSE diff --git a/Grbl_Esp32/src/Machines/lowrider_v1p2.h b/Grbl_Esp32/src/Machines/lowrider_v1p2.h index 4a64cd57..d505f83b 100644 --- a/Grbl_Esp32/src/Machines/lowrider_v1p2.h +++ b/Grbl_Esp32/src/Machines/lowrider_v1p2.h @@ -26,53 +26,53 @@ #define DEFAULT_HOMING_SQUARED_AXES (bit(Y_AXIS) | bit(Z_AXIS)) -#define Y_STEP_PIN GPIO_NUM_12 // use Y labeled connector -#define Y_DIRECTION_PIN GPIO_NUM_26 // use Y labeled connector +#define Y_STEP_PIN "gpio.12" // use Y labeled connector +#define Y_DIRECTION_PIN "gpio.26" // use Y labeled connector -#define Y2_STEP_PIN GPIO_NUM_22 // ganged motor +#define Y2_STEP_PIN "gpio.22" // ganged motor #define Y2_DIRECTION_PIN Y_DIRECTION_PIN -#define Z_STEP_PIN GPIO_NUM_14 // use X labeled connector -#define Z_DIRECTION_PIN GPIO_NUM_25 // use X labeled connector +#define Z_STEP_PIN "gpio.14" // use X labeled connector +#define Z_DIRECTION_PIN "gpio.25" // use X labeled connector -#define Z2_STEP_PIN GPIO_NUM_21 // ganged motor +#define Z2_STEP_PIN "gpio.21" // ganged motor #define Z2_DIRECTION_PIN Z_DIRECTION_PIN -#define X_STEP_PIN GPIO_NUM_27 // use Z labeled connector -#define X_DIRECTION_PIN GPIO_NUM_33 // use Z labeled connector +#define X_STEP_PIN "gpio.27" // use Z labeled connector +#define X_DIRECTION_PIN "gpio.33" // use Z labeled connector // OK to comment out to use pin for other features -#define STEPPERS_DISABLE_PIN GPIO_NUM_13 +#define STEPPERS_DISABLE_PIN "gpio.13" -// Note: if you use PWM rather than relay, you could map GPIO_NUM_2 to mist or flood +// Note: if you use PWM rather than relay, you could map "gpio.2" to mist or flood //#define USE_SPINDLE_RELAY #ifdef USE_SPINDLE_RELAY #define SPINDLE_TYPE SpindleType::RELAY - #define SPINDLE_OUTPUT_PIN GPIO_NUM_2 + #define SPINDLE_OUTPUT_PIN "gpio.2" #else #define SPINDLE_TYPE SpindleType::PWM - #define SPINDLE_OUTPUT_PIN GPIO_NUM_16 - #define SPINDLE_ENABLE_PIN GPIO_NUM_32 + #define SPINDLE_OUTPUT_PIN "gpio.16" + #define SPINDLE_ENABLE_PIN "gpio.32" #endif // Note: Only uncomment this if USE_SPINDLE_RELAY is commented out. // Relay can be used for Spindle or Coolant -//#define COOLANT_FLOOD_PIN GPIO_NUM_17 +//#define COOLANT_FLOOD_PIN "gpio.17" -#define X_LIMIT_PIN GPIO_NUM_15 -#define Y_LIMIT_PIN GPIO_NUM_4 -#define Z_LIMIT_PIN GPIO_NUM_17 +#define X_LIMIT_PIN "gpio.15" +#define Y_LIMIT_PIN "gpio.4" +#define Z_LIMIT_PIN "gpio.17" #ifndef ENABLE_SOFTWARE_DEBOUNCE // V1P2 does not have R/C filters #define ENABLE_SOFTWARE_DEBOUNCE #endif -#define PROBE_PIN GPIO_NUM_35 +#define PROBE_PIN "gpio.35" // The default value in config.h is wrong for this controller #ifdef INVERT_CONTROL_PIN_MASK @@ -81,6 +81,6 @@ #define INVERT_CONTROL_PIN_MASK B1110 -#define CONTROL_RESET_PIN GPIO_NUM_34 // needs external pullup -#define CONTROL_FEED_HOLD_PIN GPIO_NUM_36 // needs external pullup -#define CONTROL_CYCLE_START_PIN GPIO_NUM_39 // needs external pullup +#define CONTROL_RESET_PIN "gpio.34" // needs external pullup +#define CONTROL_FEED_HOLD_PIN "gpio.36" // needs external pullup +#define CONTROL_CYCLE_START_PIN "gpio.39" // needs external pullup diff --git a/Grbl_Esp32/src/Machines/midtbot.h b/Grbl_Esp32/src/Machines/midtbot.h index 41e35c2a..ab584d4b 100644 --- a/Grbl_Esp32/src/Machines/midtbot.h +++ b/Grbl_Esp32/src/Machines/midtbot.h @@ -37,18 +37,18 @@ #define SPINDLE_TYPE SpindleType::NONE -#define X_STEP_PIN GPIO_NUM_12 -#define Y_STEP_PIN GPIO_NUM_14 +#define X_STEP_PIN "gpio.12" +#define Y_STEP_PIN "gpio.14" -#define X_DIRECTION_PIN GPIO_NUM_26 -#define Y_DIRECTION_PIN GPIO_NUM_25 +#define X_DIRECTION_PIN "gpio.26" +#define Y_DIRECTION_PIN "gpio.25" -#define STEPPERS_DISABLE_PIN GPIO_NUM_13 +#define STEPPERS_DISABLE_PIN "gpio.13" -#define X_LIMIT_PIN GPIO_NUM_2 -#define Y_LIMIT_PIN GPIO_NUM_4 +#define X_LIMIT_PIN "gpio.2" +#define Y_LIMIT_PIN "gpio.4" -#define Z_SERVO_PIN GPIO_NUM_27 +#define Z_SERVO_PIN "gpio.27" // Set $Homing/Cycle0=Y and $Homing/Cycle1=X diff --git a/Grbl_Esp32/src/Machines/mpcnc_laser_module_v1p2.h b/Grbl_Esp32/src/Machines/mpcnc_laser_module_v1p2.h index f7b02d29..e45c658d 100644 --- a/Grbl_Esp32/src/Machines/mpcnc_laser_module_v1p2.h +++ b/Grbl_Esp32/src/Machines/mpcnc_laser_module_v1p2.h @@ -31,42 +31,42 @@ // The laser module fires without a low signal. This keeps the enable on #define USE_MACHINE_INIT -#define LVL_SHIFT_ENABLE GPIO_NUM_32 +#define LVL_SHIFT_ENABLE "gpio.32" #define CUSTOM_CODE_FILENAME "Custom/mpcnc_laser_module.cpp" #define DEFAULT_HOMING_SQUARED_AXES (bit(X_AXIS) | bit(Y_AXIS)) -#define X_STEP_PIN GPIO_NUM_12 -#define X2_STEP_PIN GPIO_NUM_22 // ganged motor +#define X_STEP_PIN "gpio.12" +#define X2_STEP_PIN "gpio.22" // ganged motor -#define Y_STEP_PIN GPIO_NUM_14 -#define Y2_STEP_PIN GPIO_NUM_21 // ganged motor +#define Y_STEP_PIN "gpio.14" +#define Y2_STEP_PIN "gpio.21" // ganged motor -#define Z_STEP_PIN GPIO_NUM_27 +#define Z_STEP_PIN "gpio.27" -#define X_DIRECTION_PIN GPIO_NUM_26 +#define X_DIRECTION_PIN "gpio.26" #define X2_DIRECTION_PIN X_DIRECTION_PIN -#define Y_DIRECTION_PIN GPIO_NUM_25 +#define Y_DIRECTION_PIN "gpio.25" #define Y2_DIRECTION_PIN Y_DIRECTION_PIN -#define Z_DIRECTION_PIN GPIO_NUM_33 +#define Z_DIRECTION_PIN "gpio.33" // OK to comment out to use pin for other features -#define STEPPERS_DISABLE_PIN GPIO_NUM_13 +#define STEPPERS_DISABLE_PIN "gpio.13" #define SPINDLE_TYPE SpindleType::PWM -#define SPINDLE_OUTPUT_PIN GPIO_NUM_16 +#define SPINDLE_OUTPUT_PIN "gpio.16" -#define COOLANT_MIST_PIN GPIO_NUM_2 +#define COOLANT_MIST_PIN "gpio.2" -#define X_LIMIT_PIN GPIO_NUM_17 -#define Y_LIMIT_PIN GPIO_NUM_4 -#define Z_LIMIT_PIN GPIO_NUM_15 +#define X_LIMIT_PIN "gpio.17" +#define Y_LIMIT_PIN "gpio.4" +#define Z_LIMIT_PIN "gpio.15" #ifndef ENABLE_SOFTWARE_DEBOUNCE // V1P2 does not have R/C filters #define ENABLE_SOFTWARE_DEBOUNCE #endif -#define PROBE_PIN GPIO_NUM_35 +#define PROBE_PIN "gpio.35" // The default value in config.h is wrong for this controller #ifdef INVERT_CONTROL_PIN_MASK @@ -75,9 +75,9 @@ #define INVERT_CONTROL_PIN_MASK B1110 -#define CONTROL_RESET_PIN GPIO_NUM_34 // needs external pullup -#define CONTROL_FEED_HOLD_PIN GPIO_NUM_36 // needs external pullup -#define CONTROL_CYCLE_START_PIN GPIO_NUM_39 // needs external pullup +#define CONTROL_RESET_PIN "gpio.34" // needs external pullup +#define CONTROL_FEED_HOLD_PIN "gpio.36" // needs external pullup +#define CONTROL_CYCLE_START_PIN "gpio.39" // needs external pullup #define DEFAULT_STEP_PULSE_MICROSECONDS 3 #define DEFAULT_STEPPER_IDLE_LOCK_TIME 255 // 255 = Keep steppers on diff --git a/Grbl_Esp32/src/Machines/mpcnc_v1p1.h b/Grbl_Esp32/src/Machines/mpcnc_v1p1.h index 6ed610cd..0e6ab00f 100644 --- a/Grbl_Esp32/src/Machines/mpcnc_v1p1.h +++ b/Grbl_Esp32/src/Machines/mpcnc_v1p1.h @@ -31,47 +31,47 @@ #define DEFAULT_HOMING_SQUARED_AXES (bit(X_AXIS) | bit(Y_AXIS)) -#define X_STEP_PIN GPIO_NUM_12 -#define X2_STEP_PIN GPIO_NUM_22 // ganged motor +#define X_STEP_PIN "gpio.12" +#define X2_STEP_PIN "gpio.22" // ganged motor -#define Y_STEP_PIN GPIO_NUM_14 -#define Y2_STEP_PIN GPIO_NUM_21 // ganged motor +#define Y_STEP_PIN "gpio.14" +#define Y2_STEP_PIN "gpio.21" // ganged motor -#define Z_STEP_PIN GPIO_NUM_27 +#define Z_STEP_PIN "gpio.27" -#define X_DIRECTION_PIN GPIO_NUM_26 +#define X_DIRECTION_PIN "gpio.26" #define X2_DIRECTION_PIN X_DIRECTION_PIN -#define Y_DIRECTION_PIN GPIO_NUM_25 +#define Y_DIRECTION_PIN "gpio.25" #define Y2_DIRECTION_PIN Y_DIRECTION_PIN -#define Z_DIRECTION_PIN GPIO_NUM_33 +#define Z_DIRECTION_PIN "gpio.33" // OK to comment out to use pin for other features -#define STEPPERS_DISABLE_PIN GPIO_NUM_13 +#define STEPPERS_DISABLE_PIN "gpio.13" -// Note: if you use PWM rather than relay, you could map GPIO_NUM_2 to mist or flood +// Note: if you use PWM rather than relay, you could map "gpio.2" to mist or flood //#define USE_SPINDLE_RELAY #ifdef USE_SPINDLE_RELAY #define SPINDLE_TYPE SpindleType::RELAY - #define SPINDLE_OUTPUT_PIN GPIO_NUM_17 + #define SPINDLE_OUTPUT_PIN "gpio.17" #else #define SPINDLE_TYPE SpindleType::PWM - #define SPINDLE_OUTPUT_PIN GPIO_NUM_16 + #define SPINDLE_OUTPUT_PIN "gpio.16" - #define SPINDLE_ENABLE_PIN GPIO_NUM_32 + #define SPINDLE_ENABLE_PIN "gpio.32" #endif // Note: Only uncomment this if USE_SPINDLE_RELAY is commented out. // Relay can be used for spindle or either coolant -//#define COOLANT_FLOOD_PIN GPIO_NUM_2 -//#define COOLANT_MIST_PIN GPIO_NUM_2 +//#define COOLANT_FLOOD_PIN "gpio.2" +//#define COOLANT_MIST_PIN "gpio.2" -#define X_LIMIT_PIN GPIO_NUM_2 -#define Y_LIMIT_PIN GPIO_NUM_4 -#define Z_LIMIT_PIN GPIO_NUM_15 +#define X_LIMIT_PIN "gpio.2" +#define Y_LIMIT_PIN "gpio.4" +#define Z_LIMIT_PIN "gpio.15" -#define PROBE_PIN GPIO_NUM_35 +#define PROBE_PIN "gpio.35" // The default value in config.h is wrong for this controller #ifdef INVERT_CONTROL_PIN_MASK @@ -80,9 +80,9 @@ #define INVERT_CONTROL_PIN_MASK B1110 -#define CONTROL_RESET_PIN GPIO_NUM_34 // needs external pullup -#define CONTROL_FEED_HOLD_PIN GPIO_NUM_36 // needs external pullup -#define CONTROL_CYCLE_START_PIN GPIO_NUM_39 // needs external pullup +#define CONTROL_RESET_PIN "gpio.34" // needs external pullup +#define CONTROL_FEED_HOLD_PIN "gpio.36" // needs external pullup +#define CONTROL_CYCLE_START_PIN "gpio.39" // needs external pullup #define DEFAULT_STEP_PULSE_MICROSECONDS 3 #define DEFAULT_STEPPER_IDLE_LOCK_TIME 255 // 255 = Keep steppers on diff --git a/Grbl_Esp32/src/Machines/mpcnc_v1p2.h b/Grbl_Esp32/src/Machines/mpcnc_v1p2.h index 77b4afb3..40c72fee 100644 --- a/Grbl_Esp32/src/Machines/mpcnc_v1p2.h +++ b/Grbl_Esp32/src/Machines/mpcnc_v1p2.h @@ -31,51 +31,51 @@ #define DEFAULT_HOMING_SQUARED_AXES (bit(X_AXIS) | bit(Y_AXIS)) -#define X_STEP_PIN GPIO_NUM_12 -#define X2_STEP_PIN GPIO_NUM_22 // ganged motor +#define X_STEP_PIN "gpio.12" +#define X2_STEP_PIN "gpio.22" // ganged motor -#define Y_STEP_PIN GPIO_NUM_14 -#define Y2_STEP_PIN GPIO_NUM_21 // ganged motor +#define Y_STEP_PIN "gpio.14" +#define Y2_STEP_PIN "gpio.21" // ganged motor -#define Z_STEP_PIN GPIO_NUM_27 +#define Z_STEP_PIN "gpio.27" -#define X_DIRECTION_PIN GPIO_NUM_26 +#define X_DIRECTION_PIN "gpio.26" #define X2_DIRECTION_PIN X_DIRECTION_PIN -#define Y_DIRECTION_PIN GPIO_NUM_25 +#define Y_DIRECTION_PIN "gpio.25" #define Y2_DIRECTION_PIN Y_DIRECTION_PIN -#define Z_DIRECTION_PIN GPIO_NUM_33 +#define Z_DIRECTION_PIN "gpio.33" // OK to comment out to use pin for other features -#define STEPPERS_DISABLE_PIN GPIO_NUM_13 +#define STEPPERS_DISABLE_PIN "gpio.13" -// Note: if you use PWM rather than relay, you could map GPIO_NUM_2 to mist or flood +// Note: if you use PWM rather than relay, you could map "gpio.2" to mist or flood //#define USE_SPINDLE_RELAY #ifdef USE_SPINDLE_RELAY #define SPINDLE_TYPE SpindleType::RELAY - #define SPINDLE_OUTPUT_PIN GPIO_NUM_2 + #define SPINDLE_OUTPUT_PIN "gpio.2" #else #define SPINDLE_TYPE SpindleType::PWM - #define SPINDLE_OUTPUT_PIN GPIO_NUM_16 + #define SPINDLE_OUTPUT_PIN "gpio.16" - #define SPINDLE_ENABLE_PIN GPIO_NUM_32 + #define SPINDLE_ENABLE_PIN "gpio.32" #endif // Note: Only uncomment this if USE_SPINDLE_RELAY is commented out. // Relay can be used for spindle or either coolant -//#define COOLANT_FLOOD_PIN GPIO_NUM_2 -//#define COOLANT_MIST_PIN GPIO_NUM_2 +//#define COOLANT_FLOOD_PIN "gpio.2" +//#define COOLANT_MIST_PIN "gpio.2" -#define X_LIMIT_PIN GPIO_NUM_17 -#define Y_LIMIT_PIN GPIO_NUM_4 -#define Z_LIMIT_PIN GPIO_NUM_15 +#define X_LIMIT_PIN "gpio.17" +#define Y_LIMIT_PIN "gpio.4" +#define Z_LIMIT_PIN "gpio.15" #ifndef ENABLE_SOFTWARE_DEBOUNCE // V1P2 does not have R/C filters #define ENABLE_SOFTWARE_DEBOUNCE #endif -#define PROBE_PIN GPIO_NUM_35 +#define PROBE_PIN "gpio.35" // The default value in config.h is wrong for this controller #ifdef INVERT_CONTROL_PIN_MASK @@ -84,9 +84,9 @@ #define INVERT_CONTROL_PIN_MASK B1110 -#define CONTROL_RESET_PIN GPIO_NUM_34 // needs external pullup -#define CONTROL_FEED_HOLD_PIN GPIO_NUM_36 // needs external pullup -#define CONTROL_CYCLE_START_PIN GPIO_NUM_39 // needs external pullup +#define CONTROL_RESET_PIN "gpio.34" // needs external pullup +#define CONTROL_FEED_HOLD_PIN "gpio.36" // needs external pullup +#define CONTROL_CYCLE_START_PIN "gpio.39" // needs external pullup #define DEFAULT_STEP_PULSE_MICROSECONDS 3 #define DEFAULT_STEPPER_IDLE_LOCK_TIME 255 // 255 = Keep steppers on diff --git a/Grbl_Esp32/src/Machines/pen_laser.h b/Grbl_Esp32/src/Machines/pen_laser.h index 880c5094..ca090191 100644 --- a/Grbl_Esp32/src/Machines/pen_laser.h +++ b/Grbl_Esp32/src/Machines/pen_laser.h @@ -35,26 +35,26 @@ //#define PEN_LASER_V1 #define PEN_LASER_V2 -#define X_STEP_PIN GPIO_NUM_12 -#define X_DIRECTION_PIN GPIO_NUM_26 +#define X_STEP_PIN "gpio.12" +#define X_DIRECTION_PIN "gpio.26" -#define Y_STEP_PIN GPIO_NUM_14 -#define Y_DIRECTION_PIN GPIO_NUM_25 +#define Y_STEP_PIN "gpio.14" +#define Y_DIRECTION_PIN "gpio.25" -#define STEPPERS_DISABLE_PIN GPIO_NUM_13 +#define STEPPERS_DISABLE_PIN "gpio.13" #ifdef PEN_LASER_V1 - #define X_LIMIT_PIN GPIO_NUM_2 + #define X_LIMIT_PIN "gpio.2" #endif #ifdef PEN_LASER_V2 - #define X_LIMIT_PIN GPIO_NUM_15 + #define X_LIMIT_PIN "gpio.15" #endif -#define Y_LIMIT_PIN GPIO_NUM_4 +#define Y_LIMIT_PIN "gpio.4" #define USING_SERVO // uncomment to use this feature #ifdef USING_SERVO - #define Z_SERVO_PIN GPIO_NUM_27 + #define Z_SERVO_PIN "gpio.27" #endif #define SPINDLE_TYPE SpindleType::NONE diff --git a/Grbl_Esp32/src/Machines/polar_coaster.h b/Grbl_Esp32/src/Machines/polar_coaster.h index b0e45e7c..0b6571ef 100644 --- a/Grbl_Esp32/src/Machines/polar_coaster.h +++ b/Grbl_Esp32/src/Machines/polar_coaster.h @@ -41,16 +41,16 @@ #define USE_FWD_KINEMATICS // report in cartesian #define USE_M30 -#define X_STEP_PIN GPIO_NUM_15 -#define Y_STEP_PIN GPIO_NUM_2 -#define X_DIRECTION_PIN GPIO_NUM_25 -#define Y_DIRECTION_PIN GPIO_NUM_26 +#define X_STEP_PIN "gpio.15" +#define Y_STEP_PIN "gpio.2" +#define X_DIRECTION_PIN "gpio.25" +#define Y_DIRECTION_PIN "gpio.26" -#define STEPPERS_DISABLE_PIN GPIO_NUM_17 +#define STEPPERS_DISABLE_PIN "gpio.17" -#define Z_SERVO_PIN GPIO_NUM_16 +#define Z_SERVO_PIN "gpio.16" -#define X_LIMIT_PIN GPIO_NUM_4 +#define X_LIMIT_PIN "gpio.4" #define SPINDLE_TYPE SpindleType::NONE @@ -68,9 +68,9 @@ #endif #define INVERT_CONTROL_PIN_MASK B11111111 -#define MACRO_BUTTON_0_PIN GPIO_NUM_13 -#define MACRO_BUTTON_1_PIN GPIO_NUM_12 -#define MACRO_BUTTON_2_PIN GPIO_NUM_14 +#define MACRO_BUTTON_0_PIN "gpio.13" +#define MACRO_BUTTON_1_PIN "gpio.12" +#define MACRO_BUTTON_2_PIN "gpio.14" // this 'bot only homes the X axis diff --git a/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyyz.h b/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyyz.h index 1bd15efd..eb57a2d5 100644 --- a/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyyz.h +++ b/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyyz.h @@ -47,38 +47,38 @@ // Y motor connects to the 1st driver #define X_TRINAMIC_DRIVER 2130 // Which Driver Type? #define X_RSENSE TMC2130_RSENSE_DEFAULT -#define X_STEP_PIN GPIO_NUM_12 -#define X_DIRECTION_PIN GPIO_NUM_14 -#define X_CS_PIN GPIO_NUM_17 // Daisy Chain, all share same CS pin +#define X_STEP_PIN "gpio.12" +#define X_DIRECTION_PIN "gpio.14" +#define X_CS_PIN "gpio.17" // Daisy Chain, all share same CS pin // Y motor connects to the 2nd driver #define Y_TRINAMIC_DRIVER 2130 // Which Driver Type? #define Y_RSENSE TMC2130_RSENSE_DEFAULT -#define Y_STEP_PIN GPIO_NUM_27 -#define Y_DIRECTION_PIN GPIO_NUM_26 +#define Y_STEP_PIN "gpio.27" +#define Y_DIRECTION_PIN "gpio.26" #define Y_CS_PIN X_CS_PIN // Daisy Chain, all share same CS pin // Y2 motor connects to the 2nd driver #define Y2_TRINAMIC_DRIVER 2130 // Which Driver Type? #define Y2_RSENSE TMC2130_RSENSE_DEFAULT -#define Y2_STEP_PIN GPIO_NUM_15 // Z on schem -#define Y2_DIRECTION_PIN GPIO_NUM_2 // Z on schem +#define Y2_STEP_PIN "gpio.15" // Z on schem +#define Y2_DIRECTION_PIN "gpio.2" // Z on schem #define Y2_CS_PIN X_CS_PIN // Daisy Chain, all share same CS pin // Z Axis motor connects to the 4th driver #define Z_TRINAMIC_DRIVER 2130 // Which Driver Type? #define Z_RSENSE TMC2130_RSENSE_DEFAULT -#define Z_STEP_PIN GPIO_NUM_33 // A on schem -#define Z_DIRECTION_PIN GPIO_NUM_32 // A on schem +#define Z_STEP_PIN "gpio.33" // A on schem +#define Z_DIRECTION_PIN "gpio.32" // A on schem #define Z_CS_PIN X_CS_PIN // Daisy Chain, all share same CS pin // Mist is a 3.3V output // Turn on with M7 and off with M9 -#define COOLANT_MIST_PIN GPIO_NUM_21 +#define COOLANT_MIST_PIN "gpio.21" #define SPINDLE_TYPE SpindleType::PWM -#define SPINDLE_OUTPUT_PIN GPIO_NUM_25 -#define SPINDLE_ENABLE_PIN GPIO_NUM_4 +#define SPINDLE_OUTPUT_PIN "gpio.25" +#define SPINDLE_ENABLE_PIN "gpio.4" // Relay operation // Install Jumper near relay @@ -87,9 +87,9 @@ // Interlock jumper along top edge needs to be installed for both versions #define DEFAULT_SPINDLE_RPM_MAX 1 // Should be 1 for relay operation -#define PROBE_PIN GPIO_NUM_22 +#define PROBE_PIN "gpio.22" -#define X_LIMIT_PIN GPIO_NUM_36 -#define Y_LIMIT_PIN GPIO_NUM_39 -#define Z_LIMIT_PIN GPIO_NUM_34 +#define X_LIMIT_PIN "gpio.36" +#define Y_LIMIT_PIN "gpio.39" +#define Z_LIMIT_PIN "gpio.34" diff --git a/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyz.h b/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyz.h index fc9b45f6..fcac8899 100644 --- a/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyz.h +++ b/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyz.h @@ -44,30 +44,30 @@ #define X_TRINAMIC_DRIVER 2130 // Which Driver Type? #define X_RSENSE TMC2130_RSENSE_DEFAULT -#define X_STEP_PIN GPIO_NUM_12 -#define X_DIRECTION_PIN GPIO_NUM_14 -#define X_CS_PIN GPIO_NUM_17 // Daisy Chain, all share same CS pin +#define X_STEP_PIN "gpio.12" +#define X_DIRECTION_PIN "gpio.14" +#define X_CS_PIN "gpio.17" // Daisy Chain, all share same CS pin #define Y_TRINAMIC_DRIVER 2130 // Which Driver Type? #define Y_RSENSE TMC2130_RSENSE_DEFAULT -#define Y_STEP_PIN GPIO_NUM_27 -#define Y_DIRECTION_PIN GPIO_NUM_26 +#define Y_STEP_PIN "gpio.27" +#define Y_DIRECTION_PIN "gpio.26" #define Y_CS_PIN X_CS_PIN // Daisy Chain, all share same CS pin #define Z_TRINAMIC_DRIVER 2130 // Which Driver Type? #define Z_RSENSE TMC2130_RSENSE_DEFAULT -#define Z_STEP_PIN GPIO_NUM_15 -#define Z_DIRECTION_PIN GPIO_NUM_2 +#define Z_STEP_PIN "gpio.15" +#define Z_DIRECTION_PIN "gpio.2" #define Z_CS_PIN X_CS_PIN // Daisy Chain, all share same CS pin // Mist is a 3.3V output // Turn on with M7 and off with M9 -#define COOLANT_MIST_PIN GPIO_NUM_21 +#define COOLANT_MIST_PIN "gpio.21" #define SPINDLE_TYPE SpindleType::PWM -#define SPINDLE_OUTPUT_PIN GPIO_NUM_25 -#define SPINDLE_ENABLE_PIN GPIO_NUM_4 +#define SPINDLE_OUTPUT_PIN "gpio.25" +#define SPINDLE_ENABLE_PIN "gpio.4" // Relay operation // Install Jumper near relay @@ -76,9 +76,9 @@ // Interlock jumper along top edge needs to be installed for both versions #define DEFAULT_SPINDLE_RPM_MAX 1 // Should be 1 for relay operation -#define PROBE_PIN GPIO_NUM_22 +#define PROBE_PIN "gpio.22" -#define X_LIMIT_PIN GPIO_NUM_36 -#define Y_LIMIT_PIN GPIO_NUM_39 -#define Z_LIMIT_PIN GPIO_NUM_34 +#define X_LIMIT_PIN "gpio.36" +#define Y_LIMIT_PIN "gpio.39" +#define Z_LIMIT_PIN "gpio.34" diff --git a/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyza.h b/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyza.h index 5ca27c61..b9759fbd 100644 --- a/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyza.h +++ b/Grbl_Esp32/src/Machines/spi_daisy_4axis_xyza.h @@ -43,41 +43,41 @@ #define X_TRINAMIC_DRIVER 2130 // Which Driver Type? #define X_RSENSE TMC2130_RSENSE_DEFAULT -#define X_STEP_PIN GPIO_NUM_12 -#define X_DIRECTION_PIN GPIO_NUM_14 -#define X_CS_PIN GPIO_NUM_17 // Daisy Chain, all share same CS pin +#define X_STEP_PIN "gpio.12" +#define X_DIRECTION_PIN "gpio.14" +#define X_CS_PIN "gpio.17" // Daisy Chain, all share same CS pin #define Y_TRINAMIC_DRIVER 2130 // Which Driver Type? #define Y_RSENSE TMC2130_RSENSE_DEFAULT -#define Y_STEP_PIN GPIO_NUM_27 -#define Y_DIRECTION_PIN GPIO_NUM_26 +#define Y_STEP_PIN "gpio.27" +#define Y_DIRECTION_PIN "gpio.26" #define Y_CS_PIN X_CS_PIN // Daisy Chain, all share same CS pin #define Z_TRINAMIC_DRIVER 2130 // Which Driver Type? #define Z_RSENSE TMC2130_RSENSE_DEFAULT -#define Z_STEP_PIN GPIO_NUM_15 -#define Z_DIRECTION_PIN GPIO_NUM_2 +#define Z_STEP_PIN "gpio.15" +#define Z_DIRECTION_PIN "gpio.2" #define Z_CS_PIN X_CS_PIN // Daisy Chain, all share same CS pin #define A_TRINAMIC_DRIVER 2130 // Which Driver Type? #define A_RSENSE TMC2130_RSENSE_DEFAULT -#define A_STEP_PIN GPIO_NUM_33 -#define A_DIRECTION_PIN GPIO_NUM_32 +#define A_STEP_PIN "gpio.33" +#define A_DIRECTION_PIN "gpio.32" #define A_CS_PIN X_CS_PIN // Daisy Chain, all share same CS pin // Mist is a 3.3V output // Turn on with M7 and off with M9 -#define COOLANT_MIST_PIN GPIO_NUM_21 +#define COOLANT_MIST_PIN "gpio.21" -#define SPINDLE_OUTPUT_PIN GPIO_NUM_25 -#define SPINDLE_ENABLE_PIN GPIO_NUM_4 +#define SPINDLE_OUTPUT_PIN "gpio.25" +#define SPINDLE_ENABLE_PIN "gpio.4" #define SPINDLE_TYPE SpindleType::RELAY // default use $Spindle/Type=PWM or $Spindle/Type=Laser -#define PROBE_PIN GPIO_NUM_22 +#define PROBE_PIN "gpio.22" -#define X_LIMIT_PIN GPIO_NUM_36 -#define Y_LIMIT_PIN GPIO_NUM_39 -#define Z_LIMIT_PIN GPIO_NUM_34 -#define A_LIMIT_PIN GPIO_NUM_35 +#define X_LIMIT_PIN "gpio.36" +#define Y_LIMIT_PIN "gpio.39" +#define Z_LIMIT_PIN "gpio.34" +#define A_LIMIT_PIN "gpio.35" diff --git a/Grbl_Esp32/src/Machines/tapster_3.h b/Grbl_Esp32/src/Machines/tapster_3.h index b4de2b1c..0eb185af 100644 --- a/Grbl_Esp32/src/Machines/tapster_3.h +++ b/Grbl_Esp32/src/Machines/tapster_3.h @@ -47,9 +47,9 @@ // =================== Machine Hardware Definition ============= -#define DYNAMIXEL_TXD GPIO_NUM_4 -#define DYNAMIXEL_RXD GPIO_NUM_13 -#define DYNAMIXEL_RTS GPIO_NUM_17 +#define DYNAMIXEL_TXD "gpio.4" +#define DYNAMIXEL_RXD "gpio.13" +#define DYNAMIXEL_RTS "gpio.17" #define X_DYNAMIXEL_ID 1 // protocol ID #define Y_DYNAMIXEL_ID 2 // protocol ID @@ -69,17 +69,17 @@ #define SERVO_TIMER_INTERVAL 50 -#define USER_DIGITAL_PIN_0 GPIO_NUM_25 -#define USER_DIGITAL_PIN_1 GPIO_NUM_26 -#define USER_DIGITAL_PIN_2 GPIO_NUM_27 +#define USER_DIGITAL_PIN_0 "gpio.25" +#define USER_DIGITAL_PIN_1 "gpio.26" +#define USER_DIGITAL_PIN_2 "gpio.27" -#define USER_ANALOG_PIN_0 GPIO_NUM_2 +#define USER_ANALOG_PIN_0 "gpio.2" #define USER_ANALOG_PIN_0_FREQ 50 // for use with RC servos duty range 5% to 10% -#define USER_ANALOG_PIN_1 GPIO_NUM_15 +#define USER_ANALOG_PIN_1 "gpio.15" #define USER_ANALOG_PIN_1_FREQ 50 // for use with RC servos duty range 5% to 10% -#define USER_ANALOG_PIN_2 GPIO_NUM_16 +#define USER_ANALOG_PIN_2 "gpio.16" #define USER_ANALOG_PIN_2_FREQ 50 // for use with RC servos duty range 5% to 10% // ===================== Default Settings ============================== diff --git a/Grbl_Esp32/src/Machines/tapster_pro_6P_trinamic.h b/Grbl_Esp32/src/Machines/tapster_pro_6P_trinamic.h index 6f88a816..09597403 100644 --- a/Grbl_Esp32/src/Machines/tapster_pro_6P_trinamic.h +++ b/Grbl_Esp32/src/Machines/tapster_pro_6P_trinamic.h @@ -71,34 +71,34 @@ // #define USE_STEPSTICK // makes sure MS1,2,3 !reset and !sleep are set -#define I2S_OUT_BCK GPIO_NUM_22 -#define I2S_OUT_WS GPIO_NUM_17 -#define I2S_OUT_DATA GPIO_NUM_21 +#define I2S_OUT_BCK "gpio.22" +#define I2S_OUT_WS "gpio.17" +#define I2S_OUT_DATA "gpio.21" // ================== CPU MAP ====================== // Motor Socket #1 #define X_TRINAMIC_DRIVER 2130 -#define X_DISABLE_PIN I2SO(0) -#define X_DIRECTION_PIN I2SO(1) -#define X_STEP_PIN I2SO(2) -#define X_CS_PIN I2SO(3) +#define X_DISABLE_PIN "i2so.0" +#define X_DIRECTION_PIN "i2so.1" +#define X_STEP_PIN "i2so.2" +#define X_CS_PIN "i2so.3" #define X_RSENSE TMC2130_RSENSE_DEFAULT // Motor Socket #2 #define Y_TRINAMIC_DRIVER X_TRINAMIC_DRIVER -#define Y_DIRECTION_PIN I2SO(4) -#define Y_STEP_PIN I2SO(5) -#define Y_DISABLE_PIN I2SO(7) -#define Y_CS_PIN I2SO(6) +#define Y_DIRECTION_PIN "i2so.4" +#define Y_STEP_PIN "i2so.5" +#define Y_DISABLE_PIN "i2so.7" +#define Y_CS_PIN "i2so.6" #define Y_RSENSE X_RSENSE // Motor Socket #3 #define Z_TRINAMIC_DRIVER X_TRINAMIC_DRIVER -#define Z_DISABLE_PIN I2SO(8) -#define Z_DIRECTION_PIN I2SO(9) -#define Z_STEP_PIN I2SO(10) -#define Z_CS_PIN I2SO(11) +#define Z_DISABLE_PIN "i2so.8" +#define Z_DIRECTION_PIN "i2so.9" +#define Z_STEP_PIN "i2so.10" +#define Z_CS_PIN "i2so.11" #define Z_RSENSE X_RSENSE // 6 Pack Pin Mapping @@ -106,31 +106,31 @@ // // 4x Switch input module on CNC I/O module Socket #1 // // https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-Switch-Input-module -#define X_LIMIT_PIN GPIO_NUM_33 -#define Y_LIMIT_PIN GPIO_NUM_32 -#define Z_LIMIT_PIN GPIO_NUM_35 +#define X_LIMIT_PIN "gpio.33" +#define Y_LIMIT_PIN "gpio.32" +#define Z_LIMIT_PIN "gpio.35" // 4x Switch input module on CNC I/O module Socket #2 // https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-Switch-Input-module -// #define X_LIMIT_PIN GPIO_NUM_2 -// #define Y_LIMIT_PIN GPIO_NUM_25 -// #define Z_LIMIT_PIN GPIO_NUM_39 -// #define PROBE_PIN GPIO_NUM_36 +// #define X_LIMIT_PIN "gpio.2" +// #define Y_LIMIT_PIN "gpio.25" +// #define Z_LIMIT_PIN "gpio.39" +// #define PROBE_PIN "gpio.36" //Example Quad MOSFET module on socket #3 // https://github.com/bdring/6-Pack_CNC_Controller/wiki/Quad-MOSFET-Module -#define USER_DIGITAL_PIN_0 GPIO_NUM_26 -#define USER_DIGITAL_PIN_1 GPIO_NUM_4 -#define USER_DIGITAL_PIN_2 GPIO_NUM_16 -#define USER_DIGITAL_PIN_3 GPIO_NUM_27 +#define USER_DIGITAL_PIN_0 "gpio.26" +#define USER_DIGITAL_PIN_1 "gpio.4" +#define USER_DIGITAL_PIN_2 "gpio.16" +#define USER_DIGITAL_PIN_3 "gpio.27" // Example Servo module in socket #4 // https://github.com/bdring/6-Pack_CNC_Controller/wiki/RC-Servo-BESC-CNC-I-O-Module // https://github.com/bdring/Grbl_Esp32/wiki/M62,-M63,-M64,-M65-&-M67-User-I-O-Commands -#define USER_ANALOG_PIN_0 GPIO_NUM_14 -#define USER_ANALOG_PIN_1 GPIO_NUM_13 -#define USER_ANALOG_PIN_2 GPIO_NUM_15 -#define USER_ANALOG_PIN_3 GPIO_NUM_12 +#define USER_ANALOG_PIN_0 "gpio.14" +#define USER_ANALOG_PIN_1 "gpio.13" +#define USER_ANALOG_PIN_2 "gpio.15" +#define USER_ANALOG_PIN_3 "gpio.12" #define USER_ANALOG_PIN_0_FREQ 50 // for use with RC servos #define USER_ANALOG_PIN_1_FREQ 50 #define USER_ANALOG_PIN_2_FREQ 50 @@ -194,4 +194,4 @@ #define DEFAULT_INVERT_PROBE_PIN 1 -#define SPINDLE_TYPE SpindleType::NONE \ No newline at end of file +#define SPINDLE_TYPE SpindleType::NONE diff --git a/Grbl_Esp32/src/Machines/tapster_pro_stepstick.h b/Grbl_Esp32/src/Machines/tapster_pro_stepstick.h index 366157c5..d4a50d37 100644 --- a/Grbl_Esp32/src/Machines/tapster_pro_stepstick.h +++ b/Grbl_Esp32/src/Machines/tapster_pro_stepstick.h @@ -72,38 +72,38 @@ #define USE_STEPSTICK // makes sure MS1,2,3 !reset and !sleep are set -#define I2S_OUT_BCK GPIO_NUM_22 -#define I2S_OUT_WS GPIO_NUM_17 -#define I2S_OUT_DATA GPIO_NUM_21 +#define I2S_OUT_BCK "gpio.22" +#define I2S_OUT_WS "gpio.17" +#define I2S_OUT_DATA "gpio.21" // ================== CPU MAP ====================== -#define X_STEPPER_MS3 I2SO(3) // X_CS -#define Y_STEPPER_MS3 I2SO(6) // Y_CS -#define Z_STEPPER_MS3 I2SO(11) // Z_CS +#define X_STEPPER_MS3 "i2so.3" // X_CS +#define Y_STEPPER_MS3 "i2so.6" // Y_CS +#define Z_STEPPER_MS3 "i2so.11" // Z_CS -#define STEPPER_RESET GPIO_NUM_19 +#define STEPPER_RESET "gpio.19" // Motor Socket #1 -#define X_DISABLE_PIN I2SO(0) -#define X_DIRECTION_PIN I2SO(1) -#define X_STEP_PIN I2SO(2) +#define X_DISABLE_PIN "i2so.0" +#define X_DIRECTION_PIN "i2so.1" +#define X_STEP_PIN "i2so.2" // Motor Socket #2 -#define Y_DIRECTION_PIN I2SO(4) -#define Y_STEP_PIN I2SO(5) -#define Y_DISABLE_PIN I2SO(7) +#define Y_DIRECTION_PIN "i2so.4" +#define Y_STEP_PIN "i2so.5" +#define Y_DISABLE_PIN "i2so.7" // Motor Socket #3 -#define Z_DISABLE_PIN I2SO(8) -#define Z_DIRECTION_PIN I2SO(9) -#define Z_STEP_PIN I2SO(10) +#define Z_DISABLE_PIN "i2so.8" +#define Z_DIRECTION_PIN "i2so.9" +#define Z_STEP_PIN "i2so.10" // CNC I/O Modules -#define X_LIMIT_PIN GPIO_NUM_33 -#define Y_LIMIT_PIN GPIO_NUM_32 -#define Z_LIMIT_PIN GPIO_NUM_35 +#define X_LIMIT_PIN "gpio.33" +#define Y_LIMIT_PIN "gpio.32" +#define Z_LIMIT_PIN "gpio.35" // ================= defaults =========================== @@ -152,4 +152,4 @@ #define DEFAULT_HOMING_PULLOFF -DEFAULT_X_HOMING_MPOS -#define SPINDLE_TYPE SpindleType::NONE \ No newline at end of file +#define SPINDLE_TYPE SpindleType::NONE diff --git a/Grbl_Esp32/src/Machines/template.h b/Grbl_Esp32/src/Machines/template.h index 7672d31f..60367c1d 100644 --- a/Grbl_Esp32/src/Machines/template.h +++ b/Grbl_Esp32/src/Machines/template.h @@ -80,58 +80,58 @@ // Step and direction pins; these must be output-capable pins, // specifically ESP32 GPIO numbers 0..31 -// #define X_STEP_PIN GPIO_NUM_12 -// #define X_DIRECTION_PIN GPIO_NUM_14 -// #define Y_STEP_PIN GPIO_NUM_26 -// #define Y_DIRECTION_PIN GPIO_NUM_15 -// #define Z_STEP_PIN GPIO_NUM_27 -// #define Z_DIRECTION_PIN GPIO_NUM_33 +// #define X_STEP_PIN "gpio.12" +// #define X_DIRECTION_PIN "gpio.14" +// #define Y_STEP_PIN "gpio.26" +// #define Y_DIRECTION_PIN "gpio.15" +// #define Z_STEP_PIN "gpio.27" +// #define Z_DIRECTION_PIN "gpio.33" -// #define X_LIMIT_PIN GPIO_NUM_17 -// #define Y_LIMIT_PIN GPIO_NUM_4 -// #define Z_LIMIT_PIN GPIO_NUM_16 +// #define X_LIMIT_PIN "gpio.17" +// #define Y_LIMIT_PIN "gpio.4" +// #define Z_LIMIT_PIN "gpio.16" // Common enable for all steppers. If it is okay to leave // your drivers enabled at all times, you can leave // STEPPERS_DISABLE_PIN undefined and use the pin for something else. -// #define STEPPERS_DISABLE_PIN GPIO_NUM_13 +// #define STEPPERS_DISABLE_PIN "gpio.13" // Pins for controlling various aspects of the machine. If your // machine does not support one of these features, you can leave // the corresponding pin undefined. -// #define SPINDLE_OUTPUT_PIN GPIO_NUM_2 // labeled SpinPWM -// #define SPINDLE_ENABLE_PIN GPIO_NUM_22 // labeled SpinEnbl -// #define COOLANT_MIST_PIN GPIO_NUM_21 // labeled Mist -// #define COOLANT_FLOOD_PIN GPIO_NUM_25 // labeled Flood -// #define PROBE_PIN GPIO_NUM_32 // labeled Probe +// #define SPINDLE_OUTPUT_PIN "gpio.2" // labeled SpinPWM +// #define SPINDLE_ENABLE_PIN "gpio.22" // labeled SpinEnbl +// #define COOLANT_MIST_PIN "gpio.21" // labeled Mist +// #define COOLANT_FLOOD_PIN "gpio.25" // labeled Flood +// #define PROBE_PIN "gpio.32" // labeled Probe // Input pins for various functions. If the corresponding pin is not defined, // the function will not be available. // CONTROL_SAFETY_DOOR_PIN shuts off the machine when a door is opened // or some other unsafe condition exists. -// #define CONTROL_SAFETY_DOOR_PIN GPIO_NUM_35 // labeled Door, needs external pullup +// #define CONTROL_SAFETY_DOOR_PIN "gpio.35" // labeled Door, needs external pullup // RESET, FEED_HOLD, and CYCLE_START can control GCode execution at // the push of a button. -// #define CONTROL_RESET_PIN GPIO_NUM_34 // labeled Reset, needs external pullup -// #define CONTROL_FEED_HOLD_PIN GPIO_NUM_36 // labeled Hold, needs external pullup -// #define CONTROL_CYCLE_START_PIN GPIO_NUM_39 // labeled Start, needs external pullup +// #define CONTROL_RESET_PIN "gpio.34" // labeled Reset, needs external pullup +// #define CONTROL_FEED_HOLD_PIN "gpio.36" // labeled Hold, needs external pullup +// #define CONTROL_CYCLE_START_PIN "gpio.39" // labeled Start, needs external pullup // === Ganging // If you need to use two motors on one axis, you can "gang" the motors by // defining a second pin to control the other motor on the axis. For example: -// #define Y2_STEP_PIN GPIO_NUM_27 /* labeled Z */ -// #define Y2_DIRECTION_PIN GPIO_NUM_33 /* labeled Z */ +// #define Y2_STEP_PIN "gpio.27" /* labeled Z */ +// #define Y2_DIRECTION_PIN "gpio.33" /* labeled Z */ // === Servos // To use a servo motor on an axis, do not define step and direction // pins for that axis, but instead include a block like this: -// #define SERVO_Z_PIN GPIO_NUM_22 +// #define SERVO_Z_PIN "gpio.22" // === Homing cycles // Set them using $Homing/Cycle0= optionally up to $Homing/Cycle5= diff --git a/Grbl_Esp32/src/Machines/test_drive.h b/Grbl_Esp32/src/Machines/test_drive.h index 21887614..036c4113 100644 --- a/Grbl_Esp32/src/Machines/test_drive.h +++ b/Grbl_Esp32/src/Machines/test_drive.h @@ -145,6 +145,6 @@ // // Other : // - RcServo -// - SDCard -// - Trinamic +// x SDCard +// x Trinamic diff --git a/Grbl_Esp32/src/Machines/tmc2130_pen.h b/Grbl_Esp32/src/Machines/tmc2130_pen.h index 93380577..163a8c82 100644 --- a/Grbl_Esp32/src/Machines/tmc2130_pen.h +++ b/Grbl_Esp32/src/Machines/tmc2130_pen.h @@ -32,36 +32,36 @@ #ifdef MACHINE_V1 #define MACHINE_NAME "ESP32_TMC2130_PEN V1" - #define X_LIMIT_PIN GPIO_NUM_2 + #define X_LIMIT_PIN "gpio.2" #else #define MACHINE_NAME "ESP32_TMC2130_PEN V2" - #define X_LIMIT_PIN GPIO_NUM_32 + #define X_LIMIT_PIN "gpio.32" #endif #define TRINAMIC_RUN_MODE TrinamicMode :: CoolStep #define TRINAMIC_HOMING_MODE TrinamicMode :: CoolStep -#define X_STEP_PIN GPIO_NUM_12 -#define X_DIRECTION_PIN GPIO_NUM_26 +#define X_STEP_PIN "gpio.12" +#define X_DIRECTION_PIN "gpio.26" #define X_TRINAMIC_DRIVER 2130 // Which Driver Type? -#define X_CS_PIN GPIO_NUM_17 //chip select +#define X_CS_PIN "gpio.17" //chip select #define X_RSENSE TMC2130_RSENSE_DEFAULT -#define Y_STEP_PIN GPIO_NUM_14 -#define Y_DIRECTION_PIN GPIO_NUM_25 +#define Y_STEP_PIN "gpio.14" +#define Y_DIRECTION_PIN "gpio.25" #define Y_TRINAMIC_DRIVER 2130 // Which Driver Type? -#define Y_CS_PIN GPIO_NUM_16 //chip select +#define Y_CS_PIN "gpio.16" //chip select #define Y_RSENSE TMC2130_RSENSE_DEFAULT // OK to comment out to use pin for other features -#define STEPPERS_DISABLE_PIN GPIO_NUM_13 +#define STEPPERS_DISABLE_PIN "gpio.13" // Define one of these 2 options for spindle or servo -#define Z_SERVO_PIN GPIO_NUM_27 // comment this out if PWM spindle/laser control. +#define Z_SERVO_PIN "gpio.27" // comment this out if PWM spindle/laser control. // #define X_LIMIT_PIN See version section at beginning of file -#define Y_LIMIT_PIN GPIO_NUM_4 +#define Y_LIMIT_PIN "gpio.4" // defaults #define DEFAULT_Z_STEPS_PER_MM 100.0 // This is used as the servo calibration