move TMC driver to modules

Paciente8159 · Jan 24, 2024 · 38171b1 · 38171b1
1 parent c9039d1
commit 38171b1
Show file tree

Hide file tree

Showing 10 changed files with 119 additions and 2,575 deletions.
diff --git a/docs/mcumap_gen.xlsx b/docs/mcumap_gen.xlsx
diff --git a/uCNC/cnc_hal_config.h b/uCNC/cnc_hal_config.h
diff --git a/uCNC/cnc_hal_overrides.h b/uCNC/cnc_hal_overrides.h
@@ -8,6 +8,8 @@ extern "C"
 {
 #endif
 
+#define STEPPER0_HAS_TMC
+
 #ifdef __cplusplus
 }
 #endif

diff --git a/uCNC/src/cnc_hal_config_helper.h b/uCNC/src/cnc_hal_config_helper.h
@@ -340,126 +340,6 @@ extern "C"
 #define STEPPERS_ENCODERS_MASK 0
 #endif
 
-#ifdef STEPPER0_HAS_TMC
-#if (STEPPER0_TMC_INTERFACE == TMC_UART)
-// if driver uses uart set pins
-#if (!ASSERT_PIN(STEPPER0_UART_TX) || !ASSERT_PIN(STEPPER0_UART_RX))
-#undef STEPPER0_HAS_TMC
-#error "Stepper 0 undefined UART pins"
-#endif
-#elif (STEPPER0_TMC_INTERFACE == TMC_SPI)
-#if (!ASSERT_PIN(STEPPER0_UART_DO) || !ASSERT_PIN(STEPPER0_UART_DI) || !ASSERT_PIN(STEPPER0_UART_CLK) || !ASSERT_PIN(STEPPER0_UART_CS))
-#undef STEPPER0_HAS_TMC
-#error "Stepper 0 undefined SPI pins"
-#endif
-#endif
-#endif
-#ifdef STEPPER1_HAS_TMC
-#if (STEPPER1_TMC_INTERFACE == TMC_UART)
-// if driver uses uart set pins
-#if (!ASSERT_PIN(STEPPER1_UART_TX) || !ASSERT_PIN(STEPPER1_UART_RX))
-#undef STEPPER1_HAS_TMC
-#error "Stepper 1 undefined UART pins"
-#endif
-#elif (STEPPER1_TMC_INTERFACE == TMC_SPI)
-#if (!ASSERT_PIN(STEPPER1_UART_DO) || !ASSERT_PIN(STEPPER1_UART_DI) || !ASSERT_PIN(STEPPER1_UART_CLK) || !ASSERT_PIN(STEPPER1_UART_CS))
-#undef STEPPER1_HAS_TMC
-#error "Stepper 1 undefined SPI pins"
-#endif
-#endif
-#endif
-#ifdef STEPPER2_HAS_TMC
-#if (STEPPER2_TMC_INTERFACE == TMC_UART)
-// if driver uses uart set pins
-#if (!ASSERT_PIN(STEPPER2_UART_TX) || !ASSERT_PIN(STEPPER2_UART_RX))
-#undef STEPPER2_HAS_TMC
-#error "Stepper 2 undefined UART pins"
-#endif
-#elif (STEPPER2_TMC_INTERFACE == TMC_SPI)
-#if (!ASSERT_PIN(STEPPER2_UART_DO) || !ASSERT_PIN(STEPPER2_UART_DI) || !ASSERT_PIN(STEPPER2_UART_CLK) || !ASSERT_PIN(STEPPER2_UART_CS))
-#undef STEPPER2_HAS_TMC
-#error "Stepper 2 undefined SPI pins"
-#endif
-#endif
-#endif
-#ifdef STEPPER3_HAS_TMC
-#if (STEPPER3_TMC_INTERFACE == TMC_UART)
-// if driver uses uart set pins
-#if (!ASSERT_PIN(STEPPER3_UART_TX) || !ASSERT_PIN(STEPPER3_UART_RX))
-#undef STEPPER3_HAS_TMC
-#error "Stepper 3 undefined UART pins"
-#endif
-#elif (STEPPER3_TMC_INTERFACE == TMC_SPI)
-#if (!ASSERT_PIN(STEPPER3_UART_DO) || !ASSERT_PIN(STEPPER3_UART_DI) || !ASSERT_PIN(STEPPER3_UART_CLK) || !ASSERT_PIN(STEPPER3_UART_CS))
-#undef STEPPER3_HAS_TMC
-#error "Stepper 3 undefined SPI pins"
-#endif
-#endif
-#endif
-#ifdef STEPPER4_HAS_TMC
-#if (STEPPER4_TMC_INTERFACE == TMC_UART)
-// if driver uses uart set pins
-#if (!ASSERT_PIN(STEPPER4_UART_TX) || !ASSERT_PIN(STEPPER4_UART_RX))
-#undef STEPPER4_HAS_TMC
-#error "Stepper 4 undefined UART pins"
-#endif
-#elif (STEPPER4_TMC_INTERFACE == TMC_SPI)
-#if (!ASSERT_PIN(STEPPER4_UART_DO) || !ASSERT_PIN(STEPPER4_UART_DI) || !ASSERT_PIN(STEPPER4_UART_CLK) || !ASSERT_PIN(STEPPER4_UART_CS))
-#undef STEPPER4_HAS_TMC
-#error "Stepper 4 undefined SPI pins"
-#endif
-#endif
-#endif
-#ifdef STEPPER5_HAS_TMC
-#if (STEPPER5_TMC_INTERFACE == TMC_UART)
-// if driver uses uart set pins
-#if (!ASSERT_PIN(STEPPER5_UART_TX) || !ASSERT_PIN(STEPPER5_UART_RX))
-#undef STEPPER5_HAS_TMC
-#error "Stepper 5 undefined UART pins"
-#endif
-#elif (STEPPER5_TMC_INTERFACE == TMC_SPI)
-#if (!ASSERT_PIN(STEPPER5_UART_DO) || !ASSERT_PIN(STEPPER5_UART_DI) || !ASSERT_PIN(STEPPER5_UART_CLK) || !ASSERT_PIN(STEPPER5_UART_CS))
-#undef STEPPER5_HAS_TMC
-#error "Stepper 5 undefined SPI pins"
-#endif
-#endif
-#endif
-#ifdef STEPPER6_HAS_TMC
-#if (STEPPER6_TMC_INTERFACE == TMC_UART)
-// if driver uses uart set pins
-#if (!ASSERT_PIN(STEPPER6_UART_TX) || !ASSERT_PIN(STEPPER6_UART_RX))
-#undef STEPPER6_HAS_TMC
-#error "Stepper 6 undefined UART pins"
-#endif
-#elif (STEPPER6_TMC_INTERFACE == TMC_SPI)
-#if (!ASSERT_PIN(STEPPER6_UART_DO) || !ASSERT_PIN(STEPPER6_UART_DI) || !ASSERT_PIN(STEPPER6_UART_CLK) || !ASSERT_PIN(STEPPER6_UART_CS))
-#undef STEPPER6_HAS_TMC
-#error "Stepper 6 undefined SPI pins"
-#endif
-#endif
-#endif
-#ifdef STEPPER7_HAS_TMC
-#if (STEPPER7_TMC_INTERFACE == TMC_UART)
-// if driver uses uart set pins
-#if (!ASSERT_PIN(STEPPER7_UART_TX) || !ASSERT_PIN(STEPPER7_UART_RX))
-#undef STEPPER7_HAS_TMC
-#error "Stepper 7 undefined UART pins"
-#endif
-#elif (STEPPER7_TMC_INTERFACE == TMC_SPI)
-#if (!ASSERT_PIN(STEPPER7_UART_DO) || !ASSERT_PIN(STEPPER7_UART_DI) || !ASSERT_PIN(STEPPER7_UART_CLK) || !ASSERT_PIN(STEPPER7_UART_CS))
-#undef STEPPER7_HAS_TMC
-#error "Stepper 7 undefined SPI pins"
-#endif
-#endif
-#endif
-
-#if defined(STEPPER0_HAS_TMC) || defined(STEPPER1_HAS_TMC) || defined(STEPPER2_HAS_TMC) || defined(STEPPER3_HAS_TMC) || defined(STEPPER4_HAS_TMC) || defined(STEPPER5_HAS_TMC) || defined(STEPPER6_HAS_TMC) || defined(STEPPER7_HAS_TMC)
-#define ENABLE_TMC_DRIVERS
-#ifndef ENABLE_MAIN_LOOP_MODULES
-#define ENABLE_MAIN_LOOP_MODULES
-#endif
-#endif
-
 #if defined(STEPPER0_HAS_MSTEP) || defined(STEPPER1_HAS_MSTEP) || defined(STEPPER2_HAS_MSTEP) || defined(STEPPER3_HAS_MSTEP) || defined(STEPPER4_HAS_MSTEP) || defined(STEPPER5_HAS_MSTEP) || defined(STEPPER6_HAS_MSTEP) || defined(STEPPER7_HAS_MSTEP)
 #define ENABLE_DIGITAL_MSTEP
 #endif

