Add back checks

lulzbot3d · Jul 8, 2024 · 5ef6ad0 · 5ef6ad0
1 parent e7c6ee9
commit 5ef6ad0
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 3 deletions.
diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/about_screen.cpp
@@ -93,9 +93,13 @@ void AboutScreen::onRedraw(draw_mode_t) {
 
 bool AboutScreen::onTouchEnd(uint8_t tag) {
   switch(tag) {
-    case 1: GOTO_SCREEN(StatisticsScreen);    break;
+    #if ALL(PRINTCOUNTER, FTDI_STATISTICS_SCREEN)
+      case 1: GOTO_SCREEN(StatisticsScreen); break;
+    #endif
     case 2: GOTO_PREVIOUS();            return true;
-    case 3: GOTO_SCREEN(DeveloperMenu); return true;
+    #if ALL(TOUCH_UI_DEVELOPER_MENU, FTDI_DEVELOPER_MENU)
+      case 3: GOTO_SCREEN(DeveloperMenu); break;
+    #endif
     default:                           return false;
   }
 }

diff --git a/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp b/Marlin/src/lcd/extui/ftdi_eve_touch_ui/generic/custom_user_menus.cpp
@@ -32,7 +32,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_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break;
+#define _USER_ACTION(N) case _ITEM_TAG(N): injectCommands(F(_USER_GCODE(N))); TERN_(CUSTOM_MENU_MAIN_SCRIPT_RETURN, GOTO_SCREEN(StatusScreen)); break;
 
 void CustomUserMenus::onRedraw(draw_mode_t what) {
   if (what & BACKGROUND) {