Przeglądaj źródła

Sanity check old serial names

Scott Lahteine 3 lat temu
rodzic
commit
7ce91c5ffe

+ 1
- 1
Marlin/Configuration_adv.h Wyświetl plik

@@ -1409,7 +1409,7 @@
1409 1409
 
1410 1410
   #define DGUS_RX_BUFFER_SIZE 128
1411 1411
   #define DGUS_TX_BUFFER_SIZE 48
1412
-  //#define DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS  // Fix Rx overrun situation (Currently only for AVR)
1412
+  //#define SERIAL_STATS_RX_BUFFER_OVERRUNS  // Fix Rx overrun situation (Currently only for AVR)
1413 1413
 
1414 1414
   #define DGUS_UPDATE_INTERVAL_MS  500    // (ms) Interval between automatic screen updates
1415 1415
 

+ 1
- 1
Marlin/src/HAL/AVR/MarlinSerial.h Wyświetl plik

@@ -310,7 +310,7 @@
310 310
     #if HAS_DGUS_LCD
311 311
       static constexpr unsigned int RX_SIZE   = DGUS_RX_BUFFER_SIZE;
312 312
       static constexpr unsigned int TX_SIZE   = DGUS_TX_BUFFER_SIZE;
313
-      static constexpr bool RX_OVERRUNS       = ENABLED(DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS);
313
+      static constexpr bool RX_OVERRUNS       = ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS);
314 314
     #elif EITHER(ANYCUBIC_LCD_I3MEGA, ANYCUBIC_LCD_CHIRON)
315 315
       static constexpr unsigned int RX_SIZE   = 64;
316 316
       static constexpr unsigned int TX_SIZE   = 128;

+ 8
- 0
Marlin/src/inc/SanityCheck.h Wyświetl plik

@@ -481,6 +481,14 @@
481 481
   #error "DGUS_SERIAL_PORT is now LCD_SERIAL_PORT. Please update your configuration."
482 482
 #elif defined(DGUS_BAUDRATE)
483 483
   #error "DGUS_BAUDRATE is now LCD_BAUDRATE. Please update your configuration."
484
+#elif defined(DGUS_STATS_RX_BUFFER_OVERRUNS)
485
+  #error "DGUS_STATS_RX_BUFFER_OVERRUNS is now STATS_RX_BUFFER_OVERRUNS. Please update your configuration."
486
+#elif defined(DGUS_SERIAL_PORT)
487
+  #error "DGUS_SERIAL_PORT is now LCD_SERIAL_PORT. Please update your configuration."
488
+#elif defined(ANYCUBIC_LCD_SERIAL_PORT)
489
+  #error "ANYCUBIC_LCD_SERIAL_PORT is now LCD_SERIAL_PORT. Please update your configuration."
490
+#elif defined(INTERNAL_SERIAL_PORT)
491
+  #error "INTERNAL_SERIAL_PORT is now MMU2_SERIAL_PORT. Please update your configuration."
484 492
 #elif defined(X_DUAL_ENDSTOPS_ADJUSTMENT)
485 493
   #error "X_DUAL_ENDSTOPS_ADJUSTMENT is now X2_ENDSTOP_ADJUSTMENT. Please update Configuration_adv.h."
486 494
 #elif defined(Y_DUAL_ENDSTOPS_ADJUSTMENT)

+ 1
- 1
Marlin/src/lcd/extui/lib/dgus/DGUSDisplay.cpp Wyświetl plik

@@ -129,7 +129,7 @@ void DGUSDisplay::WriteVariablePGM(uint16_t adr, const void* values, uint8_t val
129 129
 
130 130
 void DGUSDisplay::ProcessRx() {
131 131
 
132
-  #if ENABLED(DGUS_SERIAL_STATS_RX_BUFFER_OVERRUNS)
132
+  #if ENABLED(SERIAL_STATS_RX_BUFFER_OVERRUNS)
133 133
     if (!LCD_SERIAL.available() && LCD_SERIAL.buffer_overruns()) {
134 134
       // Overrun, but reset the flag only when the buffer is empty
135 135
       // We want to extract as many as valid datagrams possible...

Ładowanie…
Anuluj
Zapisz