Followup fixes to LVGL for Chitu (#18940)

4 years ago · 0e70d8bacb
3 changed files with 33 additions and 27 deletions
--- a/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h
+++ b/Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h
@ -25,7 +25,7 @@
 extern "C" { /* C-declarations for C++ */
 #endif

-#include "../../inc/MarlinConfigPre.h"
+#include "../../../../inc/MarlinConfig.h"

 #include <lvgl.h>

--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
@ -147,7 +147,15 @@
  #endif
 #endif

+// SPI Flash
 #define SPI_FLASH_SIZE                      0x200000  // 2MB
+#define HAS_SPI_FLASH                       1
+
+// SPI 2
+#define W25QXX_CS_PIN                       PB12
+#define W25QXX_MOSI_PIN                     PB15
+#define W25QXX_MISO_PIN                     PB14
+#define W25QXX_SCK_PIN                      PB13

 #if HAS_TFT_LVGL_UI
  #define HAS_SPI_FLASH_FONT                1
@ -156,12 +164,7 @@
  #define HAS_LANG_SELECT_SCREEN            1
  #define HAS_BAK_VIEW_IN_FLASH             0
  #define HAS_LOGO_IN_FLASH                 0
-
-  // SPI 2
-  #define W25QXX_CS_PIN                     PB12
-  #define W25QXX_MOSI_PIN                   PB15
-  #define W25QXX_MISO_PIN                   PB14
-  #define W25QXX_SCK_PIN                    PB13
+  #define HAS_TOUCH_XPT2046                 1

  #define TOUCH_CS_PIN                      PB7   // SPI1_NSS
  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK
--- a/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
+++ b/Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
@ -158,7 +158,15 @@
  #endif
 #endif

+// SPI Flash
 #define SPI_FLASH_SIZE                      0x200000  // 2MB
+#define HAS_SPI_FLASH                       1
+
+// SPI 2
+#define W25QXX_CS_PIN                       PB12
+#define W25QXX_MOSI_PIN                     PB15
+#define W25QXX_MISO_PIN                     PB14
+#define W25QXX_SCK_PIN                      PB13

 #if HAS_TFT_LVGL_UI
  #define HAS_SPI_FLASH_FONT                0
@ -167,12 +175,7 @@
  #define HAS_LANG_SELECT_SCREEN            0
  #define HAS_BAK_VIEW_IN_FLASH             0
  #define HAS_LOGO_IN_FLASH                 0
-
-  // SPI 2
-  #define W25QXX_CS_PIN                     PB12
-  #define W25QXX_MOSI_PIN                   PB15
-  #define W25QXX_MISO_PIN                   PB14
-  #define W25QXX_SCK_PIN                    PB13
+  #define HAS_TOUCH_XPT2046                 1

  #define TOUCH_CS_PIN                      PB7   // SPI1_NSS
  #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK