Skip to content

Commit

Permalink
Merge branch 'master' into Bdring-6x
Browse files Browse the repository at this point in the history
  • Loading branch information
@kevindt
kevindt authored Mar 12, 2024
2 parents fa74104 + fa7b919 commit 9421f14
Show file tree
Hide file tree
Showing 35 changed files with 1,361 additions and 1,250 deletions.
97 changes: 67 additions & 30 deletions driver.json
View file
Original file line number Diff line number Diff line change
@@ -1,14 +1,17 @@
{
"caps": {
"informal": 1,
"axes": 6,
"uart": 1,
"serial_ports": 1,
"serial_ports": 3,
"sdcard": 1,
"littlefs": 1,
"probe": 1,
"safety_door": 1,
"estop": 1,
"wifi": 1,
"bluetooth": 1,
"neopixels": 1,
"pwm_spindle_aux": 3,
"pio_board": "esp32dev",
"plugins": [
Expand Down Expand Up @@ -50,7 +53,10 @@
"auto_square": 1,
"digital_in": 2,
"safety_door": 1,
"sdcard": 1
"serial_ports": 1,
"sdcard": 1,
"wifi": 1,
"bluetooth": 1
},
"symbols": {
"DEFAULT_LIMIT_SIGNALS_INVERT_MASK": "N_AXIS",
Expand All @@ -71,8 +77,8 @@
"serial_ports": 2,
"trinamic_spi_cs": 1,
"trinamic_spi_chain": 1,
"trinamic_uart_n": 0,
"trinamic_uart_addr": 0
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -86,8 +92,26 @@
"safety_door": 0,
"sdcard": 1,
"probe": 1,
"pwm_spindle_aux": 2,
"wifi": 1,
"bluetooth": 1
}
},
{
"name": "MKS DLC32 2.0",
"symbol": "BOARD_MKS_DLC32_V2P0",
"URL": "https://github.com/makerbase-mks/MKS-DLC32",
"MAP": "main/boards/mks_dlc32_2_0_map.h",
"caps": {
"axes": 3,
"digital_in": 1,
"digital_out": 4,
"safety_door": 0,
"pwm_spindle_aux": 2
"serial_ports": 1,
"pwm_spindle_aux": 2,
"sdcard": 1,
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -97,9 +121,12 @@
"MAP": "main/boards/mks_tinybee_1_0_map.h",
"caps": {
"axes": 5,
"auto_square": 2,
"serial_ports": 2,
"sdcard": 1,
"estop": 0
"estop": 0,
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -112,7 +139,10 @@
"auto_square": 0,
"safety_door": 0,
"estop": 0,
"pwm_spindle_aux": 1
"serial_ports": 1,
"pwm_spindle_aux": 1,
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -124,7 +154,10 @@
"axes": 4,
"auto_square": 0,
"safety_door": 0,
"estop": 0
"estop": 0,
"serial_ports": 1,
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -134,7 +167,10 @@
"MAP": "main/boards/protoneer_3.xx_map.h",
"caps": {
"axes": 3,
"pwm_spindle_aux": 2
"pwm_spindle_aux": 2,
"serial_ports": 1,
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -147,7 +183,10 @@
"auto_square": 0,
"pwm_spindle_aux": 2,
"sdcard": 1,
"i2c": 1
"i2c": 1,
"serial_ports": 1,
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -161,21 +200,9 @@
"serial_ports": 2,
"sdcard": 1,
"trinamic": 5160,
"trinamic_spi_chain": 1
}
},
{
"name": "MKS DLC32 2.0",
"symbol": "BOARD_MKS_DLC32_V2P0",
"URL": "https://github.com/makerbase-mks/MKS-DLC32",
"MAP": "main/boards/mks_dlc32_2_0_map.h",
"caps": {
"axes": 3,
"digital_in": 1,
"digital_out": 4,
"pwm_spindle_aux": 2,
"sdcard": 1,
"i2c": 1
"trinamic_spi_chain": 1,
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -189,7 +216,9 @@
"digital_in": 1,
"serial_ports": 2,
"estop": 0,
"sdcard": 1
"sdcard": 1,
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -203,7 +232,9 @@
"digital_in": 1,
"serial_ports": 2,
"estop": 0,
"sdcard": 1
"sdcard": 1,
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -229,7 +260,9 @@
"axes": 3,
"digital_in": 1,
"serial_ports": 1,
"sdcard": 1
"sdcard": 1,
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -241,7 +274,9 @@
"axes": 3,
"serial_ports": 2,
"digital_in": 1,
"sdcard": 1
"sdcard": 1,
"wifi": 1,
"bluetooth": 1
}
},
{
Expand All @@ -256,7 +291,9 @@
"eeprom": 1,
"fram": 1,
"i2c": 1,
"sdcard": 1
"sdcard": 1,
"wifi": 1,
"bluetooth": 1
}
}
]
Expand Down
42 changes: 19 additions & 23 deletions main/boards/BlackBoxX32_map.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -28,6 +28,14 @@
#error "Axis configuration is not supported!"
#endif

#if KEYPAD_ENABLE == 1
#error No free pins for I2C keypad!
#endif

#if TRINAMIC_ENABLE
#error BlackBox X32 does not use Trinamic drivers
#endif

#define BOARD_NAME "BlackBox X32"
#define BOARD_URL "https://docs.openbuilds.com/doku.php?id=docs:blackbox-x32:start"
#if N_AUTO_SQUARED || N_AXIS > 3
Expand Down Expand Up @@ -72,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
Expand All @@ -103,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
Expand All @@ -121,15 +129,3 @@
// #if SDCARD_ENABLE
#define PIN_NUM_CS GPIO_NUM_5
// #endif

#if MODBUS_ENABLE & MODBUS_RTU_ENABLED
#error BlackBox X32 does not support Modbus
#endif

#if KEYPAD_ENABLE
#error BlackBox X32 does not support Keypad
#endif

#if TRINAMIC_ENABLE
#error BlackBox X32 does not use Trinamic drivers
#endif
28 changes: 16 additions & 12 deletions main/boards/bdring_i2s_6_axis_map.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,26 @@
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"

#if KEYPAD_ENABLE == 1
#error No free pins for I2C keypad!
#endif

#define USE_I2S_OUT
#define I2S_OUT_PIN_BASE 64

Expand Down Expand Up @@ -117,23 +121,23 @@

// 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

#if MODBUS_ENABLE & MODBUS_RTU_ENABLED
#ifdef ADD_SERIAL2
#define UART2_RX_PIN GPIO_NUM_15
#define UART2_TX_PIN GPIO_NUM_14
#if MODBUS_ENABLE & MODBUS_RTU_DIR_ENABLED
#define MODBUS_DIRECTION_PIN GPIO_NUM_13
#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

Loading

0 comments on commit 9421f14

Please sign in to comment.