zaubentrucker/muele-marlin
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

🚸 Simplify touchscreen calibration for SimUI (#23124)

Browse source
This commit is contained in:
EvilGremlin 2021-11-15 00:15:07 +03:00 committed by Scott Lahteine
parent 3cccb21dc9
commit 8cb646cc20
2 changed files with 44 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Marlin/src/inc/SanityCheck.h
View file

@ -3652,8 +3652,8 @@ static_assert(_PLUS_TEST(4), "HOMING_FEEDRATE_MM_M values must be positive.");
/** /**
* Touch Screen Calibration * Touch Screen Calibration
*/ */
#if ENABLED(TFT_TOUCH_DEVICE_XPT2046) && DISABLED(TOUCH_SCREEN_CALIBRATION) \ #if !MB(LINUX_RAMPS) && ENABLED(TFT_TOUCH_DEVICE_XPT2046) && DISABLED(TOUCH_SCREEN_CALIBRATION) \
&& (!defined(TOUCH_CALIBRATION_X) || !defined(TOUCH_CALIBRATION_Y) || !defined(TOUCH_OFFSET_X) || !defined(TOUCH_OFFSET_Y)) && !(defined(TOUCH_CALIBRATION_X) && defined(TOUCH_CALIBRATION_Y) && defined(TOUCH_OFFSET_X) && defined(TOUCH_OFFSET_Y))
#error "TOUCH_CALIBRATION_[XY] and TOUCH_OFFSET_[XY] are required for resistive touch screens with TOUCH_SCREEN_CALIBRATION disabled." #error "TOUCH_CALIBRATION_[XY] and TOUCH_OFFSET_[XY] are required for resistive touch screens with TOUCH_SCREEN_CALIBRATION disabled."
#endif #endif

47
Marlin/src/pins/linux/pins_RAMPS_LINUX.h
View file

@ -391,6 +391,7 @@
#define BEEPER_PIN 42 #define BEEPER_PIN 42
#define TOUCH_CS_PIN 33 #define TOUCH_CS_PIN 33
#define SD_DETECT_PIN 41 #define SD_DETECT_PIN 41
#define HAS_SPI_FLASH 1 #define HAS_SPI_FLASH 1
@ -407,17 +408,47 @@
#ifndef TFT_DRIVER #ifndef TFT_DRIVER
#define TFT_DRIVER ST7796 #define TFT_DRIVER ST7796
#endif #endif
#ifndef XPT2046_X_CALIBRATION #ifndef TOUCH_SCREEN_CALIBRATION
#define XPT2046_X_CALIBRATION 63934 #if ENABLED(TFT_RES_320x240)
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X 20525
#endif #endif
#ifndef XPT2046_Y_CALIBRATION #ifndef TOUCH_CALIBRATION_Y
#define XPT2046_Y_CALIBRATION 63598 #define TOUCH_CALIBRATION_Y 15335
#endif
#ifndef TOUCH_OFFSET_X
#define TOUCH_OFFSET_X -1
#endif
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y 0
#endif
#elif ENABLED(TFT_RES_480x272)
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X 30715
#endif
#ifndef TOUCH_CALIBRATION_Y
#define TOUCH_CALIBRATION_Y 17415
#endif
#ifndef TOUCH_OFFSET_X
#define TOUCH_OFFSET_X 0
#endif
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y -1
#endif
#elif ENABLED(TFT_RES_480x320)
#ifndef TOUCH_CALIBRATION_X
#define TOUCH_CALIBRATION_X 30595
#endif
#ifndef TOUCH_CALIBRATION_Y
#define TOUCH_CALIBRATION_Y 20415
#endif
#ifndef TOUCH_OFFSET_X
#define TOUCH_OFFSET_X 2
#endif
#ifndef TOUCH_OFFSET_Y
#define TOUCH_OFFSET_Y 1
#endif #endif
#ifndef XPT2046_X_OFFSET
#define XPT2046_X_OFFSET -1
#endif #endif
#ifndef XPT2046_Y_OFFSET
#define XPT2046_Y_OFFSET -20
#endif #endif
#define BTN_BACK 70 #define BTN_BACK 70