TFT_LITTLE_VGL_UI followup (MarlinFirmware#18410)

jmp0x0000 · Aug 7, 2020 · cf238e9 · cf238e9
1 parent c7b9664
commit cf238e9
Show file tree

Hide file tree

Showing 6 changed files with 238 additions and 232 deletions.
diff --git a/Marlin/src/MarlinCore.cpp b/Marlin/src/MarlinCore.cpp
@@ -61,8 +61,8 @@
 
 #if ENABLED(TFT_LITTLE_VGL_UI)
   #include "lvgl.h"
-  #include "lcd/extui/lib/mks_ui/inc/tft_lvgl_configuration.h"
-  #include "lcd/extui/lib/mks_ui/inc/draw_ui.h"
+  #include "lcd/extui/lib/mks_ui/tft_lvgl_configuration.h"
+  #include "lcd/extui/lib/mks_ui/draw_ui.h"
 #endif
 
 #if ENABLED(DWIN_CREALITY_LCD)

diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.h b/Marlin/src/lcd/extui/lib/mks_ui/draw_error_message.h
@@ -25,6 +25,10 @@
 extern "C" { /* C-declarations for C++ */
 #endif
 
+#ifndef PGM_P
+  #define PGM_P const char *
+#endif
+
 extern void lv_draw_error_message(PGM_P const msg);
 extern void lv_clear_error_message();
 

diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp b/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.cpp
@@ -46,6 +46,8 @@
   #include "../../../../feature/pause.h"
 #endif
 
+#include "draw_ui.h"
+
 CFG_ITMES gCfgItems;
 UI_CFG uiCfg;
 DISP_STATE_STACK disp_state_stack;

diff --git a/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h b/Marlin/src/lcd/extui/lib/mks_ui/draw_ui.h
@@ -28,25 +28,25 @@ extern "C" { /* C-declarations for C++ */
 #include <stdint.h>
 #include <string.h>
 #include "lvgl.h"
-#include "inc/tft_multi_language.h"
-#include "inc/draw_ready_print.h"
-#include "inc/draw_language.h"
-#include "inc/draw_set.h"
-#include "inc/draw_tool.h"
-#include "inc/draw_print_file.h"
-#include "inc/draw_dialog.h"
-#include "inc/draw_printing.h"
-#include "inc/draw_opration.h"
-#include "inc/draw_preHeat.h"
-#include "inc/draw_extrusion.h"
-#include "inc/draw_home.h"
-#include "inc/draw_move_motor.h"
-#include "inc/draw_fan.h"
-#include "inc/draw_about.h"
-#include "inc/draw_change_speed.h"
-#include "inc/draw_manuaLevel.h"
-#include "inc/draw_error_message.h"
-#include "inc/printer_opration.h"
+#include "tft_multi_language.h"
+#include "draw_ready_print.h"
+#include "draw_language.h"
+#include "draw_set.h"
+#include "draw_tool.h"
+#include "draw_print_file.h"
+#include "draw_dialog.h"
+#include "draw_printing.h"
+#include "draw_opration.h"
+#include "draw_preHeat.h"
+#include "draw_extrusion.h"
+#include "draw_home.h"
+#include "draw_move_motor.h"
+#include "draw_fan.h"
+#include "draw_about.h"
+#include "draw_change_speed.h"
+#include "draw_manuaLevel.h"
+#include "draw_error_message.h"
+#include "printer_opration.h"
 
 #define TFT35