Browse Source

HAL/serial followup

Scott Lahteine 4 years ago
parent
commit
568f292883

+ 0
- 1
Marlin/src/HAL/AVR/HAL.h View File

@@ -86,7 +86,6 @@ typedef int8_t pin_t;
86 86
   #if !WITHIN(SERIAL_PORT, -1, 3)
87 87
     #error "SERIAL_PORT must be from -1 to 3. Please update your configuration."
88 88
   #endif
89
-
90 89
   #define MYSERIAL0 customizedSerial1
91 90
 
92 91
   #ifdef SERIAL_PORT_2

+ 1
- 1
Marlin/src/HAL/SAMD51/HAL.h View File

@@ -50,7 +50,7 @@
50 50
     #if SERIAL_PORT_2 == -1
51 51
       #define MYSERIAL1 Serial
52 52
     #elif WITHIN(SERIAL_PORT_2, 0, 3)
53
-      #define MYSERIAL0 MSERIAL(SERIAL_PORT_2)
53
+      #define MYSERIAL1 MSERIAL(SERIAL_PORT_2)
54 54
     #else
55 55
       #error "SERIAL_PORT_2 must be from -1 to 3. Please update your configuration."
56 56
     #endif

+ 1
- 1
Marlin/src/HAL/STM32F1/HAL.h View File

@@ -108,7 +108,7 @@
108 108
   #endif
109 109
 #endif
110 110
 
111
-#ifdef DGUS_SERIAL
111
+#ifdef DGUS_SERIAL_PORT
112 112
   #if DGUS_SERIAL_PORT == 0
113 113
     #error "DGUS_SERIAL_PORT cannot be 0. (Port 0 does not exist.) Please update your configuration."
114 114
   #elif DGUS_SERIAL_PORT == SERIAL_PORT

+ 1
- 1
Marlin/src/HAL/TEENSY40_41/HAL.h View File

@@ -66,7 +66,7 @@
66 66
   #if SERIAL_PORT_2 == -1
67 67
     #define MYSERIAL1 usbSerial
68 68
   #elif WITHIN(SERIAL_PORT_2, 0, 8)
69
-    #define MYSERIAL0 MSERIAL(SERIAL_PORT_2)
69
+    #define MYSERIAL1 MSERIAL(SERIAL_PORT_2)
70 70
   #else
71 71
       #error "SERIAL_PORT_2 must be from -1 to 8. Please update your configuration."
72 72
   #endif

+ 5
- 1
Marlin/src/lcd/extui/lib/anycubic_i3mega/anycubic_i3mega_lcd.cpp View File

@@ -113,7 +113,11 @@ static void sendLine_P(PGM_P str) {
113 113
 AnycubicTFTClass::AnycubicTFTClass() {}
114 114
 
115 115
 void AnycubicTFTClass::OnSetup() {
116
-  ANYCUBIC_LCD_SERIAL.begin(115200);
116
+  #ifndef LCD_BAUDRATE
117
+    #define LCD_BAUDRATE 115200
118
+  #endif
119
+  LCD_SERIAL.begin(LCD_BAUDRATE);
120
+
117 121
   SENDLINE_DBG_PGM("J17", "TFT Serial Debug: Main board reset... J17"); // J17 Main board reset
118 122
   ExtUI::delay_ms(10);
119 123
 

+ 5
- 1
Marlin/src/lcd/extui/malyan_lcd.cpp View File

@@ -428,7 +428,11 @@ namespace ExtUI {
428 428
      * it and translate into ExtUI operations where possible.
429 429
      */
430 430
     inbound_count = 0;
431
-    LCD_SERIAL.begin(500000);
431
+
432
+    #ifndef LCD_BAUDRATE
433
+      #define LCD_BAUDRATE 500000
434
+    #endif
435
+    LCD_SERIAL.begin(LCD_BAUDRATE);
432 436
 
433 437
     // Signal init
434 438
     write_to_lcd_P(PSTR("{SYS:STARTED}\r\n"));

Loading…
Cancel
Save