🎨 FTDI Eve Touch UI spinner enqueue string

MarlinFirmware · Oct 3, 2021 · 765b2b4 · 765b2b4
1 parent 2e602b9
commit 765b2b4
Show file tree

Hide file tree

Showing 11 changed files with 17 additions and 17 deletions.
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_e.cpp
@@ -36,7 +36,7 @@ bool BioConfirmHomeE::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
       #if defined(AXIS_LEVELING_COMMANDS) && defined(PARK_AND_RELEASE_COMMANDS)
-        SpinnerDialogBox::enqueueAndWait_P(PSTR(
+        SpinnerDialogBox::enqueueAndWait(F(
           "G28 E\n"
           AXIS_LEVELING_COMMANDS "\n"
           PARK_AND_RELEASE_COMMANDS

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/confirm_home_xyz.cpp
@@ -36,7 +36,7 @@ bool BioConfirmHomeXYZ::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1:
       #ifdef PARK_AND_RELEASE_COMMANDS
-        SpinnerDialogBox::enqueueAndWait_P(PSTR(
+        SpinnerDialogBox::enqueueAndWait(F(
          "G28\n"
          PARK_AND_RELEASE_COMMANDS
         ));

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/main_menu.cpp
@@ -69,10 +69,10 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: SaveSettingsDialogBox::promptToSaveSettings();                           break;
     case 2: GOTO_SCREEN(BioConfirmHomeXYZ);                                          break;
-    case 3: SpinnerDialogBox::enqueueAndWait_P(e_homed ? PSTR("G0 E0 F120") : PSTR("G112")); break;
+    case 3: SpinnerDialogBox::enqueueAndWait(e_homed ? F("G0 E0 F120") : F("G112")); break;
     case 4: StatusScreen::unlockMotors();                                            break;
     #ifdef AXIS_LEVELING_COMMANDS
-      case 5: SpinnerDialogBox::enqueueAndWait_P(PSTR(AXIS_LEVELING_COMMANDS));      break;
+    case 5: SpinnerDialogBox::enqueueAndWait(F(AXIS_LEVELING_COMMANDS));             break;
     #endif
     case 6: GOTO_SCREEN(TemperatureScreen);                                          break;
     case 7: GOTO_SCREEN(InterfaceSettingsScreen);                                    break;

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/status_screen.cpp
@@ -316,7 +316,7 @@ bool StatusScreen::onTouchEnd(uint8_t tag) {
     case  9: GOTO_SCREEN(FilesScreen); break;
     case 10: GOTO_SCREEN(MainMenu); break;
     case 13: GOTO_SCREEN(BioConfirmHomeE); break;
-    case 14: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Z")); break;
+    case 14: SpinnerDialogBox::enqueueAndWait(F("G28Z")); break;
     case 15: GOTO_SCREEN(TemperatureScreen);  break;
     case 16: fine_motion = !fine_motion; break;
     default: return false;

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/bioprinter/tune_menu.cpp
@@ -67,7 +67,7 @@ bool TuneMenu::onTouchEnd(uint8_t tag) {
     case 3: GOTO_SCREEN(TemperatureScreen);                      break;
     case 4: GOTO_SCREEN(NudgeNozzleScreen);                      break;
     case 5: GOTO_SCREEN(BioConfirmHomeXYZ);                      break;
-    case 6: SpinnerDialogBox::enqueueAndWait_P(PSTR("G0 E0 F120")); break;
+    case 6: SpinnerDialogBox::enqueueAndWait(F("G0 E0 F120")); break;
     case 7: StatusScreen::unlockMotors();                        break;
     default:
       return false;

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/leveling_menu.cpp
@@ -82,7 +82,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
     case 3: BedMeshViewScreen::show(); break;
     case 4: BedMeshEditScreen::show(); break;
     case 5: injectCommands_P(PSTR("M280 P0 S60")); break;
-    case 6: SpinnerDialogBox::enqueueAndWait_P(PSTR("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
+    case 6: SpinnerDialogBox::enqueueAndWait(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
     default: return false;
   }
   return true;

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/cocoa_press/status_screen.cpp
@@ -233,7 +233,7 @@ bool StatusScreen::onTouchStart(uint8_t) {
 
 bool StatusScreen::onTouchEnd(uint8_t tag) {
   switch (tag) {
-    case  1: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28 O\nG27")); break;
+    case  1: SpinnerDialogBox::enqueueAndWait(F("G28 O\nG27")); break;
     case  2: GOTO_SCREEN(LoadChocolateScreen); break;
     case  3: GOTO_SCREEN(PreheatMenu); break;
     case  4: GOTO_SCREEN(MainMenu); break;

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/bed_mesh_edit_screen.cpp
@@ -191,7 +191,7 @@ bool BedMeshEditScreen::onTouchEnd(uint8_t tag) {
 
 void BedMeshEditScreen::show() {
   // On entry, always home (to account for possible Z offset changes) and save current mesh
-  SpinnerDialogBox::enqueueAndWait_P(PSTR("G28\nG29 S1"));
+  SpinnerDialogBox::enqueueAndWait(F("G28\nG29 S1"));
   // After the spinner, go to this screen.
   current_screen.forget();
   PUSH_SCREEN(BedMeshEditScreen);

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/leveling_menu.cpp
@@ -104,7 +104,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
   switch (tag) {
     case 1: GOTO_PREVIOUS(); break;
     #if EITHER(Z_STEPPER_AUTO_ALIGN,MECHANICAL_GANTRY_CALIBRATION)
-      case 2: SpinnerDialogBox::enqueueAndWait_P(PSTR("G34")); break;
+      case 2: SpinnerDialogBox::enqueueAndWait(F("G34")); break;
     #endif
     #if HAS_BED_PROBE
       case 3:
@@ -114,7 +114,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
         #if ENABLED(AUTO_BED_LEVELING_UBL)
           BedMeshViewScreen::doProbe();
         #else
-          SpinnerDialogBox::enqueueAndWait_P(PSTR(BED_LEVELING_COMMANDS));
+          SpinnerDialogBox::enqueueAndWait(F(BED_LEVELING_COMMANDS));
         #endif
         break;
     #endif
@@ -130,7 +130,7 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
     #endif
     #if ENABLED(BLTOUCH)
       case 7: injectCommands_P(PSTR("M280 P0 S60")); break;
-      case 8: SpinnerDialogBox::enqueueAndWait_P(PSTR("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
+      case 8: SpinnerDialogBox::enqueueAndWait(F("M280 P0 S90\nG4 P100\nM280 P0 S120")); break;
     #endif
     default: return false;
   }

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/main_menu.cpp
@@ -104,7 +104,7 @@ bool MainMenu::onTouchEnd(uint8_t tag) {
 
   switch (tag) {
     case 1:  SaveSettingsDialogBox::promptToSaveSettings();           break;
-    case 2:  SpinnerDialogBox::enqueueAndWait_P(PSTR("G28"));            break;
+    case 2:  SpinnerDialogBox::enqueueAndWait(F("G28"));            break;
     #if ENABLED(NOZZLE_CLEAN_FEATURE)
       case 3: injectCommands_P(PSTR("G12")); GOTO_SCREEN(StatusScreen); break;
     #endif

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/move_axis_screen.cpp
@@ -98,10 +98,10 @@ bool BaseMoveAxisScreen::onTouchHeld(uint8_t tag) {
     case 14: UI_DECREMENT_AXIS(E3); mydata.e_rel[3] -= increment; break;
     case 15: UI_INCREMENT_AXIS(E3); mydata.e_rel[3] += increment; break;
     #endif
-    case 20: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28X")); break;
-    case 21: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Y")); break;
-    case 22: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28Z")); break;
-    case 23: SpinnerDialogBox::enqueueAndWait_P(PSTR("G28")); break;
+    case 20: SpinnerDialogBox::enqueueAndWait(F("G28X")); break;
+    case 21: SpinnerDialogBox::enqueueAndWait(F("G28Y")); break;
+    case 22: SpinnerDialogBox::enqueueAndWait(F("G28Z")); break;
+    case 23: SpinnerDialogBox::enqueueAndWait(F("G28")); break;
     case 24: raiseZtoTop(); break;
     default:
       return false;