From f1baa6baa83e8f6e3e4ef2630281d6bc95eca766 Mon Sep 17 00:00:00 2001 From: bdring Date: Thu, 23 Apr 2020 10:17:22 -0500 Subject: [PATCH] Fixing pin name issue Somehow the rename of SPINDLE_PWM_PIN to SPINDLE_OUTPUT_PIN got lost in the merge. I think the confict resolution step was not done right. Removed template.h and spindle_test.h --- Grbl_Esp32/Machines/3axis_v3.h | 2 +- Grbl_Esp32/Machines/3axis_v4.h | 4 +- Grbl_Esp32/Machines/3axis_xyx.h | 2 +- Grbl_Esp32/Machines/4axis_external_driver.h | 2 +- Grbl_Esp32/Machines/custom_machine_template.h | 1 - Grbl_Esp32/Machines/espduino.h | 2 +- Grbl_Esp32/Machines/mpcnc_v1p1.h | 4 +- Grbl_Esp32/Machines/mpcnc_v1p2.h | 4 +- Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h | 2 +- Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h | 2 +- Grbl_Esp32/Machines/spindle_test.h | 39 ------------------- Grbl_Esp32/Machines/tmc2130_pen.h | 2 +- Grbl_Esp32/machine.h | 2 +- 13 files changed, 13 insertions(+), 55 deletions(-) delete mode 100644 Grbl_Esp32/Machines/custom_machine_template.h delete mode 100644 Grbl_Esp32/Machines/spindle_test.h diff --git a/Grbl_Esp32/Machines/3axis_v3.h b/Grbl_Esp32/Machines/3axis_v3.h index 73b9af9d..0bfa1429 100644 --- a/Grbl_Esp32/Machines/3axis_v3.h +++ b/Grbl_Esp32/Machines/3axis_v3.h @@ -41,7 +41,7 @@ #define STEPPERS_DISABLE_PIN GPIO_NUM_13 #define SPINDLE_TYPE SPINDLE_TYPE_PWM -#define SPINDLE_PWM_PIN GPIO_NUM_17 // labeled SpinPWM +#define SPINDLE_OUTPUT_PIN GPIO_NUM_17 // labeled SpinPWM #define SPINDLE_ENABLE_PIN GPIO_NUM_22 // labeled SpinEnbl diff --git a/Grbl_Esp32/Machines/3axis_v4.h b/Grbl_Esp32/Machines/3axis_v4.h index f14e4712..bc5ff681 100644 --- a/Grbl_Esp32/Machines/3axis_v4.h +++ b/Grbl_Esp32/Machines/3axis_v4.h @@ -41,7 +41,7 @@ #define STEPPERS_DISABLE_PIN GPIO_NUM_13 #define SPINDLE_TYPE SPINDLE_TYPE_PWM -#define SPINDLE_PWM_PIN GPIO_NUM_2 // labeled SpinPWM +#define SPINDLE_OUTPUT_PIN GPIO_NUM_2 // labeled SpinPWM #define SPINDLE_ENABLE_PIN GPIO_NUM_22 // labeled SpinEnbl #define MIST_PIN GPIO_NUM_21 // labeled Mist @@ -52,5 +52,3 @@ #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 SPINDLE_TYPE SPINDLE_TYPE_BESC diff --git a/Grbl_Esp32/Machines/3axis_xyx.h b/Grbl_Esp32/Machines/3axis_xyx.h index 55c14b16..288414cc 100644 --- a/Grbl_Esp32/Machines/3axis_xyx.h +++ b/Grbl_Esp32/Machines/3axis_xyx.h @@ -33,7 +33,7 @@ #define Y2_DIRECTION_PIN GPIO_NUM_33 /* labeled Z */ #define SPINDLE_TYPE SPINDLE_TYPE_PWM -#define SPINDLE_PWM_PIN GPIO_NUM_2 +#define SPINDLE_OUTPUT_PIN GPIO_NUM_2 #define SPINDLE_ENABLE_PIN GPIO_NUM_22 #define LIMIT_MASK B11 diff --git a/Grbl_Esp32/Machines/4axis_external_driver.h b/Grbl_Esp32/Machines/4axis_external_driver.h index 42458d8c..ecb4e409 100644 --- a/Grbl_Esp32/Machines/4axis_external_driver.h +++ b/Grbl_Esp32/Machines/4axis_external_driver.h @@ -41,7 +41,7 @@ /* #define SPINDLE_TYPE SPINDLE_TYPE_PWM -#define SPINDLE_PWM_PIN GPIO_NUM_25 +#define SPINDLE_OUTPUT_PIN GPIO_NUM_25 #define SPINDLE_ENABLE_PIN GPIO_NUM_22 */ diff --git a/Grbl_Esp32/Machines/custom_machine_template.h b/Grbl_Esp32/Machines/custom_machine_template.h deleted file mode 100644 index 7a594cc4..00000000 --- a/Grbl_Esp32/Machines/custom_machine_template.h +++ /dev/null @@ -1 +0,0 @@ -// See template.h diff --git a/Grbl_Esp32/Machines/espduino.h b/Grbl_Esp32/Machines/espduino.h index a58fbc80..28571e13 100644 --- a/Grbl_Esp32/Machines/espduino.h +++ b/Grbl_Esp32/Machines/espduino.h @@ -40,7 +40,7 @@ #define STEPPERS_DISABLE_PIN GPIO_NUM_12 #define SPINDLE_TYPE SPINDLE_TYPE_PWM -#define SPINDLE_PWM_PIN GPIO_NUM_19 +#define SPINDLE_OUTPUT_PIN GPIO_NUM_19 #define SPINDLE_DIR_PIN GPIO_NUM_18 diff --git a/Grbl_Esp32/Machines/mpcnc_v1p1.h b/Grbl_Esp32/Machines/mpcnc_v1p1.h index 288469fe..5e656a5d 100644 --- a/Grbl_Esp32/Machines/mpcnc_v1p1.h +++ b/Grbl_Esp32/Machines/mpcnc_v1p1.h @@ -51,10 +51,10 @@ #ifdef USE_SPINDLE_RELAY #define SPINDLE_TYPE SPINDLE_TYPE_RELAY - #define SPINDLE_PWM_PIN GPIO_NUM_17 + #define SPINDLE_OUTPUT_PIN GPIO_NUM_17 #else #define SPINDLE_TYPE SPINDLE_TYPE_PWM - #define SPINDLE_PWM_PIN GPIO_NUM_16 + #define SPINDLE_OUTPUT_PIN GPIO_NUM_16 #define SPINDLE_ENABLE_PIN GPIO_NUM_32 #endif diff --git a/Grbl_Esp32/Machines/mpcnc_v1p2.h b/Grbl_Esp32/Machines/mpcnc_v1p2.h index aa1ef105..b139d623 100644 --- a/Grbl_Esp32/Machines/mpcnc_v1p2.h +++ b/Grbl_Esp32/Machines/mpcnc_v1p2.h @@ -52,10 +52,10 @@ #ifdef USE_SPINDLE_RELAY #define SPINDLE_TYPE SPINDLE_TYPE_RELAY - #define SPINDLE_PWM_PIN GPIO_NUM_2 + #define SPINDLE_OUTPUT_PIN GPIO_NUM_2 #else #define SPINDLE_TYPE SPINDLE_TYPE_PWM - #define SPINDLE_PWM_PIN GPIO_NUM_16 + #define SPINDLE_OUTPUT_PIN GPIO_NUM_16 #define SPINDLE_ENABLE_PIN GPIO_NUM_32 #endif diff --git a/Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h b/Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h index 1b3233f4..5aa018c6 100644 --- a/Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h +++ b/Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h @@ -79,7 +79,7 @@ #define COOLANT_MIST_PIN GPIO_NUM_21 #define SPINDLE_TYPE SPINDLE_TYPE_PWM -#define SPINDLE_PWM_PIN GPIO_NUM_25 +#define SPINDLE_OUTPUT_PIN GPIO_NUM_25 #define SPINDLE_ENABLE_PIN GPIO_NUM_4 // Relay operation diff --git a/Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h b/Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h index 5a2021db..02732a2b 100644 --- a/Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h +++ b/Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h @@ -64,7 +64,7 @@ #define COOLANT_MIST_PIN GPIO_NUM_21 #define SPINDLE_TYPE SPINDLE_TYPE_PWM -#define SPINDLE_PWM_PIN GPIO_NUM_25 +#define SPINDLE_OUTPUT_PIN GPIO_NUM_25 #define SPINDLE_ENABLE_PIN GPIO_NUM_4 // Relay operation diff --git a/Grbl_Esp32/Machines/spindle_test.h b/Grbl_Esp32/Machines/spindle_test.h deleted file mode 100644 index c85f1682..00000000 --- a/Grbl_Esp32/Machines/spindle_test.h +++ /dev/null @@ -1,39 +0,0 @@ -/* - spindle_test.h - Part of Grbl_ESP32 - - Pin assignments (or lack thereof) for testing Grbl_ESP32. - - This is just a minimal machine definition to test Spindle Classes - - 2018 - Bart Dring - 2020 - Mitch Bradley - - Grbl_ESP32 is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - - Grbl is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - - You should have received a copy of the GNU General Public License - along with Grbl_ESP32. If not, see . -*/ - -#define MACHINE_NAME "Spindle Class Testing" - - -#define SPINDLE_TYPE SPINDLE_TYPE_PWM -//#define SPINDLE_TYPE SPINDLE_TYPE_BESC - -#define SPINDLE_OUTPUT_PIN GPIO_NUM_27 - - -#define LIMIT_MASK 0 // no limit pins - -#ifdef USE_RMT_STEPS -#undef USE_RMT_STEPS // Suppress unused variable warning -#endif diff --git a/Grbl_Esp32/Machines/tmc2130_pen.h b/Grbl_Esp32/Machines/tmc2130_pen.h index 3b5e586f..59536f7e 100644 --- a/Grbl_Esp32/Machines/tmc2130_pen.h +++ b/Grbl_Esp32/Machines/tmc2130_pen.h @@ -72,7 +72,7 @@ #else #define SPINDLE_TYPE SPINDLE_TYPE_PWM - #define SPINDLE_PWM_PIN GPIO_NUM_27 + #define SPINDLE_OUTPUT_PIN GPIO_NUM_27 #endif // #define X_LIMIT_PIN See version section at beginning of file diff --git a/Grbl_Esp32/machine.h b/Grbl_Esp32/machine.h index d57814c4..1d49672e 100644 --- a/Grbl_Esp32/machine.h +++ b/Grbl_Esp32/machine.h @@ -8,7 +8,7 @@ // !!! For initial testing, start with test_drive.h which disables // all I/O pins -#include "Machines/test_drive.h" +#include "Machines/3axis_v4.h" // !!! For actual use, change the line above to select a board // from Machines/, for example: