mirror/Grbl_Esp32
1
0
Fork 0
mirror of https://github.com/bdring/Grbl_Esp32.git synced 2025-08-24 07:03:01 +02:00
Code Issues Releases Wiki Activity

Merge pull request #239 from bdring/Devt

Browse Source 
Added TMCStepper Lib Version to startup message
This commit is contained in:
bdring
2019-10-01 11:25:36 -05:00
committed by GitHub
parent 3f9bce0aa3 414ce3528b
commit 3f50a2d421
4 changed files with 10 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
Grbl_Esp32/grbl.h
View File

@@ -20,7 +20,7 @@
// Grbl versioning system // Grbl versioning system
#define GRBL_VERSION "1.1f" #define GRBL_VERSION "1.1f"
#define GRBL_VERSION_BUILD "20190928" #define GRBL_VERSION_BUILD "20191001"
//#include <sdkconfig.h> //#include <sdkconfig.h>
#include <Arduino.h> #include <Arduino.h>
@@ -86,7 +86,6 @@
#endif #endif
#ifdef USE_TRINAMIC #ifdef USE_TRINAMIC
#include "grbl_trinamic.h" #include "grbl_trinamic.h"
//#include "TMCStepper.h" // https://github.com/teemuatlut/TMCStepper
#endif #endif

8
Grbl_Esp32/grbl_trinamic.cpp
View File

@@ -19,9 +19,9 @@
You should have received a copy of the GNU General Public License You should have received a copy of the GNU General Public License
along with Grbl. If not, see <http://www.gnu.org/licenses/>. along with Grbl. If not, see <http://www.gnu.org/licenses/>.
*/ */
#include "grbl.h" #include "grbl.h"
#ifdef USE_TRINAMIC
// TODO try to use the #define ## method to clean this up // TODO try to use the #define ## method to clean this up
//#define DRIVER(driver, axis) driver##Stepper = TRINAMIC_axis## = driver##Stepper(axis##_CS_PIN, axis##_RSENSE); //#define DRIVER(driver, axis) driver##Stepper = TRINAMIC_axis## = driver##Stepper(axis##_CS_PIN, axis##_RSENSE);
@@ -102,7 +102,7 @@
void Trinamic_Init() void Trinamic_Init()
{ {
grbl_send(CLIENT_SERIAL, "[MSG:Using TMCStepper Library]\r\n"); grbl_sendf(CLIENT_SERIAL, "[MSG:Using TMCStepper Library Ver 0x%06x]\r\n", TMCSTEPPER_VERSION);
SPI.begin(); SPI.begin();
@@ -169,4 +169,6 @@ void Trinamic_Init()
#endif #endif
// TODO ABC Axes // TODO ABC Axes
} }
#endif

2
Grbl_Esp32/grbl_trinamic.h
View File

@@ -22,9 +22,9 @@
#define GRBL_TRINAMIC_h #define GRBL_TRINAMIC_h
#include "grbl.h" #include "grbl.h"
#include <TMCStepper.h> // https://github.com/teemuatlut/TMCStepper
#ifdef USE_TRINAMIC #ifdef USE_TRINAMIC
#include <TMCStepper.h> // https://github.com/teemuatlut/TMCStepper
void Trinamic_Init(); void Trinamic_Init();
#endif #endif

2
Grbl_Esp32/stepper.h
View File

@@ -82,8 +82,10 @@ extern uint8_t ganged_mode;
void IRAM_ATTR onSteppertimer(); void IRAM_ATTR onSteppertimer();
void IRAM_ATTR onStepperOffTimer(); void IRAM_ATTR onStepperOffTimer();
#ifdef USE_RMT_STEPS
void initRMT(); void initRMT();
inline IRAM_ATTR static void stepperRMT_Outputs(); inline IRAM_ATTR static void stepperRMT_Outputs();
#endif
void stepper_init(); void stepper_init();