MPCNC/Firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Move some strings to PROGMEM

Browse Source
This commit is contained in:
Scott Lahteine 2018-01-23 20:51:37 -06:00
parent d8aa40eedf
commit 3ab4736ac9
6 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
Marlin/Marlin_main.cpp
View File

@ -9165,7 +9165,7 @@ inline void gcode_M226() {
} }
else { else {
SERIAL_ERROR_START(); SERIAL_ERROR_START();
SERIAL_ERRORLN("Bad i2c request"); SERIAL_ERRORLNPGM("Bad i2c request");
} }
} }
@ -9296,7 +9296,7 @@ inline void gcode_M226() {
} }
else { else {
SERIAL_ERROR_START(); SERIAL_ERROR_START();
SERIAL_ERRORLN(MSG_INVALID_EXTRUDER); SERIAL_ERRORLNPGM(MSG_INVALID_EXTRUDER);
} }
} }
@ -10786,10 +10786,10 @@ inline void gcode_M355() {
// always report case light status // always report case light status
SERIAL_ECHO_START(); SERIAL_ECHO_START();
if (!case_light_on) { if (!case_light_on) {
SERIAL_ECHOLN("Case light: off"); SERIAL_ECHOLNPGM("Case light: off");
} }
else { else {
if (!USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) SERIAL_ECHOLN("Case light: on"); if (!USEABLE_HARDWARE_PWM(CASE_LIGHT_PIN)) SERIAL_ECHOLNPGM("Case light: on");
else SERIAL_ECHOLNPAIR("Case light: ", (int)case_light_brightness); else SERIAL_ECHOLNPAIR("Case light: ", (int)case_light_brightness);
} }
@ -10912,7 +10912,7 @@ inline void invalid_extruder_error(const uint8_t e) {
SERIAL_CHAR('T'); SERIAL_CHAR('T');
SERIAL_ECHO_F(e, DEC); SERIAL_ECHO_F(e, DEC);
SERIAL_CHAR(' '); SERIAL_CHAR(' ');
SERIAL_ECHOLN(MSG_INVALID_EXTRUDER); SERIAL_ECHOLNPGM(MSG_INVALID_EXTRUDER);
} }
#if ENABLED(PARKING_EXTRUDER) #if ENABLED(PARKING_EXTRUDER)

2
Marlin/cardreader.cpp
View File

@ -335,7 +335,7 @@ void CardReader::openFile(char* name, const bool read, const bool subcall/*=fals
if (file_subcall_ctr > SD_PROCEDURE_DEPTH - 1) { if (file_subcall_ctr > SD_PROCEDURE_DEPTH - 1) {
SERIAL_ERROR_START(); SERIAL_ERROR_START();
SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:"); SERIAL_ERRORPGM("trying to call sub-gcode files with too many levels. MAX level is:");
SERIAL_ERRORLN(SD_PROCEDURE_DEPTH); SERIAL_ERRORLN((int)SD_PROCEDURE_DEPTH);
kill(PSTR(MSG_KILLED)); kill(PSTR(MSG_KILLED));
return; return;
} }

2
Marlin/gcode.cpp
View File

@ -276,7 +276,7 @@ void GCodeParser::unknown_command_error() {
SERIAL_ECHO(codenum); SERIAL_ECHO(codenum);
SERIAL_ECHOLNPGM(")"); SERIAL_ECHOLNPGM(")");
#if ENABLED(FASTER_GCODE_PARSER) #if ENABLED(FASTER_GCODE_PARSER)
SERIAL_ECHO(" args: \""); SERIAL_ECHOPGM(" args: \"");
for (char c = 'A'; c <= 'Z'; ++c) for (char c = 'A'; c <= 'Z'; ++c)
if (seen(c)) { SERIAL_CHAR(c); SERIAL_CHAR(' '); } if (seen(c)) { SERIAL_CHAR(c); SERIAL_CHAR(' '); }
#else #else

2
Marlin/stepper_dac.cpp
View File

@ -114,7 +114,7 @@
SERIAL_ECHOPAIR(" (", dac_amps(Z_AXIS)); SERIAL_ECHOPAIR(" (", dac_amps(Z_AXIS));
SERIAL_ECHOPAIR(") E:", dac_perc(E_AXIS)); SERIAL_ECHOPAIR(") E:", dac_perc(E_AXIS));
SERIAL_ECHOPAIR(" (", dac_amps(E_AXIS)); SERIAL_ECHOPAIR(" (", dac_amps(E_AXIS));
SERIAL_ECHOLN(")"); SERIAL_ECHOLNPGM(")");
} }
void dac_commit_eeprom() { void dac_commit_eeprom() {

4
Marlin/temperature.cpp
View File

@ -264,11 +264,11 @@ uint8_t Temperature::soft_pwm_amount[HOTENDS],
#endif #endif
if (!WITHIN(hotend, _BOT_HOTEND, _TOP_HOTEND)) { if (!WITHIN(hotend, _BOT_HOTEND, _TOP_HOTEND)) {
SERIAL_ECHOLN(MSG_PID_BAD_EXTRUDER_NUM); SERIAL_ECHOLNPGM(MSG_PID_BAD_EXTRUDER_NUM);
return; return;
} }
SERIAL_ECHOLN(MSG_PID_AUTOTUNE_START); SERIAL_ECHOLNPGM(MSG_PID_AUTOTUNE_START);
disable_all_heaters(); // switch off all heaters. disable_all_heaters(); // switch off all heaters.

2
Marlin/ubl_G29.cpp
View File

@ -1220,7 +1220,7 @@
SERIAL_PROTOCOLLNPAIR("UBL object count: ", (int)ubl_cnt); SERIAL_PROTOCOLLNPAIR("UBL object count: ", (int)ubl_cnt);
#if ENABLED(ENABLE_LEVELING_FADE_HEIGHT) #if ENABLED(ENABLE_LEVELING_FADE_HEIGHT)
SERIAL_PROTOCOL("planner.z_fade_height : "); SERIAL_PROTOCOLPGM("planner.z_fade_height : ");
SERIAL_PROTOCOL_F(planner.z_fade_height, 4); SERIAL_PROTOCOL_F(planner.z_fade_height, 4);
SERIAL_EOL(); SERIAL_EOL();
#endif #endif