Updated to support the enhanced ioPorts interface and using the new t…

…ask scheduler for debouncing etc. Moved probe and safety door inputs to ioPorts pin pool.
grblHAL · Feb 23, 2024 · 61544b2 · 61544b2
1 parent 3935fbd
commit 61544b2
Show file tree

Hide file tree

Showing 24 changed files with 655 additions and 699 deletions.
diff --git a/main/boards/BlackBoxX32_map.h b/main/boards/BlackBoxX32_map.h
@@ -7,18 +7,18 @@
 
   Copyright (c) 2022 Peter van der Walt
 
-  Grbl is free software: you can redistribute it and/or modify
+  grblHAL 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,
+  grblHAL 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
+  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.  If not, see <http://www.gnu.org/licenses/>.
+  along with grblHAL. If not, see <http://www.gnu.org/licenses/>.
 
   Pin Definitions for the OpenBuilds BlackBox X32 Controller from https://openbuilds.com
 
@@ -80,12 +80,6 @@
 #define Y_LIMIT_PIN           GPIO_NUM_34
 #define Z_LIMIT_PIN           GPIO_NUM_39
 
-// Define probe switch input pin.
-// NOTE: probe input is not available when an auto-squared axis is enabled.
-#if PROBE_ENABLE
-  #define PROBE_PIN           GPIO_NUM_22
-#endif
-
 // Define driver spindle pins
 
 #if DRIVER_SPINDLE_PWM_ENABLE
@@ -111,10 +105,16 @@
 #define COOLANT_FLOOD_PIN   GPIO_NUM_21 // coolant
 //#define COOLANT_MIST_PIN  GPIO_NUM_21 // or mist
 
+// Define user-control CONTROLs (cycle start, reset, feed hold) input pins.
+
 #define AUXINPUT0_PIN       GPIO_NUM_0 // Mode button on front panel
 #define AUXINPUT1_PIN       GPIO_NUM_16
+#define AUXINPUT2_PIN       GPIO_NUM_22
+
+#if PROBE_ENABLE
+ #define PROBE_PIN          AUXINPUT2_PIN
+#endif
 
-// Define user-control CONTROLs (cycle start, reset, feed hold) input pins.
 #if SAFETY_DOOR_ENABLE
   #define SAFETY_DOOR_PIN   AUXINPUT1_PIN
 #endif

diff --git a/main/boards/bdring_i2s_6_axis_map.h b/main/boards/bdring_i2s_6_axis_map.h
@@ -7,18 +7,18 @@
 
   Copyright (c) 2020-2024 Terje Io
 
-  Grbl is free software: you can redistribute it and/or modify
+  grblHAL 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,
+  grblHAL 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
+  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.  If not, see <http://www.gnu.org/licenses/>.
+  along with grblHAL. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #define BOARD_NAME "BDRING 6-axis I2S"
@@ -121,6 +121,12 @@
 
 // N/A
 
+#define AUXINPUT0_PIN           GPIO_NUM_25
+
+#if PROBE_ENABLE
+#define PROBE_PIN               AUXINPUT0_PIN
+#endif
+
 #if TRINAMIC_SPI_ENABLE
 #define MOTOR_CS_PIN            I2SO(3)
 #endif
@@ -133,8 +139,5 @@
 #endif
 #endif
 
-// Define probe switch input pin.
-#if PROBE_ENABLE
-#define PROBE_PIN               GPIO_NUM_25
-#endif
+
 
diff --git a/main/boards/bdring_i2s_6pack_ext_v2_map.h b/main/boards/bdring_i2s_6pack_ext_v2_map.h
@@ -7,18 +7,18 @@
 
   Copyright (c) 2020-2024 Terje Io
 
-  Grbl is free software: you can redistribute it and/or modify
+  grblHAL 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,
+  grblHAL 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
+  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.  If not, see <http://www.gnu.org/licenses/>.
+  along with grblHAL. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #define BOARD_NAME "BDRING 6-Pack External drives V2.0"
@@ -116,6 +116,12 @@
 
 // N/A
 
+#define AUXINPUT0_PIN           GPIO_NUM_25
+
+#if PROBE_ENABLE
+#define PROBE_PIN               AUXINPUT0_PIN
+#endif
+
 #ifdef ADD_SERIAL2
 #define UART2_RX_PIN            GPIO_NUM_15
 #define UART2_TX_PIN            GPIO_NUM_14
@@ -124,11 +130,6 @@
 #endif
 #endif
 
-// Define probe switch input pin.
-#if PROBE_ENABLE
-#define PROBE_PIN               GPIO_NUM_25
-#endif
-
 #if KEYPAD_ENABLE
 #error No free pins for keypad!
 #endif
diff --git a/main/boards/bdring_v3.5_map.h b/main/boards/bdring_v3.5_map.h
@@ -7,18 +7,18 @@
 
   Copyright (c) 2020-2024 Terje Io
 
