zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases 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
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Marlin/src/HAL/TEENSY40_41/HAL.h
View file

@ -69,7 +69,7 @@
#elif WITHIN(SERIAL_PORT_2, 0, 8) #elif WITHIN(SERIAL_PORT_2, 0, 8)
#define MYSERIAL1 MSERIAL(SERIAL_PORT_2) #define MYSERIAL1 MSERIAL(SERIAL_PORT_2)
#else #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
#endif #endif

10
Marlin/src/gcode/gcode_d.cpp
View file

@ -107,7 +107,7 @@
SERIAL_EOL(); SERIAL_EOL();
persistentStore.access_finish(); persistentStore.access_finish();
#else #else
SERIAL_ECHOLN("NO EEPROM"); SERIAL_ECHOLNPGM("NO EEPROM");
#endif #endif
} }
else { else {
@ -125,7 +125,7 @@
SERIAL_EOL(); SERIAL_EOL();
persistentStore.access_finish(); persistentStore.access_finish();
#else #else
SERIAL_ECHOLN("NO EEPROM"); SERIAL_ECHOLNPGM("NO EEPROM");
#endif #endif
} }
SERIAL_EOL(); SERIAL_EOL();
@ -173,8 +173,8 @@
} break; } break;
case 100: { // D100 Disable heaters and attempt a hard hang (Watchdog Test) case 100: { // D100 Disable heaters and attempt a hard hang (Watchdog Test)
SERIAL_ECHOLN("Disabling heaters and attempting to trigger Watchdog"); SERIAL_ECHOLNPGM("Disabling heaters and attempting to trigger Watchdog");
SERIAL_ECHOLN("(USE_WATCHDOG " TERN(USE_WATCHDOG, "ENABLED", "DISABLED") ")"); SERIAL_ECHOLNPGM("(USE_WATCHDOG " TERN(USE_WATCHDOG, "ENABLED", "DISABLED") ")");
thermalManager.disable_all_heaters(); thermalManager.disable_all_heaters();
delay(1000); // Allow time to print delay(1000); // Allow time to print
DISABLE_ISRS(); DISABLE_ISRS();
@ -183,7 +183,7 @@
// watchdog does not work. // watchdog does not work.
DELAY_US(10000000); DELAY_US(10000000);
ENABLE_ISRS(); 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)) if (WITHIN(port, 0, NUM_SERIAL))
serial_port_index = ( serial_port_index = (
port == 0 ? SERIAL_BOTH port == 0 ? SERIAL_BOTH
: port == 1 ? SERIAL_PORT : port == 1 ? 0
#ifdef SERIAL_PORT_2 #if HAS_MULTI_SERIAL
: port == 2 ? SERIAL_PORT_2 : port == 2 ? 1
#endif #endif
: SERIAL_PORT : SERIAL_PORT
); );

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

@ -28,10 +28,6 @@
#include "../MarlinCore.h" #include "../MarlinCore.h"
#if HAS_MULTI_SERIAL
#include "queue.h"
#endif
// Must be declared for allocation and to satisfy the linker // Must be declared for allocation and to satisfy the linker
// Zero values need no initialization. // Zero values need no initialization.

2
Marlin/src/module/settings.cpp
View file

@ -2296,7 +2296,7 @@ void MarlinSettings::postprocess() {
#if ENABLED(EEPROM_CHITCHAT) && DISABLED(DISABLE_M503) #if ENABLED(EEPROM_CHITCHAT) && DISABLED(DISABLE_M503)
// Report the EEPROM settings // Report the EEPROM settings
if (!validating && (DISABLED(EEPROM_BOOT_SILENT) || IsRunning())) report(); if (!validating && TERN1(EEPROM_BOOT_SILENT, IsRunning())) report();
#endif #endif
EEPROM_FINISH(); EEPROM_FINISH();

3
Marlin/src/pins/stm32f1/pins_JGAURORA_A5S_A1.h
View file

@ -49,9 +49,6 @@
//#define MARLIN_EEPROM_SIZE 0x1000UL // 4KB //#define MARLIN_EEPROM_SIZE 0x1000UL // 4KB
//#define MARLIN_EEPROM_SIZE (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL) //#define MARLIN_EEPROM_SIZE (EEPROM_START_ADDRESS + (EEPROM_PAGE_SIZE) * 2UL)
//#define EEPROM_CHITCHAT
//#define DEBUG_EEPROM_READWRITE
// //
// Limit Switches // Limit Switches
// //

2
buildroot/tests/teensy41-tests
View file

@ -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" # 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 restore_configs
opt_set MOTHERBOARD BOARD_TEENSY41 opt_set MOTHERBOARD BOARD_TEENSY41