diff --git a/uCNC/src/hal/mcus/avr/mcumap_avr.h b/uCNC/src/hal/mcus/avr/mcumap_avr.h
@@ -4332,14 +4332,18 @@ extern "C"
 #define MCU_HAS_UART2
 #endif
 
+#ifndef USART0_RX_vect
 #define USART0_RX_vect USART_RX_vect
+#endif
+#ifndef USART0_UDRE_vect
 #define USART0_UDRE_vect USART_UDRE_vect
+#endif
 
 // COM registers
 #ifdef MCU_HAS_UART
 #ifndef UART_PORT
-#define COM_RX_vect USART_RX_vect
-#define COM_TX_vect USART_UDRE_vect
+#define COM_RX_vect USART0_RX_vect
+#define COM_TX_vect USART0_UDRE_vect
 #define UART_PORT 0
 #else
 #define COM_RX_vect __comrxvect__(UART_PORT)

diff --git a/uCNC/src/module.c b/uCNC/src/module.c
@@ -18,7 +18,6 @@
 */
 
 #include "cnc.h"
-#include "modules/tmcdriver.h"
 #include "modules/digimstep.h"
 #include "modules/digipot.h"
 #include "modules/encoder.h"
@@ -60,10 +59,6 @@ void mod_init(void)
 	LOAD_MODULE(encoder);
 #endif
 
-#ifdef ENABLE_TMC_DRIVERS
-	LOAD_MODULE(tmcdriver);
-#endif
-
 #ifdef ENABLE_LASER_PPI
 	LOAD_MODULE(laser_ppi);
 #endif
-Original file line number
+Diff line change
@@ Expand Up / @@ -8,6 +8,8 @@ extern "C" @@
     {
     #endif
+    #define STEPPER0_HAS_TMC
     #ifdef __cplusplus
     }
     #endif
@@ Expand Down @@