From 414ce3528b5e242822052cbc4dee47a4fb30c69d Mon Sep 17 00:00:00 2001
From: bdring <barton.dring@gmail.com>
Date: Tue, 1 Oct 2019 11:14:02 -0500
Subject: [PATCH] Fixing more comiple issues with non default setups

---
 Grbl_Esp32/grbl.h            | 3 +--
 Grbl_Esp32/grbl_trinamic.cpp | 6 +-----
 Grbl_Esp32/grbl_trinamic.h   | 2 +-
 3 files changed, 3 insertions(+), 8 deletions(-)

diff --git a/Grbl_Esp32/grbl.h b/Grbl_Esp32/grbl.h
index 5fd7ed4a..6a694fdf 100644
--- a/Grbl_Esp32/grbl.h
+++ b/Grbl_Esp32/grbl.h
@@ -86,7 +86,6 @@
 #endif
 
 #ifdef USE_TRINAMIC
-	#include "grbl_trinamic.h" 
-	//#include "TMCStepper.h" // https://github.com/teemuatlut/TMCStepper
+	#include "grbl_trinamic.h"
 #endif
 
diff --git a/Grbl_Esp32/grbl_trinamic.cpp b/Grbl_Esp32/grbl_trinamic.cpp
index 0bdd8be1..a431ca3e 100644
--- a/Grbl_Esp32/grbl_trinamic.cpp
+++ b/Grbl_Esp32/grbl_trinamic.cpp
@@ -19,17 +19,13 @@
 	You should have received a copy of the GNU General Public License
 	along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
 */
+#include "grbl.h"
 
 #ifdef USE_TRINAMIC
 
-#include "grbl.h"
-
-
 // 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);
 
-
-
 #ifdef X_TRINAMIC
 	#ifdef X_DRIVER_TMC2130	
 		TMC2130Stepper TRINAMIC_X = TMC2130Stepper(X_CS_PIN, X_RSENSE);
diff --git a/Grbl_Esp32/grbl_trinamic.h b/Grbl_Esp32/grbl_trinamic.h
index d5360704..92239f49 100644
--- a/Grbl_Esp32/grbl_trinamic.h
+++ b/Grbl_Esp32/grbl_trinamic.h
@@ -22,9 +22,9 @@
 	#define GRBL_TRINAMIC_h
 
 #include "grbl.h"
-#include <TMCStepper.h> // https://github.com/teemuatlut/TMCStepper
 
 #ifdef USE_TRINAMIC
+	#include <TMCStepper.h> // https://github.com/teemuatlut/TMCStepper
 	void Trinamic_Init();
 #endif