bdring
diff --git a/‎Grbl_Esp32/src/Config.h‎
Lines changed: 1 addition & 3 deletions b/‎Grbl_Esp32/src/Config.h‎
Lines changed: 1 addition & 3 deletions
diff --git a/‎Grbl_Esp32/src/GCode.cpp‎
Lines changed: 10 additions & 5 deletions b/‎Grbl_Esp32/src/GCode.cpp‎
Lines changed: 10 additions & 5 deletions
diff --git a/‎Grbl_Esp32/src/Grbl.h‎
Lines changed: 1 addition & 1 deletion b/‎Grbl_Esp32/src/Grbl.h‎
Lines changed: 1 addition & 1 deletion
diff --git a/‎Grbl_Esp32/src/Machines/TMC2209_4x.h‎
Lines changed: 89 additions & 0 deletions b/‎Grbl_Esp32/src/Machines/TMC2209_4x.h‎
Lines changed: 89 additions & 0 deletions
diff --git a/‎Grbl_Esp32/src/Machines/template.h‎
Lines changed: 0 additions & 233 deletions b/‎Grbl_Esp32/src/Machines/template.h‎
Lines changed: 0 additions & 233 deletions
diff --git a/‎Grbl_Esp32/src/MotionControl.cpp‎
Lines changed: 3 additions & 3 deletions b/‎Grbl_Esp32/src/MotionControl.cpp‎
Lines changed: 3 additions & 3 deletions
@@ -47,7 +47,7 @@ Some features should not be changed. See notes below.
 // that the machine file might choose to undefine.
 
 // Note: HOMING_CYCLES are now settings
-#define SUPPORT_TASK_CORE  1 // Reference: CONFIG_ARDUINO_RUNNING_CORE = 1
+#define SUPPORT_TASK_CORE 1  // Reference: CONFIG_ARDUINO_RUNNING_CORE = 1
 
 // Inverts pin logic of the control command pins based on a mask. This essentially means you can use
 // normally-closed switches on the specified pins, rather than the default normally-open switches.
@@ -87,8 +87,6 @@ const int MAX_N_AXIS = 6;
 #    define LIMIT_MASK B0
 #endif
 
-#define GRBL_MSG_LEVEL MsgLevel::Info  // what level of [MSG:....] do you want to see 0=all off
-
 // Serial baud rate
 // OK to change, but the ESP32 boot text is 115200, so you will not see that is your
 // serial monitor, sender, etc uses a different value than 115200
 
