|
|
@ -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)
|
|
|
|
#endif
|
|
|
|
#ifndef TOUCH_CALIBRATION_X
|
|
|
|
#ifndef XPT2046_Y_CALIBRATION
|
|
|
|
#define TOUCH_CALIBRATION_X 20525
|
|
|
|
#define XPT2046_Y_CALIBRATION 63598
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#ifndef TOUCH_CALIBRATION_Y
|
|
|
|
#ifndef XPT2046_X_OFFSET
|
|
|
|
#define TOUCH_CALIBRATION_Y 15335
|
|
|
|
#define XPT2046_X_OFFSET -1
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
#ifndef TOUCH_OFFSET_X
|
|
|
|
#ifndef XPT2046_Y_OFFSET
|
|
|
|
#define TOUCH_OFFSET_X -1
|
|
|
|
#define XPT2046_Y_OFFSET -20
|
|
|
|
#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
|
|
|
|
#endif
|
|
|
|
#endif
|
|
|
|
|
|
|
|
|
|
|
|
#define BTN_BACK 70
|
|
|
|
#define BTN_BACK 70
|
|
|
|