bissen21/Marlin_Firmware
1
0
Fork 0
Code Issues Pull Requests Projects Releases 4 Wiki Activity

Followup fixes to LVGL for Chitu (#18940)

Browse Source
This commit is contained in:
Victor Oliveira 2020-08-06 22:52:01 -03:00 committed by GitHub
parent 821d9e374e
commit 35e11e5f8b
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 33 additions and 27 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Marlin/src/lcd/extui/lib/mks_ui/pic_manager.h
View File

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

15
Marlin/src/pins/stm32f1/pins_CHITU3D_V5.h
View File

@ -147,7 +147,15 @@
#endif #endif
#endif #endif
// SPI Flash
#define SPI_FLASH_SIZE 0x200000 // 2MB #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 #if HAS_TFT_LVGL_UI
#define HAS_SPI_FLASH_FONT 1 #define HAS_SPI_FLASH_FONT 1
@ -156,12 +164,7 @@
#define HAS_LANG_SELECT_SCREEN 1 #define HAS_LANG_SELECT_SCREEN 1
#define HAS_BAK_VIEW_IN_FLASH 0 #define HAS_BAK_VIEW_IN_FLASH 0
#define HAS_LOGO_IN_FLASH 0 #define HAS_LOGO_IN_FLASH 0
#define HAS_TOUCH_XPT2046 1
// SPI 2
#define W25QXX_CS_PIN PB12
#define W25QXX_MOSI_PIN PB15
#define W25QXX_MISO_PIN PB14
#define W25QXX_SCK_PIN PB13
#define TOUCH_CS_PIN PB7 // SPI1_NSS #define TOUCH_CS_PIN PB7 // SPI1_NSS
#define TOUCH_SCK_PIN PA5 // SPI1_SCK #define TOUCH_SCK_PIN PA5 // SPI1_SCK

15
Marlin/src/pins/stm32f1/pins_CHITU3D_V6.h
View File

@ -158,7 +158,15 @@
#endif #endif
#endif #endif
// SPI Flash
#define SPI_FLASH_SIZE 0x200000 // 2MB #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 #if HAS_TFT_LVGL_UI
#define HAS_SPI_FLASH_FONT 0 #define HAS_SPI_FLASH_FONT 0
@ -167,12 +175,7 @@
#define HAS_LANG_SELECT_SCREEN 0 #define HAS_LANG_SELECT_SCREEN 0
#define HAS_BAK_VIEW_IN_FLASH 0 #define HAS_BAK_VIEW_IN_FLASH 0
#define HAS_LOGO_IN_FLASH 0 #define HAS_LOGO_IN_FLASH 0
#define HAS_TOUCH_XPT2046 1
// SPI 2
#define W25QXX_CS_PIN PB12
#define W25QXX_MOSI_PIN PB15
#define W25QXX_MISO_PIN PB14
#define W25QXX_SCK_PIN PB13
#define TOUCH_CS_PIN PB7 // SPI1_NSS #define TOUCH_CS_PIN PB7 // SPI1_NSS
#define TOUCH_SCK_PIN PA5 // SPI1_SCK #define TOUCH_SCK_PIN PA5 // SPI1_SCK