Moved build configuration from CMakeLists.txt to my_machine.h.

More changes for ESP32-S3 compatibility, still work in progress but getting closer. Added support for third UART (serial port). Further updates for assigning optional signals to aux input ports.
grblHAL · Jan 12, 2024 · c29bde5 · c29bde5
1 parent 21111b1
commit c29bde5
Show file tree

Hide file tree

Showing 23 changed files with 3,460 additions and 791 deletions.
diff --git a/main/CMakeLists.txt b/main/CMakeLists.txt
diff --git a/main/bluetooth.c b/main/bluetooth.c
@@ -5,7 +5,7 @@
 
   Part of grblHAL
 
-  Copyright (c) 2018-2023 Terje Io
+  Copyright (c) 2018-2024 Terje Io
 
   Some parts of the code is based on example code by Espressif, in the public domain
 
@@ -23,6 +23,10 @@
   along with Grbl.  If not, see <http://www.gnu.org/licenses/>.
 */
 
+#include "driver.h"
+
+#if BLUETOOTH_ENABLE == 1
+
 #include <stdint.h>
 #include <string.h>
 #include <stdbool.h>
@@ -39,7 +43,6 @@
 #include "esp_bt_device.h"
 #include "esp_spp_api.h"
 
-#include "driver.h"
 #include "bluetooth.h"
 #include "grbl/grbl.h"
 #include "grbl/report.h"
@@ -625,8 +628,6 @@ bool bluetooth_disable_local (void)
     return true;
 }
 
-#if BLUETOOTH_ENABLE
-
 static const setting_group_detail_t bluetooth_groups [] = {
     { Group_Root, Group_Bluetooth, "Bluetooth"},
 };

diff --git a/main/boards/BlackBoxX32_map.h b/main/boards/BlackBoxX32_map.h
@@ -103,15 +103,14 @@
 #define COOLANT_FLOOD_PIN   GPIO_NUM_21 // coolant
 //#define COOLANT_MIST_PIN  GPIO_NUM_21 // or mist
 
+#define AUXINPUT0_PIN       GPIO_NUM_0 // Mode button on front panel
+#define AUXINPUT1_PIN       GPIO_NUM_16
+
 // Define user-control CONTROLs (cycle start, reset, feed hold) input pins.
 #if SAFETY_DOOR_ENABLE
-  #define SAFETY_DOOR_PIN   GPIO_NUM_16
-#else
-  #define AUXINPUT1_PIN     GPIO_NUM_16
+  #define SAFETY_DOOR_PIN   AUXINPUT1_PIN
 #endif
 
-#define AUXINPUT0_PIN       GPIO_NUM_0 // Mode button on front panel
-
 // Pin mapping when using SPI mode.
 // With this mapping, SD card can be used both in SPI and 1-line SD mode.
 // Note that a pull-up on CS line is required in SD mode.

diff --git a/main/boards/bdring_i2s_6_axis_map.h b/main/boards/bdring_i2s_6_axis_map.h
@@ -5,7 +5,7 @@
 
   Part of grblHAL
 
-  Copyright (c) 2020-2023 Terje Io
+  Copyright (c) 2020-2024 Terje Io
 
   Grbl is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

diff --git a/main/boards/bdring_i2s_6pack_ext_v2_map.h b/main/boards/bdring_i2s_6pack_ext_v2_map.h
@@ -5,7 +5,7 @@
 
   Part of grblHAL
 
-  Copyright (c) 2020-2023 Terje Io
+  Copyright (c) 2020-2024 Terje Io
 
   Grbl is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by

diff --git a/main/boards/bdring_v3.5_map.h b/main/boards/bdring_v3.5_map.h
@@ -5,7 +5,7 @@
 
   Part of grblHAL
 
-  Copyright (c) 2020-2022 Terje Io
+  Copyright (c) 2020-2024 Terje Io
 
   Grbl is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -56,17 +56,19 @@
 // Define driver spindle pins
 
 #if DRIVER_SPINDLE_PWM_ENABLE
-#define SPINDLE_PWM_PIN         GPIO_NUM_17
+#define SPINDLE_PWM_PIN     GPIO_NUM_17
 #else
-#define AUXOUTPUT0_PIN          GPIO_NUM_17
+#define AUXOUTPUT0_PIN      GPIO_NUM_17
 #endif
 
 #if DRIVER_SPINDLE_ENABLE
-#define SPINDLE_ENABLE_PIN      GPIO_NUM_22
+#define SPINDLE_ENABLE_PIN  GPIO_NUM_22
 #else
