mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-29 17:19:50 +02:00
Code Issues Releases Wiki Activity

Fixing pin name issue

Browse Source 
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
This commit is contained in:
bdring
2020-04-23 10:17:22 -05:00
parent 84d185e672
commit f1baa6baa8
13 changed files with 13 additions and 55 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Grbl_Esp32/Machines/3axis_v3.h
View File

@@ -41,7 +41,7 @@
#define STEPPERS_DISABLE_PIN GPIO_NUM_13 #define STEPPERS_DISABLE_PIN GPIO_NUM_13
#define SPINDLE_TYPE SPINDLE_TYPE_PWM #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 #define SPINDLE_ENABLE_PIN GPIO_NUM_22 // labeled SpinEnbl

4
Grbl_Esp32/Machines/3axis_v4.h
View File

@@ -41,7 +41,7 @@
#define STEPPERS_DISABLE_PIN GPIO_NUM_13 #define STEPPERS_DISABLE_PIN GPIO_NUM_13
#define SPINDLE_TYPE SPINDLE_TYPE_PWM #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 SPINDLE_ENABLE_PIN GPIO_NUM_22 // labeled SpinEnbl
#define MIST_PIN GPIO_NUM_21 // labeled Mist #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_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_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_CYCLE_START_PIN GPIO_NUM_39 // labeled Start, needs external pullup
#define SPINDLE_TYPE SPINDLE_TYPE_BESC

2
Grbl_Esp32/Machines/3axis_xyx.h
View File

@@ -33,7 +33,7 @@
#define Y2_DIRECTION_PIN GPIO_NUM_33 /* labeled Z */ #define Y2_DIRECTION_PIN GPIO_NUM_33 /* labeled Z */
#define SPINDLE_TYPE SPINDLE_TYPE_PWM #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 SPINDLE_ENABLE_PIN GPIO_NUM_22
#define LIMIT_MASK B11 #define LIMIT_MASK B11

2
Grbl_Esp32/Machines/4axis_external_driver.h
View File

@@ -41,7 +41,7 @@
/* /*
#define SPINDLE_TYPE SPINDLE_TYPE_PWM #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 #define SPINDLE_ENABLE_PIN GPIO_NUM_22
*/ */

1
Grbl_Esp32/Machines/custom_machine_template.h
View File

@@ -1 +0,0 @@
// See template.h

2
Grbl_Esp32/Machines/espduino.h
View File

@@ -40,7 +40,7 @@
#define STEPPERS_DISABLE_PIN GPIO_NUM_12 #define STEPPERS_DISABLE_PIN GPIO_NUM_12
#define SPINDLE_TYPE SPINDLE_TYPE_PWM #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 #define SPINDLE_DIR_PIN GPIO_NUM_18

4
Grbl_Esp32/Machines/mpcnc_v1p1.h
View File

@@ -51,10 +51,10 @@
#ifdef USE_SPINDLE_RELAY #ifdef USE_SPINDLE_RELAY
#define SPINDLE_TYPE SPINDLE_TYPE_RELAY #define SPINDLE_TYPE SPINDLE_TYPE_RELAY
#define SPINDLE_PWM_PIN GPIO_NUM_17 #define SPINDLE_OUTPUT_PIN GPIO_NUM_17
#else #else
#define SPINDLE_TYPE SPINDLE_TYPE_PWM #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 #define SPINDLE_ENABLE_PIN GPIO_NUM_32
#endif #endif

4
Grbl_Esp32/Machines/mpcnc_v1p2.h
View File

@@ -52,10 +52,10 @@
#ifdef USE_SPINDLE_RELAY #ifdef USE_SPINDLE_RELAY
#define SPINDLE_TYPE SPINDLE_TYPE_RELAY #define SPINDLE_TYPE SPINDLE_TYPE_RELAY
#define SPINDLE_PWM_PIN GPIO_NUM_2 #define SPINDLE_OUTPUT_PIN GPIO_NUM_2
#else #else
#define SPINDLE_TYPE SPINDLE_TYPE_PWM #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 #define SPINDLE_ENABLE_PIN GPIO_NUM_32
#endif #endif

2
Grbl_Esp32/Machines/spi_daisy_4axis_xyyz.h
View File

@@ -79,7 +79,7 @@
#define COOLANT_MIST_PIN GPIO_NUM_21 #define COOLANT_MIST_PIN GPIO_NUM_21
#define SPINDLE_TYPE SPINDLE_TYPE_PWM #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 #define SPINDLE_ENABLE_PIN GPIO_NUM_4
// Relay operation // Relay operation

2
Grbl_Esp32/Machines/spi_daisy_4axis_xyz.h
View File

@@ -64,7 +64,7 @@
#define COOLANT_MIST_PIN GPIO_NUM_21 #define COOLANT_MIST_PIN GPIO_NUM_21
#define SPINDLE_TYPE SPINDLE_TYPE_PWM #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 #define SPINDLE_ENABLE_PIN GPIO_NUM_4
// Relay operation // Relay operation

39
Grbl_Esp32/Machines/spindle_test.h
View File

@@ -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 <http://www.gnu.org/licenses/>.
*/
#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

2
Grbl_Esp32/Machines/tmc2130_pen.h
View File

@@ -72,7 +72,7 @@
#else #else
#define SPINDLE_TYPE SPINDLE_TYPE_PWM #define SPINDLE_TYPE SPINDLE_TYPE_PWM
#define SPINDLE_PWM_PIN GPIO_NUM_27 #define SPINDLE_OUTPUT_PIN GPIO_NUM_27
#endif #endif
// #define X_LIMIT_PIN See version section at beginning of file // #define X_LIMIT_PIN See version section at beginning of file

2
Grbl_Esp32/machine.h
View File

@@ -8,7 +8,7 @@
// !!! For initial testing, start with test_drive.h which disables // !!! For initial testing, start with test_drive.h which disables
// all I/O pins // 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 // !!! For actual use, change the line above to select a board
// from Machines/, for example: // from Machines/, for example: