Browse Source

Followup fixes to LVGL for Chitu (#18940)

Victor Oliveira 5 years ago
parent
commit
35e11e5f8b
No account linked to committer's email address

+ 1
- 1
Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h View File

@@ -25,7 +25,7 @@
25 25
 extern "C" { /* C-declarations for C++ */
26 26
 #endif
27 27
 
28
-#include "../../inc/MarlinConfigPre.h"
28
+#include "../../../../inc/MarlinConfig.h"
29 29
 
30 30
 #include <lvgl.h>
31 31
 

+ 16
- 13
Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h View File

@@ -147,21 +147,24 @@
147 147
   #endif
148 148
 #endif
149 149
 
150
-#define SPI_FLASH_SIZE 0x200000                   // 2MB
150
+// SPI Flash
151
+#define SPI_FLASH_SIZE                      0x200000  // 2MB
152
+#define HAS_SPI_FLASH                       1
153
+
154
+// SPI 2
155
+#define W25QXX_CS_PIN                       PB12
156
+#define W25QXX_MOSI_PIN                     PB15
157
+#define W25QXX_MISO_PIN                     PB14
158
+#define W25QXX_SCK_PIN                      PB13
151 159
 
152 160
 #if HAS_TFT_LVGL_UI
153
-  #define HAS_SPI_FLASH_FONT 1
154
-  #define HAS_GCODE_PREVIEW 1
155
-  #define HAS_GCODE_DEFAULT_VIEW_IN_FLASH 0
156
-  #define HAS_LANG_SELECT_SCREEN 1
157
-  #define HAS_BAK_VIEW_IN_FLASH 0
158
-  #define HAS_LOGO_IN_FLASH 0
159
-
160
-  // SPI 2
161
-  #define W25QXX_CS_PIN                     PB12
162
-  #define W25QXX_MOSI_PIN                   PB15
163
-  #define W25QXX_MISO_PIN                   PB14
164
-  #define W25QXX_SCK_PIN                    PB13
161
+  #define HAS_SPI_FLASH_FONT                1
162
+  #define HAS_GCODE_PREVIEW                 1
163
+  #define HAS_GCODE_DEFAULT_VIEW_IN_FLASH   0
164
+  #define HAS_LANG_SELECT_SCREEN            1
165
+  #define HAS_BAK_VIEW_IN_FLASH             0
166
+  #define HAS_LOGO_IN_FLASH                 0
167
+  #define HAS_TOUCH_XPT2046                 1
165 168
 
166 169
   #define TOUCH_CS_PIN                      PB7   // SPI1_NSS
167 170
   #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK

+ 16
- 13
Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h View File

@@ -158,21 +158,24 @@
158 158
   #endif
159 159
 #endif
160 160
 
161
-#define SPI_FLASH_SIZE 0x200000                   // 2MB
161
+// SPI Flash
162
+#define SPI_FLASH_SIZE                      0x200000  // 2MB
163
+#define HAS_SPI_FLASH                       1
164
+
165
+// SPI 2
166
+#define W25QXX_CS_PIN                       PB12
167
+#define W25QXX_MOSI_PIN                     PB15
168
+#define W25QXX_MISO_PIN                     PB14
169
+#define W25QXX_SCK_PIN                      PB13
162 170
 
163 171
 #if HAS_TFT_LVGL_UI
164
-  #define HAS_SPI_FLASH_FONT 0
165
-  #define HAS_GCODE_PREVIEW 1
166
-  #define HAS_GCODE_DEFAULT_VIEW_IN_FLASH 0
167
-  #define HAS_LANG_SELECT_SCREEN 0
168
-  #define HAS_BAK_VIEW_IN_FLASH 0
169
-  #define HAS_LOGO_IN_FLASH 0
170
-
171
-  // SPI 2
172
-  #define W25QXX_CS_PIN                     PB12
173
-  #define W25QXX_MOSI_PIN                   PB15
174
-  #define W25QXX_MISO_PIN                   PB14
175
-  #define W25QXX_SCK_PIN                    PB13
172
+  #define HAS_SPI_FLASH_FONT                0
173
+  #define HAS_GCODE_PREVIEW                 1
174
+  #define HAS_GCODE_DEFAULT_VIEW_IN_FLASH   0
175
+  #define HAS_LANG_SELECT_SCREEN            0
176
+  #define HAS_BAK_VIEW_IN_FLASH             0
177
+  #define HAS_LOGO_IN_FLASH                 0
178
+  #define HAS_TOUCH_XPT2046                 1
176 179
 
177 180
   #define TOUCH_CS_PIN                      PB7   // SPI1_NSS
178 181
   #define TOUCH_SCK_PIN                     PA5   // SPI1_SCK

Loading…
Cancel
Save