-#define AUXOUTPUT1_PIN          GPIO_NUM_22
+#define AUXOUTPUT1_PIN      GPIO_NUM_22
 #endif
 
+#define AUXINPUT0_PIN       GPIO_NUM_35
+
 // Define flood and mist coolant enable output pins.
 
 // N/A
@@ -76,7 +78,7 @@
 #define FEED_HOLD_PIN       GPIO_NUM_36
 #define CYCLE_START_PIN     GPIO_NUM_39
 #if SAFETY_DOOR_ENABLE
-#define SAFETY_DOOR_PIN     GPIO_NUM_35
+#define SAFETY_DOOR_PIN     AUXINPUT0_PIN
 #endif
 
 // Define probe switch input pin.
@@ -97,4 +99,3 @@
 #if KEYPAD_ENABLE
 #error No free pins for keypad!
 #endif
-
diff --git a/main/boards/bdring_v4_map.h b/main/boards/bdring_v4_map.h
@@ -5,7 +5,7 @@
 
   Part of grblHAL
 
-  Copyright (c) 2020-2023 Terje Io
+  Copyright (c) 2020-2024 Terje Io
 
   Grbl is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -59,6 +59,8 @@
 #define SPINDLE_ENABLE_PIN  GPIO_NUM_22
 #endif
 
+#define AUXINPUT0_PIN       GPIO_NUM_35
+
 // Define flood and mist coolant enable output pins.
 
 #define COOLANT_FLOOD_PIN   GPIO_NUM_25
@@ -71,7 +73,7 @@
 #define FEED_HOLD_PIN       GPIO_NUM_36
 #define CYCLE_START_PIN     GPIO_NUM_39
 #if SAFETY_DOOR_ENABLE
-#define SAFETY_DOOR_PIN     GPIO_NUM_35
+#define SAFETY_DOOR_PIN     AUXINPUT0_PIN
 #endif
 
 // Define probe switch input pin.
@@ -92,7 +94,7 @@
 #if MODBUS_ENABLE & MODBUS_RTU_ENABLED
 #define UART2_RX_PIN            GPIO_NUM_22
 #define UART2_TX_PIN            GPIO_NUM_21
-#if RS485_DIR_ENABLE
+#if MODBUS_ENABLE & MODBUS_RTU_DIR_ENABLED
 #define MODBUS_DIRECTION_PIN    GPIO_NUM_2
 #endif
 #endif

diff --git a/main/boards/cnc_boosterpack_map.h b/main/boards/cnc_boosterpack_map.h
@@ -5,7 +5,7 @@
 
   Part of grblHAL
 
-  Copyright (c) 2020-2023 Terje Io
+  Copyright (c) 2020-2024 Terje Io
 
   Grbl is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -90,12 +90,14 @@
 #define COOLANT_FLOOD_PIN       IOEXPAND
 #define COOLANT_MIST_PIN        IOEXPAND
 
+#define AUXINPUT1_PIN           GPIO_NUM_34
+
 // Define user-control CONTROLs (cycle start, reset, feed hold) input pins.
 #define RESET_PIN               GPIO_NUM_35
 #define FEED_HOLD_PIN           GPIO_NUM_39
 #define CYCLE_START_PIN         GPIO_NUM_36
 #if SAFETY_DOOR_ENABLE
-#define SAFETY_DOOR_PIN         GPIO_NUM_34
+#define SAFETY_DOOR_PIN         AUXINPUT1_PIN
 #endif
 
 // Define probe switch input pin.
@@ -110,7 +112,7 @@
 #if MODBUS_ENABLE & MODBUS_RTU_ENABLED
 #define UART2_RX_PIN            GPIO_NUM_33
 #define UART2_TX_PIN            GPIO_NUM_25
-#if RS485_DIR_ENABLE
+#if MODBUS_ENABLE & MODBUS_RTU_DIR_ENABLED
 #define MODBUS_DIRECTION_PIN    GPIO_NUM_25
 #endif
 #endif

diff --git a/main/boards/cnc_boosterpack_s3_map.h b/main/boards/cnc_boosterpack_s3_map.h
@@ -5,7 +5,7 @@
 
   Part of grblHAL
 
-  Copyright (c)2023 Terje Io
+  Copyright (c)2023-2024 Terje Io
 
   Grbl is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -81,6 +81,8 @@
 #define SPINDLE_ENABLE_PIN      IOEXPAND
 #endif
 