@@ -1401,10 +1401,11 @@ Error gc_execute_line(char* line, uint8_t client) {
     if ((gc_block.modal.io_control == IoControl::DigitalOnSync) || (gc_block.modal.io_control == IoControl::DigitalOffSync) ||
         (gc_block.modal.io_control == IoControl::DigitalOnImmediate) || (gc_block.modal.io_control == IoControl::DigitalOffImmediate)) {
         if (gc_block.values.p < MaxUserDigitalPin) {
-            if (!sys_io_control(
-                    bit((int)gc_block.values.p),
-                    (gc_block.modal.io_control == IoControl::DigitalOnSync) || (gc_block.modal.io_control == IoControl::DigitalOnImmediate),
-                    (gc_block.modal.io_control == IoControl::DigitalOnSync) || (gc_block.modal.io_control == IoControl::DigitalOffSync))) {
+            if ((gc_block.modal.io_control == IoControl::DigitalOnSync) || (gc_block.modal.io_control == IoControl::DigitalOffSync)) {
+                protocol_buffer_synchronize();
+            }
+            bool turnOn = gc_block.modal.io_control == IoControl::DigitalOnSync || gc_block.modal.io_control == IoControl::DigitalOnImmediate;
+            if (!sys_set_digital((int)gc_block.values.p, turnOn)) {
                 FAIL(Error::PParamMaxExceeded);
             }
         } else {
@@ -1414,8 +1415,12 @@ Error gc_execute_line(char* line, uint8_t client) {
     if ((gc_block.modal.io_control == IoControl::SetAnalogSync) || (gc_block.modal.io_control == IoControl::SetAnalogImmediate)) {
         if (gc_block.values.e < MaxUserDigitalPin) {
             gc_block.values.q = constrain(gc_block.values.q, 0.0, 100.0);  // force into valid range
-            if (!sys_pwm_control(bit((int)gc_block.values.e), gc_block.values.q, (gc_block.modal.io_control == IoControl::SetAnalogSync)))
+            if (gc_block.modal.io_control == IoControl::SetAnalogSync) {
+                protocol_buffer_synchronize();
+            }
+            if (!sys_set_analog((int)gc_block.values.e, gc_block.values.q)) {
                 FAIL(Error::PParamMaxExceeded);
+            }
         } else {
             FAIL(Error::PParamMaxExceeded);
         }
 
@@ -23,7 +23,7 @@
 // Grbl versioning system
 
 const char* const GRBL_VERSION       = "1.3a";
-const char* const GRBL_VERSION_BUILD = "20201212";
+const char* const GRBL_VERSION_BUILD = "20210203";
 
 //#include <sdkconfig.h>
 #include <Arduino.h>
 
@@ -0,0 +1,89 @@
+#pragma once
+// clang-format off
+
+/*
+    TMC2209_4x.h
+    https://github.com/FYSETC/FYSETC-E4
+
+    2020-12-29 B. Dring
+
+    This is a machine definition file to use the FYSTEC E4 3D Printer controller
+    This is a 4 motor controller. This is setup for XYZA, but XYYZ, could also be used.
+    There are 5 inputs
+    The controller has outputs for a Fan, Hotbed and Extruder. There are mapped to
+    spindle, mist and flood coolant to drive an external relay.
+
+    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            "TMC2209 4x Controller"
+
+#define N_AXIS 4
+
+#define TRINAMIC_UART_RUN_MODE       TrinamicUartMode :: StealthChop
+#define TRINAMIC_UART_HOMING_MODE    TrinamicUartMode :: StallGuard
+
+#define TMC_UART                UART_NUM_1
+#define TMC_UART_RX             GPIO_NUM_21
+#define TMC_UART_TX             GPIO_NUM_22   
+
+#define X_TRINAMIC_DRIVER       2209
+#define X_STEP_PIN              GPIO_NUM_26
+#define X_DIRECTION_PIN         GPIO_NUM_27
+#define X_RSENSE                TMC2209_RSENSE_DEFAULT
+#define X_DRIVER_ADDRESS        0
+#define DEFAULT_X_MICROSTEPS    16
+
+#define Y_TRINAMIC_DRIVER       2209
+#define Y_STEP_PIN              GPIO_NUM_33
+#define Y_DIRECTION_PIN         GPIO_NUM_32
+#define Y_RSENSE                TMC2209_RSENSE_DEFAULT
+#define Y_DRIVER_ADDRESS        1
+#define DEFAULT_Y_MICROSTEPS    16
+
+#define Z_TRINAMIC_DRIVER       2209
+#define Z_STEP_PIN              GPIO_NUM_2
+#define Z_DIRECTION_PIN         GPIO_NUM_4
+#define Z_RSENSE                TMC2209_RSENSE_DEFAULT
+#define Z_DRIVER_ADDRESS        2
+#define DEFAULT_Z_MICROSTEPS    16
+
+#define A_TRINAMIC_DRIVER       2209
+#define A_STEP_PIN              GPIO_NUM_16
+#define A_DIRECTION_PIN         GPIO_NUM_17
+#define A_RSENSE                TMC2209_RSENSE_DEFAULT
+#define A_DRIVER_ADDRESS        3
+#define DEFAULT_A_MICROSTEPS    16
+
+#define X_LIMIT_PIN             GPIO_NUM_36
+#define Y_LIMIT_PIN             GPIO_NUM_39
+#define Z_LIMIT_PIN             GPIO_NUM_34
+#define PROBE_PIN               GPIO_NUM_35
+
+// OK to comment out to use pin for other features
+#define STEPPERS_DISABLE_PIN    GPIO_NUM_25
+
+
+// https://github.com/bdring/6-Pack_CNC_Controller/wiki/4x-5V-Buffered-Output-Module
+// https://github.com/bdring/6-Pack_CNC_Controller/wiki/Quad-MOSFET-Module
+#define USER_DIGITAL_PIN_0      GPIO_NUM_14 //  M62 M63
+#define USER_DIGITAL_PIN_1      GPIO_NUM_13 //  M62 M63
+#define USER_DIGITAL_PIN_2      GPIO_NUM_15 //  M62 M63
+#define USER_DIGITAL_PIN_3      GPIO_NUM_12 //  M62 M63
+
+
+// ===================== defaults ======================
+// https://github.com/bdring/Grbl_Esp32/wiki/Setting-Defaults
+
+#define DEFAULT_INVERT_PROBE_PIN 1
@@ -505,11 +505,11 @@ void mc_reset() {
         coolant_stop();
 
         // turn off all User I/O immediately
-        sys_io_control(0xFF, LOW, false);
-        sys_pwm_control(0xFF, 0, false);
+        sys_digital_all_off();
+        sys_analog_all_off();
 #ifdef ENABLE_SD_CARD
         // do we need to stop a running SD job?
-        if (get_sd_state(false) == SDCARD_BUSY_PRINTING) {
+        if (get_sd_state(false) == SDState::BusyPrinting) {
             //Report print stopped
             report_feedback_message(Message::SdFileQuit);
             closeFile();