🎨 Apply F() to some ExtUI functions
This commit is contained in:
@@ -52,7 +52,7 @@ bool StatusScreen::jog_xy;
|
||||
bool StatusScreen::fine_motion;
|
||||
|
||||
void StatusScreen::unlockMotors() {
|
||||
injectCommands_P(PSTR("M84 XY"));
|
||||
injectCommands(F("M84 XY"));
|
||||
jog_xy = false;
|
||||
}
|
||||
|
||||
@@ -305,7 +305,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
|
||||
case 12:
|
||||
if (!jog_xy) {
|
||||
jog_xy = true;
|
||||
injectCommands_P(PSTR("M17"));
|
||||
injectCommands(F("M17"));
|
||||
}
|
||||
jog({ 0, 0, 0 });
|
||||
break;
|
||||
|
@@ -81,7 +81,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
|
||||
case 2: BedMeshViewScreen::doProbe(); break;
|
||||
case 3: BedMeshViewScreen::show(); break;
|
||||
case 4: BedMeshEditScreen::show(); break;
|
||||
case 5: injectCommands_P(PSTR("M280 P0 S60")); break;
|
||||
case 5: injectCommands(F("M280 P0 S60")); break;
|
||||
case 6: SpinnerDialogBox::enqueueAndWait(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
|
||||
default: return false;
|
||||
}
|
||||
|
@@ -86,7 +86,7 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
|
||||
case 6: GOTO_SCREEN(FeedratePercentScreen); break;
|
||||
case 7: GOTO_SCREEN(FlowPercentScreen); break;
|
||||
case 8: GOTO_SCREEN(AdvancedSettingsMenu); break;
|
||||
case 9: injectCommands_P(PSTR("M84")); break;
|
||||
case 9: injectCommands(F("M84")); break;
|
||||
#if HAS_LEVELING
|
||||
case 10: GOTO_SCREEN(LevelingMenu); break;
|
||||
#endif
|
||||
|
@@ -74,37 +74,37 @@ bool PreheatMenu::onTouchEnd(uint8_t tag) {
|
||||
case 1: GOTO_PREVIOUS(); break;
|
||||
case 2:
|
||||
#ifdef COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_INT_SCRIPT
|
||||
injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_INT_SCRIPT));
|
||||
injectCommands(F(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_INT_SCRIPT));
|
||||
#endif
|
||||
GOTO_SCREEN(PreheatTimerScreen);
|
||||
break;
|
||||
case 3:
|
||||
#ifdef COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_INT_SCRIPT
|
||||
injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_INT_SCRIPT));
|
||||
injectCommands(F(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_INT_SCRIPT));
|
||||
#endif
|
||||
GOTO_SCREEN(PreheatTimerScreen);
|
||||
break;
|
||||
case 4:
|
||||
#ifdef COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_INT_SCRIPT
|
||||
injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_INT_SCRIPT));
|
||||
injectCommands(F(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_INT_SCRIPT));
|
||||
#endif
|
||||
GOTO_SCREEN(PreheatTimerScreen);
|
||||
break;
|
||||
case 5:
|
||||
#ifdef COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_EXT_SCRIPT
|
||||
injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_EXT_SCRIPT));
|
||||
injectCommands(F(COCOA_PRESS_PREHEAT_DARK_CHOCOLATE_EXT_SCRIPT));
|
||||
#endif
|
||||
GOTO_SCREEN(PreheatTimerScreen);
|
||||
break;
|
||||
case 6:
|
||||
#ifdef COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_EXT_SCRIPT
|
||||
injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_EXT_SCRIPT));
|
||||
injectCommands(F(COCOA_PRESS_PREHEAT_MILK_CHOCOLATE_EXT_SCRIPT));
|
||||
#endif
|
||||
GOTO_SCREEN(PreheatTimerScreen);
|
||||
break;
|
||||
case 7:
|
||||
#ifdef COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_EXT_SCRIPT
|
||||
injectCommands_P(PSTR(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_EXT_SCRIPT));
|
||||
injectCommands(F(COCOA_PRESS_PREHEAT_WHITE_CHOCOLATE_EXT_SCRIPT));
|
||||
#endif
|
||||
GOTO_SCREEN(PreheatTimerScreen);
|
||||
break;
|
||||
|
@@ -174,11 +174,11 @@ bool BedMeshEditScreen::onTouchEnd(uint8_t tag) {
|
||||
case 1:
|
||||
// On Cancel, reload saved mesh, discarding changes
|
||||
GOTO_PREVIOUS();
|
||||
injectCommands_P(PSTR("G29 L1"));
|
||||
injectCommands(F("G29 L1"));
|
||||
return true;
|
||||
case 2:
|
||||
saveAdjustedHighlightedValue();
|
||||
injectCommands_P(PSTR("G29 S1"));
|
||||
injectCommands(F("G29 S1"));
|
||||
mydata.needSave = false;
|
||||
return true;
|
||||
case 3:
|
||||
|
@@ -154,11 +154,11 @@ void BedMeshViewScreen::onMeshUpdate(const int8_t x, const int8_t y, const ExtUI
|
||||
void BedMeshViewScreen::doProbe() {
|
||||
GOTO_SCREEN(BedMeshViewScreen);
|
||||
mydata.count = 0;
|
||||
injectCommands_P(PSTR(BED_LEVELING_COMMANDS));
|
||||
injectCommands(F(BED_LEVELING_COMMANDS));
|
||||
}
|
||||
|
||||
void BedMeshViewScreen::show() {
|
||||
injectCommands_P(PSTR("G29 L1"));
|
||||
injectCommands(F("G29 L1"));
|
||||
GOTO_SCREEN(BedMeshViewScreen);
|
||||
}
|
||||
|
||||
|
@@ -37,7 +37,7 @@ bool ConfirmAutoCalibrationDialogBox::onTouchEnd(uint8_t tag) {
|
||||
switch (tag) {
|
||||
case 1:
|
||||
GOTO_SCREEN(StatusScreen);
|
||||
injectCommands_P(PSTR("G425"));
|
||||
injectCommands(F("G425"));
|
||||
return true;
|
||||
default:
|
||||
return DialogBoxBaseClass::onTouchEnd(tag);
|
||||
|
@@ -33,7 +33,7 @@ using namespace Theme;
|
||||
#define _USER_DESC(N) MAIN_MENU_ITEM_##N##_DESC
|
||||
#define _USER_GCODE(N) MAIN_MENU_ITEM_##N##_GCODE
|
||||
#define _USER_ITEM(N) .tag(_ITEM_TAG(N)).button(USER_ITEM_POS(N), _USER_DESC(N))
|
||||
#define _USER_ACTION(N) case _ITEM_TAG(N): injectCommands_P(PSTR(_USER_GCODE(N))); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break;
|
||||
#define _USER_ACTION(N) case _ITEM_TAG(N): injectCommands(F(_USER_GCODE(N))); TERN_(USER_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break;
|
||||
|
||||
void CustomUserMenus::onRedraw(draw_mode_t what) {
|
||||
if (what & BACKGROUND) {
|
||||
|
@@ -125,11 +125,11 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
|
||||
#if ENABLED(G26_MESH_VALIDATION)
|
||||
case 6:
|
||||
GOTO_SCREEN(StatusScreen);
|
||||
injectCommands_P(PSTR("G28\nM117 Heating...\nG26 R X0 Y0\nG27"));
|
||||
injectCommands(F("G28\nM117 Heating...\nG26 R X0 Y0\nG27"));
|
||||
break;
|
||||
#endif
|
||||
#if ENABLED(BLTOUCH)
|
||||
case 7: injectCommands_P(PSTR("M280 P0 S60")); break;
|
||||
case 7: injectCommands(F("M280 P0 S60")); break;
|
||||
case 8: SpinnerDialogBox::enqueueAndWait(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
|
||||
#endif
|
||||
default: return false;
|
||||
|
@@ -106,10 +106,10 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
|
||||
case 1: SaveSettingsDialogBox::promptToSaveSettings(); break;
|
||||
case 2: SpinnerDialogBox::enqueueAndWait(F("G28")); break;
|
||||
#if ENABLED(NOZZLE_CLEAN_FEATURE)
|
||||
case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
|
||||
case 3: injectCommands(F("G12")); GOTO_SCREEN(StatusScreen); break;
|
||||
#endif
|
||||
case 4: GOTO_SCREEN(MoveAxisScreen); break;
|
||||
case 5: injectCommands_P(PSTR("M84")); break;
|
||||
case 5: injectCommands(F("M84")); break;
|
||||
case 6: GOTO_SCREEN(TemperatureScreen); break;
|
||||
case 7: GOTO_SCREEN(ChangeFilamentScreen); break;
|
||||
case 8: GOTO_SCREEN(AdvancedSettingsMenu); break;
|
||||
|
@@ -35,7 +35,7 @@ void RestoreFailsafeDialogBox::onRedraw(draw_mode_t) {
|
||||
bool RestoreFailsafeDialogBox::onTouchEnd(uint8_t tag) {
|
||||
switch (tag) {
|
||||
case 1:
|
||||
ExtUI::injectCommands_P(PSTR("M502"));
|
||||
ExtUI::injectCommands(F("M502"));
|
||||
AlertDialogBox::show(GET_TEXT_F(MSG_EEPROM_RESET));
|
||||
// Remove RestoreFailsafeDialogBox from the stack
|
||||
// so the alert box doesn't return to it.
|
||||
|
@@ -38,7 +38,7 @@ bool SaveSettingsDialogBox::onTouchEnd(uint8_t tag) {
|
||||
needs_save = false;
|
||||
switch (tag) {
|
||||
case 1:
|
||||
injectCommands_P(PSTR("M500"));
|
||||
injectCommands(F("M500"));
|
||||
AlertDialogBox::show(GET_TEXT_F(MSG_EEPROM_SAVED));
|
||||
// Remove SaveSettingsDialogBox from the stack
|
||||
// so the alert box doesn't return to me.
|
||||
|
@@ -60,7 +60,7 @@ void SpinnerDialogBox::onRefresh() {
|
||||
void SpinnerDialogBox::onRedraw(draw_mode_t) {
|
||||
}
|
||||
|
||||
void SpinnerDialogBox::show(FSTR_P message) {
|
||||
void SpinnerDialogBox::show(FSTR_P fstr) {
|
||||
CommandProcessor cmd;
|
||||
if (AT_SCREEN(SpinnerDialogBox)) cmd.stop().execute();
|
||||
cmd.cmd(CMD_DLSTART)
|
||||
@@ -68,7 +68,7 @@ void SpinnerDialogBox::show(FSTR_P message) {
|
||||
.cmd(CLEAR(true,true,true))
|
||||
.cmd(COLOR_RGB(bg_text_enabled))
|
||||
.tag(0);
|
||||
draw_text_box(cmd, BTN_POS(1,1), BTN_SIZE(2,3), message, OPT_CENTER, font_large);
|
||||
draw_text_box(cmd, BTN_POS(1,1), BTN_SIZE(2,3), fstr, OPT_CENTER, font_large);
|
||||
DLCache dlcache(SPINNER_CACHE);
|
||||
if (!dlcache.store(SPINNER_DL_SIZE)) {
|
||||
SERIAL_ECHO_MSG("CachedScreen::storeBackground() failed: not enough DL cache space");
|
||||
@@ -86,14 +86,14 @@ void SpinnerDialogBox::hide() {
|
||||
GOTO_PREVIOUS();
|
||||
}
|
||||
|
||||
void SpinnerDialogBox::enqueueAndWait(FSTR_P message, FSTR_P commands) {
|
||||
show(message);
|
||||
ExtUI::injectCommands_P((const char*)commands);
|
||||
void SpinnerDialogBox::enqueueAndWait(FSTR_P fstr, FSTR_P commands) {
|
||||
show(fstr);
|
||||
ExtUI::injectCommands(commands);
|
||||
mydata.auto_hide = true;
|
||||
}
|
||||
|
||||
void SpinnerDialogBox::enqueueAndWait(FSTR_P message, char *commands) {
|
||||
show(message);
|
||||
void SpinnerDialogBox::enqueueAndWait(FSTR_P fstr, char *commands) {
|
||||
show(fstr);
|
||||
ExtUI::injectCommands(commands);
|
||||
mydata.auto_hide = true;
|
||||
}
|
||||
|
@@ -84,7 +84,7 @@ void StressTestScreen::runTestOnBootup(bool enable) {
|
||||
// whether or not we need to re-run the test
|
||||
// at startup.
|
||||
LockScreen::set_hash(enable ? 0xDEAD : 0);
|
||||
injectCommands_P(PSTR("M500"));
|
||||
injectCommands(F("M500"));
|
||||
}
|
||||
|
||||
void StressTestScreen::startupCheck() {
|
||||
@@ -122,7 +122,7 @@ void StressTestScreen::onIdle() {
|
||||
injectCommands_P(G28_STR);
|
||||
}
|
||||
else {
|
||||
injectCommands_P(PSTR(
|
||||
injectCommands(F(
|
||||
"G0 X100 Y100 Z100 F6000\n"
|
||||
"T0\nG4 S1"
|
||||
E_TERN_("\nT1\nG4 S1")
|
||||
|
Reference in New Issue
Block a user