SunRed/Marlin-Artillery-M600
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Add NUL_STR global

Browse source
This commit is contained in:
Scott Lahteine 2019-11-02 07:09:57 -05:00
parent ea3217cd46
commit 15f94e5ee5
6 changed files with 10 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
Marlin/src/Marlin.cpp
View file

@ -184,7 +184,8 @@
const char G28_STR[] PROGMEM = "G28", const char G28_STR[] PROGMEM = "G28",
M21_STR[] PROGMEM = "M21", M21_STR[] PROGMEM = "M21",
M23_STR[] PROGMEM = "M23 %s", M23_STR[] PROGMEM = "M23 %s",
M24_STR[] PROGMEM = "M24"; M24_STR[] PROGMEM = "M24",
NUL_STR[] PROGMEM = "";
bool Running = true; bool Running = true;

2
Marlin/src/Marlin.h
View file

@ -377,4 +377,4 @@ void protected_pin_err();
void event_probe_failure(); void event_probe_failure();
#endif #endif
extern const char G28_STR[], M21_STR[], M23_STR[], M24_STR[]; extern const char G28_STR[], M21_STR[], M23_STR[], M24_STR[], NUL_STR[];

3
Marlin/src/lcd/HD44780/ultralcd_HD44780.cpp
View file

@ -464,7 +464,8 @@ void MarlinUI::clear_lcd() { lcd.clear(); }
// Show the Marlin logo and short build version // Show the Marlin logo and short build version
// After a delay show the website URL // After a delay show the website URL
// //
logo_lines(PSTR("")); extern const char NUL_STR[];
logo_lines(NUL_STR);
CENTER_OR_SCROLL(SHORT_BUILD_VERSION, 1500); CENTER_OR_SCROLL(SHORT_BUILD_VERSION, 1500);
CENTER_OR_SCROLL(MARLIN_WEBSITE_URL, 1500); CENTER_OR_SCROLL(MARLIN_WEBSITE_URL, 1500);
#ifdef STRING_SPLASH_LINE3 #ifdef STRING_SPLASH_LINE3

3
Marlin/src/lcd/extui_dgus_lcd.cpp
View file

@ -44,7 +44,8 @@ namespace ExtUI {
void onIdle() { ScreenHandler.loop(); } void onIdle() { ScreenHandler.loop(); }
void onPrinterKilled(PGM_P error, PGM_P component) { void onPrinterKilled(PGM_P error, PGM_P component) {
ScreenHandler.sendinfoscreen(GET_TEXT(MSG_HALTED), error, PSTR(""), GET_TEXT(MSG_PLEASE_RESET), true, true, true, true); extern const char NUL_STR[];
ScreenHandler.sendinfoscreen(GET_TEXT(MSG_HALTED), error, NUL_STR, GET_TEXT(MSG_PLEASE_RESET), true, true, true, true);
ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL); ScreenHandler.GotoScreen(DGUSLCD_SCREEN_KILL);
while (!ScreenHandler.loop()); // Wait while anything is left to be sent while (!ScreenHandler.loop()); // Wait while anything is left to be sent
} }

3
Marlin/src/lcd/menu/menu_motion.cpp
View file

@ -256,7 +256,8 @@ void _menu_move_distance(const AxisEnum axis, const screenFunc_t func, const int
SUBMENU(MSG_MOVE_1MM, []{ _goto_manual_move( 1); }); SUBMENU(MSG_MOVE_1MM, []{ _goto_manual_move( 1); });
SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); }); SUBMENU(MSG_MOVE_01MM, []{ _goto_manual_move( 0.1f); });
if (axis == Z_AXIS && (SHORT_MANUAL_Z_MOVE) > 0.0f && (SHORT_MANUAL_Z_MOVE) < 0.1f) { if (axis == Z_AXIS && (SHORT_MANUAL_Z_MOVE) > 0.0f && (SHORT_MANUAL_Z_MOVE) < 0.1f) {
SUBMENU_P(PSTR(""), []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); }); extern const char NUL_STR[];
SUBMENU_P(NUL_STR, []{ _goto_manual_move(float(SHORT_MANUAL_Z_MOVE)); });
MENU_ITEM_ADDON_START(0); MENU_ITEM_ADDON_START(0);
char tmp[20], numstr[10]; char tmp[20], numstr[10];
// Determine digits needed right of decimal // Determine digits needed right of decimal

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

@ -539,7 +539,7 @@ volatile bool Temperature::temp_meas_ready = false;
SERIAL_ECHOLNPGM(MSG_PID_AUTOTUNE_FINISHED); SERIAL_ECHOLNPGM(MSG_PID_AUTOTUNE_FINISHED);
#if HAS_PID_FOR_BOTH #if HAS_PID_FOR_BOTH
const char * const estring = GHV(PSTR("bed"), PSTR("")); const char * const estring = GHV(PSTR("bed"), NUL_STR);
say_default_(); serialprintPGM(estring); SERIAL_ECHOLNPAIR("Kp ", tune_pid.Kp); say_default_(); serialprintPGM(estring); SERIAL_ECHOLNPAIR("Kp ", tune_pid.Kp);
say_default_(); serialprintPGM(estring); SERIAL_ECHOLNPAIR("Ki ", tune_pid.Ki); say_default_(); serialprintPGM(estring); SERIAL_ECHOLNPAIR("Ki ", tune_pid.Ki);
say_default_(); serialprintPGM(estring); SERIAL_ECHOLNPAIR("Kd ", tune_pid.Kd); say_default_(); serialprintPGM(estring); SERIAL_ECHOLNPAIR("Kd ", tune_pid.Kd);