Fixed SynDaver code for Marlin upstream changes.

drunken-octopus · Jan 15, 2022 · 0cfd718 · 0cfd718
1 parent 3329045
commit 0cfd718
Show file tree

Hide file tree

Showing 9 changed files with 16 additions and 16 deletions.
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/hotend_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/hotend_screen.cpp
@@ -233,7 +233,7 @@ void HotendScreen::onIdle() {
 void HotendScreen::loadFilament() {
   SpinnerDialogBox::show(GET_TEXT_F(MSG_PLEASE_WAIT));
   #ifdef MOVE_TO_FIL_CHG_COMMANDS
-    gcode.process_subcommands_now_P(PSTR(MOVE_TO_FIL_CHG_COMMANDS));
+    gcode.process_subcommands_now(F(MOVE_TO_FIL_CHG_COMMANDS));
   #endif
   const float oldFr = getAxisMaxFeedrate_mm_s(E0);
   setAxisMaxFeedrate_mm_s(MMM_TO_MMS(1000), E0);
@@ -246,7 +246,7 @@ void HotendScreen::loadFilament() {
 void HotendScreen::unloadFilament() {
   SpinnerDialogBox::show(GET_TEXT_F(MSG_PLEASE_WAIT));
   #ifdef MOVE_TO_FIL_CHG_COMMANDS
-    gcode.process_subcommands_now_P(PSTR(MOVE_TO_FIL_CHG_COMMANDS));
+    gcode.process_subcommands_now(F(MOVE_TO_FIL_CHG_COMMANDS));
   #endif
   const float oldFr = getAxisMaxFeedrate_mm_s(E0);
   setAxisMaxFeedrate_mm_s(MMM_TO_MMS(1000), E0);

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/move_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/move_screen.cpp
@@ -80,7 +80,7 @@ void MoveScreen::draw_overlay_icons(draw_mode_t what) {
   ui.button(16, POLY(home_all), style);
 }
 
-void MoveScreen::draw_adjuster(draw_mode_t what, uint8_t tag, progmem_str label, float value, int16_t x, int16_t y, int16_t w, int16_t h) {
+void MoveScreen::draw_adjuster(draw_mode_t what, uint8_t tag, FSTR_P label, float value, int16_t x, int16_t y, int16_t w, int16_t h) {
   #define SUB_COLS 10
   #define SUB_ROWS 1
 

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/move_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/move_screen.h
@@ -36,7 +36,7 @@ class MoveScreen : public BaseScreen, public CachedScreen<MOVE_SCREEN_CACHE> {
     static void draw_arrows(draw_mode_t);
     static void draw_buttons(draw_mode_t);
     static void draw_overlay_icons(draw_mode_t);
-    static void draw_adjuster(draw_mode_t, uint8_t tag, progmem_str label, float value, int16_t x, int16_t y, int16_t w, int16_t h);
+    static void draw_adjuster(draw_mode_t, uint8_t tag, FSTR_P label, float value, int16_t x, int16_t y, int16_t w, int16_t h);
     static void draw_disabled(draw_mode_t, int16_t x, int16_t y, int16_t w, int16_t h) ;
     static void draw_increments(draw_mode_t, int16_t x, int16_t y, int16_t w, int16_t h);
     static float get_increment();

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/printing_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/printing_screen.cpp
@@ -60,7 +60,7 @@ void PrintingScreen::onRedraw(draw_mode_t what) {
   }
 }
 
-void PrintingScreen::setStatusMessage(progmem_str message) {
+void PrintingScreen::setStatusMessage(FSTR_P message) {
   char buff[strlen_P((const char * const)message)+1];
   strcpy_P(buff, (const char * const) message);
   setStatusMessage((const char *) buff);
@@ -131,7 +131,7 @@ void PrintingScreen::pausePrint() {
   if (ExtUI::isPrintingFromMedia())
     ExtUI::pausePrint();
   #ifdef ACTION_ON_PAUSE
-    else host_action_pause();
+    else hostui.pause();
   #endif
 }
 
@@ -142,7 +142,7 @@ void PrintingScreen::resumePrint() {
   else if (ExtUI::isPrintingFromMedia())
     ExtUI::resumePrint();
   #ifdef ACTION_ON_RESUME
-    else host_action_resume();
+    else hostui.resume();
   #endif
 }
 

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/printing_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/printing_screen.h
@@ -33,7 +33,7 @@ class PrintingScreen : public SynLevelBase, public CachedScreen<PRINTING_SCREEN_
     static void bedHeight();
   public:
     static void setStatusMessage(const char *);
-    static void setStatusMessage(progmem_str);
+    static void setStatusMessage(FSTR_P);
     static void onEntry();
     static void onRedraw(draw_mode_t);
     static bool onTouchEnd(uint8_t tag);

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/status_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/status_screen.cpp
@@ -60,7 +60,7 @@ void StatusScreen::onRedraw(draw_mode_t what) {
   }
 }
 
-void StatusScreen::setStatusMessage(progmem_str message) {
+void StatusScreen::setStatusMessage(FSTR_P message) {
   char buff[strlen_P((const char * const)message)+1];
   strcpy_P(buff, (const char * const) message);
   setStatusMessage((const char *) buff);

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/status_screen.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/status_screen.h
@@ -27,7 +27,7 @@
 class StatusScreen : public SynLevelBase, public CachedScreen<STATUS_SCREEN_CACHE,STATUS_SCREEN_DL_SIZE> {
   public:
     static void setStatusMessage(const char *);
-    static void setStatusMessage(progmem_str);
+    static void setStatusMessage(FSTR_P);
     static void onRedraw(draw_mode_t);
     static void onEntry();
     static void onStartup();

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/syn_level_base.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/syn_level_base.cpp
@@ -280,7 +280,7 @@ void SynLevelUI::draw_title(PolyUI::poly_reader_t poly, const char *message) {
   }
 }
 
-void SynLevelUI::draw_title(PolyUI::poly_reader_t poly, progmem_str message) {
+void SynLevelUI::draw_title(PolyUI::poly_reader_t poly, FSTR_P message) {
   if (mode & BACKGROUND) {
     int16_t x, y, w, h;
     bounds(poly, x, y, w, h);
@@ -348,7 +348,7 @@ void SynLevelUI::draw_time(PolyUI::poly_reader_t poly) {
   }
 }
 
-void SynLevelUI::draw_tile(PolyUI::poly_reader_t poly, uint8_t tag, progmem_str label, bool enabled) {
+void SynLevelUI::draw_tile(PolyUI::poly_reader_t poly, uint8_t tag, FSTR_P label, bool enabled) {
   if (mode & FOREGROUND) {
     int16_t x, y, w, h;
     bounds(poly, x, y, w, h);
@@ -372,7 +372,7 @@ void SynLevelUI::draw_tile(PolyUI::poly_reader_t poly, uint8_t tag, progmem_str
 }
 
 
-void SynLevelUI::draw_button(PolyUI::poly_reader_t poly, progmem_str label) {
+void SynLevelUI::draw_button(PolyUI::poly_reader_t poly, FSTR_P label) {
   if (mode & FOREGROUND) {
     int16_t x, y, w, h;
     bounds(poly, x, y, w, h);

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/syn_level_base.h b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/syndaver_level/syn_level_base.h
@@ -46,11 +46,11 @@ class SynLevelUI : public PolyUI {
     void draw_encl(poly_reader_t, uint32_t color = -1u, uint8_t tag = 7);
     void draw_lamp(poly_reader_t, uint32_t color = -1u, uint8_t tag = 8);
     void draw_title(poly_reader_t, const char * const);
-    void draw_title(poly_reader_t, progmem_str message);
+    void draw_title(poly_reader_t, FSTR_P message);
     void draw_file(poly_reader_t);
     void draw_back(poly_reader_t);
-    void draw_button(poly_reader_t, progmem_str label);
-    void draw_tile(poly_reader_t, uint8_t tag, progmem_str label, bool enabled = true);
+    void draw_button(poly_reader_t, FSTR_P label);
+    void draw_tile(poly_reader_t, uint8_t tag, FSTR_P label, bool enabled = true);
     void restore_bitmaps();
 };