Fix compile for Taz Pro (#19424)

2020-09-19 10:20:15 -04:00 · 2020-09-19 10:20:15 -04:00 · 4696142a31
commit 4696142a31
parent 435e1535cc
4 changed files with 47 additions and 4 deletions
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/boot_screen.cpp
@ -32,7 +32,7 @@

 #ifdef SHOW_CUSTOM_BOOTSCREEN
  #ifdef TOUCH_UI_PORTRAIT
-    #include "../theme/_bootscreen_portrait.h"
+    #include "../theme/bootscreen_logo_portrait.h"
  #else
    #include "../theme/_bootscreen_landscape.h"
  #endif
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.cpp
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/leveling_menu.cpp
@ -94,9 +94,6 @@ bool LevelingMenu::onTouchEnd(uint8_t tag) {
  switch (tag) {
    case 1: GOTO_PREVIOUS();                   break;
    case 2:
-    #ifndef BED_LEVELING_COMMANDS
-      #define BED_LEVELING_COMMANDS "G29"
-    #endif
    #if HAS_MESH
      BedMeshScreen::startMeshProbe();
    #else
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/screens/screens.h
@ -27,6 +27,10 @@
 #include "../theme/theme.h"
 #include "string_format.h"

+#ifndef BED_LEVELING_COMMANDS
+  #define BED_LEVELING_COMMANDS "G29"
+#endif
+
 extern tiny_timer_t refresh_timer;

 /********************************* DL CACHE SLOTS ******************************/
--- a/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h
+++ b/Marlin/src/lcd/extui/lib/ftdi_eve_touch_ui/theme/bootscreen_logo_portrait.h