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

[2.0.x] Reset LCD status to fallbacks (#10470)

Browse Source 
* Remove obsolete strings
* Tweak some static consts
* Reset LCD status to fallbacks
This commit is contained in:
Scott Lahteine
2018-04-22 00:16:30 -05:00
committed by GitHub
parent d58450c82a
commit 3396671011
36 changed files with 67 additions and 138 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/gcode/calibrate/G33.cpp
View File

@ -483,7 +483,7 @@ void GcodeSuite::G33() {
_opposite_results = (_4p_calibration && !towers_set) || probe_points >= 3,
_endstop_results = probe_points != 1 && probe_points != -1 && probe_points != 0,
_angle_results = probe_points >= 3 && towers_set;
const static char save_message[] PROGMEM = "Save with M500 and/or copy to Configuration.h";
static const char save_message[] PROGMEM = "Save with M500 and/or copy to Configuration.h";
int8_t iterations = 0;
float test_precision,
zero_std_dev = (verbose_level ? 999.0 : 0.0), // 0.0 in dry-run mode : forced end

4
Marlin/src/gcode/control/M111.cpp
View File

@ -28,7 +28,7 @@
void GcodeSuite::M111() {
if (parser.seen('S')) marlin_debug_flags = parser.byteval('S');
const static char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO,
static const char str_debug_1[] PROGMEM = MSG_DEBUG_ECHO,
str_debug_2[] PROGMEM = MSG_DEBUG_INFO,
str_debug_4[] PROGMEM = MSG_DEBUG_ERRORS,
str_debug_8[] PROGMEM = MSG_DEBUG_DRYRUN,
@ -38,7 +38,7 @@ void GcodeSuite::M111() {
#endif
;
const static char* const debug_strings[] PROGMEM = {
static const char* const debug_strings[] PROGMEM = {
str_debug_1, str_debug_2, str_debug_4, str_debug_8, str_debug_16
#if ENABLED(DEBUG_LEVELING_FEATURE)
, str_debug_32

14
Marlin/src/gcode/lcd/M0_M1.cpp
View File

@ -87,12 +87,8 @@ void GcodeSuite::M0_M1() {
ms += millis(); // wait until this time for a click
while (PENDING(millis(), ms) && wait_for_user) idle();
}
else {
#if ENABLED(ULTIPANEL)
if (lcd_detected())
#endif
while (wait_for_user) idle();
}
else
while (wait_for_user) idle();
#if ENABLED(PRINTER_EVENT_LEDS) && ENABLED(SDSUPPORT)
if (lights_off_after_print) {
@ -101,11 +97,7 @@ void GcodeSuite::M0_M1() {
}
#endif
#if ENABLED(ULTIPANEL)
if (lcd_detected()) {
IS_SD_PRINTING ? LCD_MESSAGEPGM(MSG_RESUMING) : LCD_MESSAGEPGM(WELCOME_MSG);
}
#endif
lcd_reset_status();
wait_for_user = false;
KEEPALIVE_STATE(IN_HANDLER);

2
Marlin/src/gcode/temperature/M104_M109.cpp
View File

@ -243,7 +243,7 @@ void GcodeSuite::M109() {
} while (wait_for_heatup && TEMP_CONDITIONS);
if (wait_for_heatup) {
lcd_setstatusPGM(wants_to_cool ? PSTR(MSG_COOLING_COMPLETE) : PSTR(MSG_HEATING_COMPLETE));
lcd_reset_status();
#if ENABLED(PRINTER_EVENT_LEDS)
leds.set_white();
#endif

2
Marlin/src/gcode/temperature/M140_M190.cpp
View File

@ -171,7 +171,7 @@ void GcodeSuite::M190() {
} while (wait_for_heatup && TEMP_BED_CONDITIONS);
if (wait_for_heatup) LCD_MESSAGEPGM(MSG_BED_DONE);
if (wait_for_heatup) lcd_reset_status();
#if DISABLED(BUSY_WHILE_HEATING)
KEEPALIVE_STATE(IN_HANDLER);
#endif