+#define AUXINPUT1_PIN           GPIO_NUM_34
+
 // Define flood and mist coolant enable output pins.
 #define COOLANT_FLOOD_PIN       IOEXPAND
 #define COOLANT_MIST_PIN        IOEXPAND
@@ -90,7 +92,7 @@
 #define FEED_HOLD_PIN           GPIO_NUM_39
 #define CYCLE_START_PIN         GPIO_NUM_36
 #if SAFETY_DOOR_ENABLE
-#define SAFETY_DOOR_PIN         GPIO_NUM_34
+#define SAFETY_DOOR_PIN         AUXINPUT1_PIN
 #endif
 
 // Define probe switch input pin.
@@ -105,7 +107,7 @@
 #if MODBUS_ENABLE & MODBUS_RTU_ENABLED
 #define UART2_RX_PIN            GPIO_NUM_33
 #define UART2_TX_PIN            GPIO_NUM_25
-#if RS485_DIR_ENABLE
+#if MODBUS_ENABLE & MODBUS_RTU_DIR_ENABLED
 #define MODBUS_DIRECTION_PIN    GPIO_NUM_25
 #endif
 #endif

diff --git a/main/boards/mks_tinybee_1_0_map.h b/main/boards/mks_tinybee_1_0_map.h
@@ -6,7 +6,7 @@
   Part of grblHAL
 
   Copyright (c) 2022 Ennio Sesana
-  Copyright (c) 2023 Terje Io (added SD card, ModBus and MPG options)
+  Copyright (c) 2023-2024 Terje Io (added SD card, ModBus and MPG options)
 
   Grbl is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as published by
@@ -28,9 +28,13 @@
 #define USE_I2S_OUT
 #define I2S_OUT_PIN_BASE 64
 
+#define SERIAL2_ENABLE      1
+#define UART2_RX_PIN        GPIO_NUM_16 // EXP_1
+#define UART2_TX_PIN        GPIO_NUM_17 // EXP_1
+
 // timer definitions
-#define STEP_TIMER_GROUP TIMER_GROUP_0
-#define STEP_TIMER_INDEX TIMER_0
+#define STEP_TIMER_GROUP    TIMER_GROUP_0
+#define STEP_TIMER_INDEX    TIMER_0
 
 #define I2S_OUT_BCK         GPIO_NUM_25
 #define I2S_OUT_WS          GPIO_NUM_26
@@ -113,16 +117,9 @@
 #define PROBE_PIN               GPIO_NUM_35 // MT_DET
 #endif
 
-#if MODBUS_ENABLE & MODBUS_RTU_ENABLED
-#define UART2_RX_PIN            GPIO_NUM_16 // EXP_1
-#define UART2_TX_PIN            GPIO_NUM_17 // EXP_1
 #if MODBUS_ENABLE & MODBUS_RTU_DIR_ENABLED
 #define MODBUS_DIRECTION_PIN    GPIO_NUM_13 // EXP_1
-#endif
-#endif
-
-#if MPG_MODE == 1
-#define UART2_RX_PIN            GPIO_NUM_16 // EXP_1
+#elif MPG_MODE == 1
 #define MPG_ENABLE_PIN          GPIO_NUM_13 // EXP_1
 #endif
 

diff --git a/main/boards/xPro_v5_map.h b/main/boards/xPro_v5_map.h
@@ -72,26 +72,23 @@
 #define AUXOUTPUT1_PIN      GPIO_NUM_4
 #endif
 
+#define AUXINPUT0_PIN       GPIO_NUM_13
+#define AUXINPUT1_PIN       GPIO_NUM_0
+
 // Define flood and mist coolant enable output pins.
 // Only one can be enabled!
 
 #define COOLANT_MIST_PIN    GPIO_NUM_21
 //#define COOLANT_FLOOD_PIN   GPIO_NUM_21
 // Define user-control CONTROLs (cycle start, reset, feed hold) input pins.
-#if SAFETY_DOOR_ENABLE
-#define SAFETY_DOOR_PIN     GPIO_NUM_16
-#else
-#define RESET_PIN           GPIO_NUM_16 //??
-#endif
+
+#define RESET_PIN           GPIO_NUM_16
 
 // Define probe switch input pin.
 #if PROBE_ENABLE
 #define PROBE_PIN           GPIO_NUM_22
 #endif
 
-#define AUXINPUT0_PIN       GPIO_NUM_13
-#define AUXINPUT1_PIN       GPIO_NUM_0
-
 // Pin mapping when using SPI mode.
 // With this mapping, SD card can be used both in SPI and 1-line SD mode.
 // Note that a pull-up on CS line is required in SD mode.