thomas
/
marlin
Beobachten 1
Favorisieren 0
Fork 0
Code Issues 0 Pull-Requests 0 Releases 0 Wiki Aktivität
Quellcode durchsuchen

Teensy USB / serial followup (#21316)

X-Ryl669 vor 4 Jahren
Ursprung
ae8be31247
Commit
c07f99d5e4
Es ist kein Account mit der E-Mail-Adresse des Committers verbunden
6 geänderte Dateien mit 27 neuen und 8 gelöschten Zeilen
Gesamtansicht Diff-Statistik anzeigen
  1. 5
    1
      Marlin/src/HAL/TEENSY31_32/HAL.cpp
  2. 8
    2
      Marlin/src/HAL/TEENSY31_32/HAL.h
  3. 1
    1
      Marlin/src/HAL/TEENSY35_36/HAL.cpp
  4. 1
    1
      Marlin/src/HAL/TEENSY35_36/HAL.h
  5. 5
    1
      Marlin/src/HAL/TEENSY40_41/HAL.cpp
  6. 7
    2
      Marlin/src/HAL/TEENSY40_41/HAL.h

+ 5
- 1
Marlin/src/HAL/TEENSY31_32/HAL.cpp Datei anzeigen

31
31
32 
 #include <Wire.h>
 32 
 #include <Wire.h>
33
33
34 
-DefaultSerial1 MSerial0(false);
34 
+#define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
35 
+#define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
36 
+#if WITHIN(SERIAL_PORT, 0, 3)
37 
+  IMPLEMENT_SERIAL(SERIAL_PORT);
38 
+#endif
35 
 USBSerialType USBSerial(false, SerialUSB);
 39 
 USBSerialType USBSerial(false, SerialUSB);
36
40
37 
 uint16_t HAL_adc_result;
 41 
 uint16_t HAL_adc_result;

+ 8
- 2
Marlin/src/HAL/TEENSY31_32/HAL.h Datei anzeigen

51 
 #endif
 51 
 #endif
52
52
53 
 #include "../../core/serial_hook.h"
 53 
 #include "../../core/serial_hook.h"
54 
-typedef Serial1Class<decltype(Serial)> DefaultSerial1;
55 
-extern DefaultSerial1 MSerial0;
54 
+
55 
+#define Serial0 Serial
56 
+#define _DECLARE_SERIAL(X) \
57 
+  typedef ForwardSerial1Class<decltype(Serial##X)> DefaultSerial##X; \
58 
+  extern DefaultSerial##X MSerial##X
59 
+#define DECLARE_SERIAL(X) _DECLARE_SERIAL(X)
60 
+
56 
 typedef ForwardSerial1Class<decltype(SerialUSB)> USBSerialType;
 61 
 typedef ForwardSerial1Class<decltype(SerialUSB)> USBSerialType;
57 
 extern USBSerialType USBSerial;
 62 
 extern USBSerialType USBSerial;
58
63
62 
 #if SERIAL_PORT == -1
 67 
 #if SERIAL_PORT == -1
63 
   #define MYSERIAL1 USBSerial
 68 
   #define MYSERIAL1 USBSerial
64 
 #elif WITHIN(SERIAL_PORT, 0, 3)
 69 
 #elif WITHIN(SERIAL_PORT, 0, 3)
70 
+  DECLARE_SERIAL(SERIAL_PORT);
65 
   #define MYSERIAL1 MSERIAL(SERIAL_PORT)
 71 
   #define MYSERIAL1 MSERIAL(SERIAL_PORT)
66 
 #endif
 72 
 #endif
67
73

+ 1
- 1
Marlin/src/HAL/TEENSY35_36/HAL.cpp Datei anzeigen

31
31
32 
 #include <Wire.h>
 32 
 #include <Wire.h>
33
33
34 
-#define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false)
34 
+#define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
35 
 #define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
 35 
 #define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
36 
 #if WITHIN(SERIAL_PORT, 0, 3)
 36 
 #if WITHIN(SERIAL_PORT, 0, 3)
37 
   IMPLEMENT_SERIAL(SERIAL_PORT);
 37 
   IMPLEMENT_SERIAL(SERIAL_PORT);

+ 1
- 1
Marlin/src/HAL/TEENSY35_36/HAL.h Datei anzeigen

57
57
58 
 #define Serial0 Serial
 58 
 #define Serial0 Serial
59 
 #define _DECLARE_SERIAL(X) \
 59 
 #define _DECLARE_SERIAL(X) \
60 
-  typedef Serial1Class<decltype(Serial##X)> DefaultSerial##X; \
60 
+  typedef ForwardSerial1Class<decltype(Serial##X)> DefaultSerial##X; \
61 
   extern DefaultSerial##X MSerial##X
 61 
   extern DefaultSerial##X MSerial##X
62 
 #define DECLARE_SERIAL(X) _DECLARE_SERIAL(X)
 62 
 #define DECLARE_SERIAL(X) _DECLARE_SERIAL(X)
63
63

+ 5
- 1
Marlin/src/HAL/TEENSY40_41/HAL.cpp Datei anzeigen

32
32
33 
 #include <Wire.h>
 33 
 #include <Wire.h>
34
34
35 
-DefaultSerial1 MSerial0(false);
35 
+#define _IMPLEMENT_SERIAL(X) DefaultSerial##X MSerial##X(false, Serial##X)
36 
+#define IMPLEMENT_SERIAL(X)  _IMPLEMENT_SERIAL(X)
37 
+#if WITHIN(SERIAL_PORT, 0, 3)
38 
+  IMPLEMENT_SERIAL(SERIAL_PORT);
39 
+#endif
36 
 USBSerialType USBSerial(false, SerialUSB);
 40 
 USBSerialType USBSerial(false, SerialUSB);
37
41
38 
 uint16_t HAL_adc_result, HAL_adc_select;
 42 
 uint16_t HAL_adc_result, HAL_adc_select;

+ 7
- 2
Marlin/src/HAL/TEENSY40_41/HAL.h Datei anzeigen

56 
 #endif
 56 
 #endif
57
57
58 
 #include "../../core/serial_hook.h"
 58 
 #include "../../core/serial_hook.h"
59 
-typedef Serial1Class<decltype(Serial)> DefaultSerial1;
60 
-extern DefaultSerial1 MSerial0;
59 
+#define Serial0 Serial
60 
+#define _DECLARE_SERIAL(X) \
61 
+  typedef ForwardSerial1Class<decltype(Serial##X)> DefaultSerial##X; \
62 
+  extern DefaultSerial##X MSerial##X
63 
+#define DECLARE_SERIAL(X) _DECLARE_SERIAL(X)
64 
+
61 
 typedef ForwardSerial1Class<decltype(SerialUSB)> USBSerialType;
 65 
 typedef ForwardSerial1Class<decltype(SerialUSB)> USBSerialType;
62 
 extern USBSerialType USBSerial;
 66 
 extern USBSerialType USBSerial;
63
67
67 
 #if SERIAL_PORT == -1
 71 
 #if SERIAL_PORT == -1
68 
   #define MYSERIAL1 SerialUSB
 72 
   #define MYSERIAL1 SerialUSB
69 
 #elif WITHIN(SERIAL_PORT, 0, 8)
 73 
 #elif WITHIN(SERIAL_PORT, 0, 8)
74 
+  DECLARE_SERIAL(SERIAL_PORT);
70 
   #define MYSERIAL1 MSERIAL(SERIAL_PORT)
 75 
   #define MYSERIAL1 MSERIAL(SERIAL_PORT)
71 
 #else
 76 
 #else
72 
   #error "The required SERIAL_PORT must be from -1 to 8. Please update your configuration."
 77 
   #error "The required SERIAL_PORT must be from -1 to 8. Please update your configuration."

Verfassen Vorschau
Laden…
Abbrechen
Speichern