Misc. cleanup, serial strings

kpishere · Feb 19, 2021 · 785c9a5 · 785c9a5
1 parent 9ff39fa
commit 785c9a5
Show file tree

Hide file tree

Showing 7 changed files with 12 additions and 19 deletions.
diff --git a/Marlin/src/HAL/TEENSY40_41/HAL.h b/Marlin/src/HAL/TEENSY40_41/HAL.h
@@ -69,7 +69,7 @@
   #elif WITHIN(SERIAL_PORT_2, 0, 8)
     #define MYSERIAL1 MSERIAL(SERIAL_PORT_2)
   #else
-      #error "SERIAL_PORT_2 must be from -1 to 8. Please update your configuration."
+    #error "SERIAL_PORT_2 must be from -2 to 8. Please update your configuration."
   #endif
 #endif
 

diff --git a/Marlin/src/gcode/gcode_d.cpp b/Marlin/src/gcode/gcode_d.cpp
@@ -107,7 +107,7 @@
               SERIAL_EOL();
               persistentStore.access_finish();
             #else
-              SERIAL_ECHOLN("NO EEPROM");
+              SERIAL_ECHOLNPGM("NO EEPROM");
             #endif
           }
           else {
@@ -125,13 +125,13 @@
                 SERIAL_EOL();
                 persistentStore.access_finish();
               #else
-                SERIAL_ECHOLN("NO EEPROM");
+                SERIAL_ECHOLNPGM("NO EEPROM");
               #endif
             }
             SERIAL_EOL();
           }
         } break;
-      #endif      
+      #endif
 
       case 4: { // D4 Read / Write PIN
         // const uint8_t pin = parser.byteval('P');
@@ -173,8 +173,8 @@
       } break;
 
       case 100: { // D100 Disable heaters and attempt a hard hang (Watchdog Test)
-        SERIAL_ECHOLN("Disabling heaters and attempting to trigger Watchdog");
-        SERIAL_ECHOLN("(USE_WATCHDOG " TERN(USE_WATCHDOG, "ENABLED", "DISABLED") ")");
+        SERIAL_ECHOLNPGM("Disabling heaters and attempting to trigger Watchdog");
+        SERIAL_ECHOLNPGM("(USE_WATCHDOG " TERN(USE_WATCHDOG, "ENABLED", "DISABLED") ")");
         thermalManager.disable_all_heaters();
         delay(1000); // Allow time to print
         DISABLE_ISRS();
@@ -183,7 +183,7 @@
         // watchdog does not work.
         DELAY_US(10000000);
         ENABLE_ISRS();
-        SERIAL_ECHOLN("FAILURE: Watchdog did not trigger board reset.");
+        SERIAL_ECHOLNPGM("FAILURE: Watchdog did not trigger board reset.");
       }
     }
   }

diff --git a/Marlin/src/gcode/host/M118.cpp b/Marlin/src/gcode/host/M118.cpp
@@ -57,9 +57,9 @@ void GcodeSuite::M118() {
     if (WITHIN(port, 0, NUM_SERIAL))
       serial_port_index = (
         port == 0 ? SERIAL_BOTH
-        : port == 1 ? SERIAL_PORT
-        #ifdef SERIAL_PORT_2
-          : port == 2 ? SERIAL_PORT_2
+        : port == 1 ? 0
+        #if HAS_MULTI_SERIAL
+          : port == 2 ? 1
         #endif
         : SERIAL_PORT
       );

diff --git a/Marlin/src/gcode/parser.cpp b/Marlin/src/gcode/parser.cpp
@@ -28,10 +28,6 @@
 
 #include "../MarlinCore.h"
 
-#if HAS_MULTI_SERIAL
-  #include "queue.h"
-#endif
-
 // Must be declared for allocation and to satisfy the linker
 // Zero values need no initialization.
 

diff --git a/Marlin/src/module/settings.cpp b/Marlin/src/module/settings.cpp
@@ -2296,7 +2296,7 @@ void MarlinSettings::postprocess() {
 
     #if ENABLED(EEPROM_CHITCHAT) && DISABLED(DISABLE_M503)
       // Report the EEPROM settings
-      if (!validating && (DISABLED(EEPROM_BOOT_SILENT) || IsRunning())) report();
+      if (!validating && TERN1(EEPROM_BOOT_SILENT, IsRunning())) report();
     #endif
 
     EEPROM_FINISH();

diff --git a/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h b/Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
@@ -49,9 +49,6 @@
 //#define MARLIN_EEPROM_SIZE            0x1000UL  // 4KB
 //#define MARLIN_EEPROM_SIZE (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL)
 
-//#define EEPROM_CHITCHAT
-//#define DEBUG_EEPROM_READWRITE
-
 //
 // Limit Switches
 //

diff --git a/buildroot/tests/teensy41-tests b/buildroot/tests/teensy41-tests
@@ -57,7 +57,7 @@ exec_test $1 $2 "Sled Z Probe with Linear leveling"
 # exec_test $1 $2 "...with AUTO_BED_LEVELING_3POINT, DEBUG_LEVELING_FEATURE, EEPROM_SETTINGS, EEPROM_CHITCHAT, EXTENDED_CAPABILITIES_REPORT, and AUTO_REPORT_TEMPERATURES"
 
 #
-# Test MAGNETIC_PARKING_EXTRUDER with LCD
+# Test MAGNETIC_PARKING_EXTRUDER with no LCD
 #
 restore_configs
 opt_set MOTHERBOARD BOARD_TEENSY41