-  Grbl is free software: you can redistribute it and/or modify
+  grblHAL 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,
+  grblHAL 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
+  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.  If not, see <http://www.gnu.org/licenses/>.
+  along with grblHAL. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #if N_ABC_MOTORS > 0
@@ -67,8 +67,6 @@
 #define AUXOUTPUT1_PIN      GPIO_NUM_22
 #endif
 
-#define AUXINPUT0_PIN       GPIO_NUM_35
-
 // Define flood and mist coolant enable output pins.
 
 // N/A
@@ -77,13 +75,16 @@
 #define RESET_PIN           GPIO_NUM_34
 #define FEED_HOLD_PIN       GPIO_NUM_36
 #define CYCLE_START_PIN     GPIO_NUM_39
-#if SAFETY_DOOR_ENABLE
-#define SAFETY_DOOR_PIN     AUXINPUT0_PIN
-#endif
 
-// Define probe switch input pin.
+#define AUXINPUT0_PIN       GPIO_NUM_35
+#define AUXINPUT1_PIN       GPIO_NUM_32
+
 #if PROBE_ENABLE
-#define PROBE_PIN           GPIO_NUM_32
+#define PROBE_PIN           AUXINPUT1_PIN
+#endif
+
+#if SAFETY_DOOR_ENABLE
+#define SAFETY_DOOR_PIN     AUXINPUT0_PIN
 #endif
 
 #if SDCARD_ENABLE

diff --git a/main/boards/bdring_v4_map.h b/main/boards/bdring_v4_map.h
@@ -7,18 +7,18 @@
 
   Copyright (c) 2020-2024 Terje Io
 
-  Grbl is free software: you can redistribute it and/or modify
+  grblHAL 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,
+  grblHAL 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
+  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.  If not, see <http://www.gnu.org/licenses/>.
+  along with grblHAL. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #if N_ABC_MOTORS > 0
@@ -63,8 +63,6 @@
 #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
@@ -76,13 +74,16 @@
 #define RESET_PIN           GPIO_NUM_34
 #define FEED_HOLD_PIN       GPIO_NUM_36
 #define CYCLE_START_PIN     GPIO_NUM_39
-#if SAFETY_DOOR_ENABLE
-#define SAFETY_DOOR_PIN     AUXINPUT0_PIN
-#endif
 
-// Define probe switch input pin.
+#define AUXINPUT0_PIN       GPIO_NUM_35
+#define AUXINPUT1_PIN       GPIO_NUM_32
+
 #if PROBE_ENABLE
-#define PROBE_PIN           GPIO_NUM_32
+#define PROBE_PIN           AUXINPUT1_PIN
+#endif
+
+#if SAFETY_DOOR_ENABLE
+#define SAFETY_DOOR_PIN     AUXINPUT0_PIN
 #endif
 
 #if SDCARD_ENABLE

diff --git a/main/boards/cnc3040_map.h b/main/boards/cnc3040_map.h
@@ -5,20 +5,20 @@
 
   Part of grblHAL
 
-  Copyright (c) 2021-2022 Terje Io
+  Copyright (c) 2021-2024 Terje Io
 
-  Grbl is free software: you can redistribute it and/or modify
+  grblHAL 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,
+  grblHAL 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
+  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.  If not, see <http://www.gnu.org/licenses/>.
+  along with grblHAL. If not, see <http://www.gnu.org/licenses/>.
 */
 
 #if N_ABC_MOTORS > 1
@@ -73,15 +73,15 @@
 // Define driver spindle pins
 
 #if DRIVER_SPINDLE_PWM_ENABLE
-#define SPINDLE_PWM_PIN         GPIO_NUM_21
+#define SPINDLE_PWM_PIN     GPIO_NUM_21
 #else
-#define AUXOUTPUT0_PIN          GPIO_NUM_21
+#define AUXOUTPUT0_PIN      GPIO_NUM_21
 #endif
 
 #if DRIVER_SPINDLE_ENABLE
-#define SPINDLE_ENABLE_PIN      GPIO_NUM_2
+#define SPINDLE_ENABLE_PIN  GPIO_NUM_2
 #else
-#define AUXOUTPUT1_PIN          GPIO_NUM_2
+#define AUXOUTPUT1_PIN      GPIO_NUM_2
 #endif
 
 // Define flood and mist coolant enable output pins.
@@ -92,14 +92,13 @@
 // Define user-control CONTROLs (cycle start, reset, feed hold) input pins.
 // N/A
 
-// Define probe switch input pin.
+#define AUXINPUT0_PIN       GPIO_NUM_35  // ATC Door
+#define AUXINPUT1_PIN       GPIO_NUM_25
+
 #if PROBE_ENABLE
-#define PROBE_PIN           GPIO_NUM_19
+#define PROBE_PIN           AUXINPUT1_PIN
 #endif
 
 #if SAFETY_DOOR_ENABLE
-#define SAFETY_DOOR_PIN     GPIO_NUM_35  // ATC Door
-#else
-#define AUXINPUT0_PIN       GPIO_NUM_35  // ATC Door
+#define SAFETY_DOOR_PIN     AUXINPUT0_PIN  // ATC Door
 #endif
-