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

Add Touch Calibration screen (#20049)

Browse Source
This commit is contained in:
Victor Oliveira
2020-11-15 19:39:58 -03:00
committed by GitHub
parent cab83ba840
commit ea371618da
45 changed files with 845 additions and 904 deletions
Download Patch File Download Diff File Expand all files Collapse all files

31
Marlin/src/pins/lpc1768/pins_BTT_SKR_V1_4.h
View File

@ -353,36 +353,7 @@
#define LCD_PINS_ENABLE -1
#define LCD_PINS_RS -1
// XPT2046 Touch Screen calibration
#if ENABLED(TFT_CLASSIC_UI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -11245
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 8629
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 685
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -285
#endif
#elif ENABLED(TFT_480x320_SPI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -17232
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 11196
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 1047
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -358
#endif
#define TFT_BUFFER_SIZE 2400
#endif
#define TFT_BUFFER_SIZE 2400
#elif IS_TFTGLCD_PANEL

31
Marlin/src/pins/lpc1768/pins_MKS_SGEN_L.h
View File

@ -268,36 +268,7 @@
#define LCD_PINS_ENABLE -1
#define LCD_PINS_RS -1
// XPT2046 Touch Screen calibration
#if ENABLED(TFT_CLASSIC_UI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -11386
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 8684
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 689
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -273
#endif
#elif ENABLED(TFT_COLOR_UI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -16741
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 11258
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 1024
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -367
#endif
#define TFT_BUFFER_SIZE 2400
#endif
#define TFT_BUFFER_SIZE 2400
#define BTN_EN1 P3_25
#define BTN_EN2 P3_26

31
Marlin/src/pins/lpc1769/pins_MKS_SGEN_L_V2.h
View File

@ -318,36 +318,7 @@
#define LCD_PINS_ENABLE -1
#define LCD_PINS_RS -1
// XPT2046 Touch Screen calibration
#if ENABLED(TFT_CLASSIC_UI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -11386
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 8684
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 689
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -273
#endif
#elif ENABLED(TFT_COLOR_UI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -17089
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 11424
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 1044
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -365
#endif
#define TFT_BUFFER_SIZE 2400
#endif
#define TFT_BUFFER_SIZE 2400
#else // !MKS_12864OLED_SSD1306

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

@ -158,17 +158,17 @@
// XPT2046 Touch Screen calibration
#if ANY(TFT_LVGL_UI, TFT_COLOR_UI, TFT_CLASSIC_UI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -17181
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X -17181
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 11434
#ifndef TOUCH_CALIBRATION_Y
#define TOUCH_CALIBRATION_Y 11434
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 501
#ifndef TOUCH_OFFSET_X
#define TOUCH_OFFSET_X 501
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -9
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y -9
#endif
#endif

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

@ -173,17 +173,17 @@
// XPT2046 Touch Screen calibration
#if ANY(TFT_LVGL_UI, TFT_COLOR_UI, TFT_CLASSIC_UI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -17181
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X -17181
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 11434
#ifndef TOUCH_CALIBRATION_Y
#define TOUCH_CALIBRATION_Y 11434
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 501
#ifndef TOUCH_OFFSET_X
#define TOUCH_OFFSET_X 501
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -9
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y -9
#endif
#endif

60
Marlin/src/pins/stm32f1/pins_FLSUN_HISPEED.h
View File

@ -286,22 +286,22 @@
// MKS Robin TFT v2.0 with ILI9341
// Read display identification information (0xD3 on ILI9341)
//#define XPT2046_X_CALIBRATION 12013
//#define XPT2046_Y_CALIBRATION -8711
//#define XPT2046_X_OFFSET -32
//#define XPT2046_Y_OFFSET 256
//#define TOUCH_CALIBRATION_X 12013
//#define TOUCH_CALIBRATION_Y -8711
//#define TOUCH_OFFSET_X -32
//#define TOUCH_OFFSET_Y 256
// MKS Robin TFT v1.1 with ILI9328
//#define XPT2046_X_CALIBRATION -11792
//#define XPT2046_Y_CALIBRATION 8947
//#define XPT2046_X_OFFSET 342
//#define XPT2046_Y_OFFSET -19
//#define TOUCH_CALIBRATION_X -11792
//#define TOUCH_CALIBRATION_Y 8947
//#define TOUCH_OFFSET_X 342
//#define TOUCH_OFFSET_Y -19
// MKS Robin TFT v1.1 with R61505
//#define XPT2046_X_CALIBRATION 12489
//#define XPT2046_Y_CALIBRATION 9210
//#define XPT2046_X_OFFSET -52
//#define XPT2046_Y_OFFSET -17
//#define TOUCH_CALIBRATION_X 12489
//#define TOUCH_CALIBRATION_Y 9210
//#define TOUCH_OFFSET_X -52
//#define TOUCH_OFFSET_Y -17
// QQS-Pro uses MKS Robin TFT v2.0
@ -324,42 +324,6 @@
#define TOUCH_BUTTONS_HW_SPI_DEVICE 2
#endif
// XPT2046 Touch Screen calibration
#if EITHER(TFT_LVGL_UI_FSMC, TFT_COLOR_UI)
#define TFT_BUFFER_SIZE 14400
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION 12218
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION -8814
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET -35
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET 256
#endif
#elif ENABLED(TFT_CLASSIC_UI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION 12149
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION -8746
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET -35
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET 256
#endif
#define TFT_MARLINUI_COLOR 0xFFFF // White
#define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
#define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
#endif
#if NEED_TOUCH_PINS
#define TOUCH_CS_PIN PC2 // SPI2_NSS
#define TOUCH_SCK_PIN PB13 // SPI2_SCK

29
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_E3P.h
View File

@ -282,35 +282,6 @@
#define TFT_BUFFER_SIZE 14400
#endif
// XPT2046 Touch Screen calibration
#if EITHER(HAS_TFT_LVGL_UI, TFT_480x320_SPI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -17253
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 11579
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 514
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -24
#endif
#elif HAS_SPI_GRAPHICAL_TFT
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -11386
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 8684
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 339
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -18
#endif
#endif
#if HAS_WIRED_LCD && !HAS_SPI_TFT
// NON TFT Displays

16
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_MINI.h
View File

@ -171,17 +171,17 @@
#endif
#if ENABLED(TOUCH_SCREEN)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION 12033
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X 12033
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION -9047
#ifndef TOUCH_CALIBRATION_Y
#define TOUCH_CALIBRATION_Y -9047
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET -30
#ifndef TOUCH_OFFSET_X
#define TOUCH_OFFSET_X -30
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET 254
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y 254
#endif
#endif

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

@ -202,35 +202,6 @@
#define TFT_BUFFER_SIZE 14400
#endif
// XPT2046 Touch Screen calibration
#if ANY(HAS_TFT_LVGL_UI_FSMC, TFT_COLOR_UI, TFT_CLASSIC_UI) && ENABLED(TFT_RES_480x320)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION 17880
#endif
#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
#elif EITHER(TFT_COLOR_UI, TFT_CLASSIC_UI) && ENABLED(TFT_RES_320x240)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -12246
#endif
#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
#endif
#define HAS_SPI_FLASH 1
#if HAS_SPI_FLASH
#define SPI_FLASH_SIZE 0x1000000 // 16MB

16
Marlin/src/pins/stm32f1/pins_MKS_ROBIN_NANO_V2.h
View File

@ -285,22 +285,6 @@
#define TFT_BUFFER_SIZE 14400
#endif
// XPT2046 Touch Screen calibration
#if ANY(TFT_LVGL_UI, TFT_COLOR_UI, TFT_CLASSIC_UI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -17253
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 11579
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 514
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -24
#endif
#endif
#if HAS_WIRED_LCD && !HAS_SPI_TFT
// NON TFT Displays

16
Marlin/src/pins/stm32f1/pins_TRIGORILLA_PRO.h
View File

@ -141,17 +141,17 @@
// XPT2046 Touch Screen calibration
#if ANY(TFT_COLOR_UI, TFT_LVGL_UI, TFT_CLASSIC_UI)
#ifndef XPT2046_X_CALIBRATION
#define XPT2046_X_CALIBRATION -17181
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X -17181
#endif
#ifndef XPT2046_Y_CALIBRATION
#define XPT2046_Y_CALIBRATION 11434
#ifndef TOUCH_CALIBRATION_Y
#define TOUCH_CALIBRATION_Y 11434
#endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET 501
#ifndef TOUCH_OFFSET_X
#define TOUCH_OFFSET_X 501
#endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -9
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y -9
#endif
#endif