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

Permit touch params override w/ Robin nano (#19196)

Browse Source
This commit is contained in:
Martin 2020-09-01 01:56:58 +02:00 committed by GitHub
parent 41c7ae5d54
commit 4ab4dbb8a1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 37 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

50
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO.h
View File

@ -194,10 +194,18 @@
// LVGL Configs // LVGL Configs
#if ENABLED(TFT_LVGL_UI_FSMC) #if ENABLED(TFT_LVGL_UI_FSMC)
#define XPT2046_X_CALIBRATION 17880 #ifndef XPT2046_X_CALIBRATION
#define XPT2046_Y_CALIBRATION -12234 #define XPT2046_X_CALIBRATION 17880
#define XPT2046_X_OFFSET -45 #endif
#define XPT2046_Y_OFFSET 349 #ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION -12234
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET -45
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET 349
#endif
// Emulated DOGM Configs // Emulated DOGM Configs
#elif ENABLED(FSMC_GRAPHICAL_TFT) #elif ENABLED(FSMC_GRAPHICAL_TFT)
@ -244,10 +252,18 @@
#define FSMC_DMA_DEV DMA2 #define FSMC_DMA_DEV DMA2
#define FSMC_DMA_CHANNEL DMA_CH5 #define FSMC_DMA_CHANNEL DMA_CH5
#define XPT2046_X_CALIBRATION -12246 #ifndef XPT2046_X_CALIBRATION
#define XPT2046_Y_CALIBRATION 9453 #define XPT2046_X_CALIBRATION -12246
#define XPT2046_X_OFFSET 360 #endif
#define XPT2046_Y_OFFSET -22 #ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 9453
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 360
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -22
#endif
#define TOUCH_CS_PIN PA7 // SPI2_NSS #define TOUCH_CS_PIN PA7 // SPI2_NSS
#define TOUCH_SCK_PIN PB13 // SPI2_SCK #define TOUCH_SCK_PIN PB13 // SPI2_SCK
@ -265,11 +281,19 @@
#define ILI9341_COLOR_RGB #define ILI9341_COLOR_RGB
#elif ENABLED(TFT_480x320) #elif ENABLED(TFT_480x320)
#define XPT2046_X_CALIBRATION 17880 #ifndef XPT2046_X_CALIBRATION
#define XPT2046_Y_CALIBRATION -12234 #define XPT2046_X_CALIBRATION 17880
#define XPT2046_X_OFFSET -45 #endif
#define XPT2046_Y_OFFSET 349 #ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION -12234
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET -45
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET 349
#endif
#define TFT_DRIVER ILI9488 #define TFT_DRIVER ILI9488
#define TFT_BUFFER_SIZE 14400 #define TFT_BUFFER_SIZE 14400
#define ILI9488_ORIENTATION ILI9488_MADCTL_MX | ILI9488_MADCTL_MV #define ILI9488_ORIENTATION ILI9488_MADCTL_MX | ILI9488_MADCTL_MV