bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Misc. cleanup, serial strings

Browse Source
This commit is contained in:
Scott Lahteine
2020-10-19 20:38:24 -05:00
parent a90b90e98d
commit 53a4b8fa33
7 changed files with 12 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
Marlin/src/gcode/gcode_d.cpp
View File

@ -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.");
}
}
}

6
Marlin/src/gcode/host/M118.cpp
View File

@ -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
);

4
Marlin/src/gcode/parser.cpp
View File

@ -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.