From 654cc166cfb271293c5ce076754723ad61be97d2 Mon Sep 17 00:00:00 2001 From: bdring Date: Thu, 13 Aug 2020 09:15:12 -0500 Subject: [PATCH] In Grbl.h Grbl.cpp renamed init() to grbl_init(). It was getting double called. --- Grbl_Esp32/Grbl_Esp32.ino | 2 +- Grbl_Esp32/src/Grbl.cpp | 2 +- Grbl_Esp32/src/Grbl.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/Grbl_Esp32/Grbl_Esp32.ino b/Grbl_Esp32/Grbl_Esp32.ino index 9003c614..9c907733 100644 --- a/Grbl_Esp32/Grbl_Esp32.ino +++ b/Grbl_Esp32/Grbl_Esp32.ino @@ -21,7 +21,7 @@ #include "src/Grbl.h" void setup() { - init(); + grbl_init(); } void loop() { diff --git a/Grbl_Esp32/src/Grbl.cpp b/Grbl_Esp32/src/Grbl.cpp index 636fe6f0..109ef878 100644 --- a/Grbl_Esp32/src/Grbl.cpp +++ b/Grbl_Esp32/src/Grbl.cpp @@ -21,7 +21,7 @@ #include "Grbl.h" #include -void init() { +void grbl_init() { #ifdef USE_I2S_OUT i2s_out_init(); // The I2S out must be initialized before it can access the expanded GPIO port #endif diff --git a/Grbl_Esp32/src/Grbl.h b/Grbl_Esp32/src/Grbl.h index e7f88bd7..8218d263 100644 --- a/Grbl_Esp32/src/Grbl.h +++ b/Grbl_Esp32/src/Grbl.h @@ -23,7 +23,7 @@ // Grbl versioning system #define GRBL_VERSION "1.3a" -#define GRBL_VERSION_BUILD "20200812" +#define GRBL_VERSION_BUILD "20200813" //#include #include @@ -95,7 +95,7 @@ # include "I2SOut.h" #endif -void init(); +void grbl_init(); void run_once(); // Called if USE_MACHINE_INIT is defined