Przeglądaj źródła

Apply TMC UART to STM32, simplify

Scott Lahteine 4 lat temu
rodzic
commit
704b8cd83c

+ 1
- 1
Marlin/src/HAL/DUE/MarlinSerial.cpp Wyświetl plik

@@ -476,7 +476,7 @@ void MarlinSerial<Cfg>::flushTX() {
476 476
 
477 477
 
478 478
 // If not using the USB port as serial port
479
-#if SERIAL_PORT >= 0
479
+#if defined(SERIAL_PORT) && SERIAL_PORT >= 0
480 480
   template class MarlinSerial< MarlinSerialCfg<SERIAL_PORT> >;
481 481
   MSerialT customizedSerial1(MarlinSerialCfg<SERIAL_PORT>::EMERGENCYPARSER);
482 482
 #endif

+ 29
- 10
Marlin/src/HAL/STM32/MarlinSerial.cpp Wyświetl plik

@@ -37,19 +37,38 @@
37 37
   MSerialT MSerial ## ser_num (true, USART ## ser_num, &_rx_complete_irq_ ## ser_num); \
38 38
   void _rx_complete_irq_ ## ser_num (serial_t * obj) { MSerial ## ser_num ._rx_complete_irq(obj); }
39 39
 
40
-#define DECLARE_SERIAL_PORT_EXP(ser_num) DECLARE_SERIAL_PORT(ser_num)
41
-
42
-#if defined(SERIAL_PORT) && SERIAL_PORT >= 0
43
-  DECLARE_SERIAL_PORT_EXP(SERIAL_PORT)
40
+#if USING_HW_SERIAL1
41
+  DECLARE_SERIAL_PORT(1)
42
+#endif
43
+#if USING_HW_SERIAL2
44
+  DECLARE_SERIAL_PORT(2)
45
+#endif
46
+#if USING_HW_SERIAL3
47
+  DECLARE_SERIAL_PORT(3)
48
+#endif
49
+#if USING_HW_SERIAL4
50
+  DECLARE_SERIAL_PORT(4)
51
+#endif
52
+#if USING_HW_SERIAL5
53
+  DECLARE_SERIAL_PORT(5)
54
+#endif
55
+#if USING_HW_SERIAL6
56
+  DECLARE_SERIAL_PORT(6)
57
+#endif
58
+#if USING_HW_SERIAL7
59
+  DECLARE_SERIAL_PORT(7)
60
+#endif
61
+#if USING_HW_SERIAL8
62
+  DECLARE_SERIAL_PORT(8)
44 63
 #endif
45
-#if defined(SERIAL_PORT_2) && SERIAL_PORT_2 >= 0
46
-  DECLARE_SERIAL_PORT_EXP(SERIAL_PORT_2)
64
+#if USING_HW_SERIAL9
65
+  DECLARE_SERIAL_PORT(9)
47 66
 #endif
48
-#if defined(MMU2_SERIAL_PORT) && MMU2_SERIAL_PORT >= 0
49
-  DECLARE_SERIAL_PORT_EXP(MMU2_SERIAL_PORT)
67
+#if USING_HW_SERIAL10
68
+  DECLARE_SERIAL_PORT(10)
50 69
 #endif
51
-#if defined(LCD_SERIAL_PORT) && LCD_SERIAL_PORT >= 0
52
-  DECLARE_SERIAL_PORT_EXP(LCD_SERIAL_PORT)
70
+#if USING_HW_SERIALLP1
71
+  DECLARE_SERIAL_PORT(LP1)
53 72
 #endif
54 73
 
55 74
 void MarlinSerial::begin(unsigned long baud, uint8_t config) {

+ 1
- 7
Marlin/src/inc/Conditionals_post.h Wyświetl plik

@@ -1842,13 +1842,6 @@
1842 1842
 // Set USING_HW_SERIALn flags for used Serial Ports
1843 1843
 //
1844 1844
 
1845
-// ... HW_SerialX
1846
-#define _SERIAL_ID(P) _CAT(HW_,P)
1847
-
1848
-// ... (HW_Serial1 == HW_SerialX || HW_Serial1 == HW_MSerialX)
1849
-#define _TMC_UART_IS(P,N) ( _SERIAL_ID(P##_HARDWARE_SERIAL) == _SERIAL_ID(Serial##N) || _SERIAL_ID(P) == _SERIAL_ID(MSerial##N) )
1850
-#define TMC_UART_IS(A,N) (defined(A##_HARDWARE_SERIAL) && _TMC_UART_IS(A, N))
1851
-
1852 1845
 // Flag the indexed hardware serial ports in use
1853 1846
 #define CONF_SERIAL_IS(N) (  (defined(SERIAL_PORT)      && SERIAL_PORT == N) \
1854 1847
                           || (defined(SERIAL_PORT_2)    && SERIAL_PORT_2 == N) \
@@ -1856,6 +1849,7 @@
1856 1849
                           || (defined(LCD_SERIAL_PORT)  && LCD_SERIAL_PORT == N) )
1857 1850
 
1858 1851
 // Flag the named hardware serial ports in use
1852
+#define TMC_UART_IS(A,N) (defined(A##_HARDWARE_SERIAL) && (CAT(HW_,A##_HARDWARE_SERIAL) == HW_Serial##N || CAT(HW_,A##_HARDWARE_SERIAL) == HW_MSerial##N))
1859 1853
 #define ANY_SERIAL_IS(N) (  CONF_SERIAL_IS(N) \
1860 1854
                          || TMC_UART_IS(X,  N) || TMC_UART_IS(Y , N) || TMC_UART_IS(Z , N) \
1861 1855
                          || TMC_UART_IS(X2, N) || TMC_UART_IS(Y2, N) || TMC_UART_IS(Z2, N) || TMC_UART_IS(Z3, N) || TMC_UART_IS(Z4, N) \

Ładowanie…
Anuluj
Zapisz