|
@@ -194,10 +194,18 @@
|
194
|
194
|
// LVGL Configs
|
195
|
195
|
#if ENABLED(TFT_LVGL_UI_FSMC)
|
196
|
196
|
|
197
|
|
- #define XPT2046_X_CALIBRATION 17880
|
198
|
|
- #define XPT2046_Y_CALIBRATION -12234
|
199
|
|
- #define XPT2046_X_OFFSET -45
|
200
|
|
- #define XPT2046_Y_OFFSET 349
|
|
197
|
+ #ifndef XPT2046_X_CALIBRATION
|
|
198
|
+ #define XPT2046_X_CALIBRATION 17880
|
|
199
|
+ #endif
|
|
200
|
+ #ifndef XPT2046_Y_CALIBRATION
|
|
201
|
+ #define XPT2046_Y_CALIBRATION -12234
|
|
202
|
+ #endif
|
|
203
|
+ #ifndef XPT2046_X_OFFSET
|
|
204
|
+ #define XPT2046_X_OFFSET -45
|
|
205
|
+ #endif
|
|
206
|
+ #ifndef XPT2046_Y_OFFSET
|
|
207
|
+ #define XPT2046_Y_OFFSET 349
|
|
208
|
+ #endif
|
201
|
209
|
|
202
|
210
|
// Emulated DOGM Configs
|
203
|
211
|
#elif ENABLED(FSMC_GRAPHICAL_TFT)
|
|
@@ -244,10 +252,18 @@
|
244
|
252
|
#define FSMC_DMA_DEV DMA2
|
245
|
253
|
#define FSMC_DMA_CHANNEL DMA_CH5
|
246
|
254
|
|
247
|
|
- #define XPT2046_X_CALIBRATION -12246
|
248
|
|
- #define XPT2046_Y_CALIBRATION 9453
|
249
|
|
- #define XPT2046_X_OFFSET 360
|
250
|
|
- #define XPT2046_Y_OFFSET -22
|
|
255
|
+ #ifndef XPT2046_X_CALIBRATION
|
|
256
|
+ #define XPT2046_X_CALIBRATION -12246
|
|
257
|
+ #endif
|
|
258
|
+ #ifndef XPT2046_Y_CALIBRATION
|
|
259
|
+ #define XPT2046_Y_CALIBRATION 9453
|
|
260
|
+ #endif
|
|
261
|
+ #ifndef XPT2046_X_OFFSET
|
|
262
|
+ #define XPT2046_X_OFFSET 360
|
|
263
|
+ #endif
|
|
264
|
+ #ifndef XPT2046_Y_OFFSET
|
|
265
|
+ #define XPT2046_Y_OFFSET -22
|
|
266
|
+ #endif
|
251
|
267
|
|
252
|
268
|
#define TOUCH_CS_PIN PA7 // SPI2_NSS
|
253
|
269
|
#define TOUCH_SCK_PIN PB13 // SPI2_SCK
|
|
@@ -265,11 +281,19 @@
|
265
|
281
|
#define ILI9341_COLOR_RGB
|
266
|
282
|
|
267
|
283
|
#elif ENABLED(TFT_480x320)
|
268
|
|
- #define XPT2046_X_CALIBRATION 17880
|
269
|
|
- #define XPT2046_Y_CALIBRATION -12234
|
270
|
|
- #define XPT2046_X_OFFSET -45
|
271
|
|
- #define XPT2046_Y_OFFSET 349
|
272
|
|
-
|
|
284
|
+ #ifndef XPT2046_X_CALIBRATION
|
|
285
|
+ #define XPT2046_X_CALIBRATION 17880
|
|
286
|
+ #endif
|
|
287
|
+ #ifndef XPT2046_Y_CALIBRATION
|
|
288
|
+ #define XPT2046_Y_CALIBRATION -12234
|
|
289
|
+ #endif
|
|
290
|
+ #ifndef XPT2046_X_OFFSET
|
|
291
|
+ #define XPT2046_X_OFFSET -45
|
|
292
|
+ #endif
|
|
293
|
+ #ifndef XPT2046_Y_OFFSET
|
|
294
|
+ #define XPT2046_Y_OFFSET 349
|
|
295
|
+ #endif
|
|
296
|
+
|
273
|
297
|
#define TFT_DRIVER ILI9488
|
274
|
298
|
#define TFT_BUFFER_SIZE 14400
|
275
|
299
|
#define ILI9488_ORIENTATION ILI9488_MADCTL_MX | ILI9488_MADCTL_MV
|