CMS/Marlin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix COLOR_UI without TOUCH_SCREEN_CALIBRATION (#20269)

Browse Source
This commit is contained in:
Victor Oliveira 2020-11-25 02:39:49 -03:00 committed by Scott Lahteine
parent 38a62f0d5b
commit c86ede8cfb
2 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
Marlin/src/lcd/tft_io/tft_io.h
View File

@ -71,6 +71,14 @@
// #define TFT_COLOR TFT_COLOR_RGB
// #endif
#define TOUCH_ORIENTATION_NONE 0
#define TOUCH_LANDSCAPE 1
#define TOUCH_PORTRAIT 2
#ifndef TOUCH_ORIENTATION
#define TOUCH_ORIENTATION TOUCH_LANDSCAPE
#endif
#define SSD1963 0x5761
#define ST7735 0x89F0
#define ST7789 0x8552

9
Marlin/src/lcd/tft_io/touch_calibration.h
View File

@ -19,6 +19,7 @@
#pragma once
#include "../../inc/MarlinConfigPre.h"
#include "tft_io.h"
#ifndef TOUCH_SCREEN_CALIBRATION_PRECISION
#define TOUCH_SCREEN_CALIBRATION_PRECISION 80
@ -28,14 +29,6 @@
#define TOUCH_SCREEN_HOLD_TO_CALIBRATE_MS 2500
#endif
#define TOUCH_ORIENTATION_NONE 0
#define TOUCH_LANDSCAPE 1
#define TOUCH_PORTRAIT 2
#ifndef TOUCH_ORIENTATION
#define TOUCH_ORIENTATION TOUCH_LANDSCAPE
#endif
typedef struct __attribute__((__packed__)) {
int32_t x, y;
int16_t offset_x, offset_y;