Fix COLOR_UI without TOUCH_SCREEN_CALIBRATION (#20269)

This commit is contained in:
Victor Oliveira 2020-11-25 02:39:49 -03:00 committed by GitHub
parent 2693e35cae
commit 04c4c6004e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 9 additions and 8 deletions

View File

@ -71,6 +71,14 @@
// #define TFT_COLOR TFT_COLOR_RGB // #define TFT_COLOR TFT_COLOR_RGB
// #endif // #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 SSD1963 0x5761
#define ST7735 0x89F0 #define ST7735 0x89F0
#define ST7789 0x8552 #define ST7789 0x8552

View File

@ -19,6 +19,7 @@
#pragma once #pragma once
#include "../../inc/MarlinConfigPre.h" #include "../../inc/MarlinConfigPre.h"
#include "tft_io.h"
#ifndef TOUCH_SCREEN_CALIBRATION_PRECISION #ifndef TOUCH_SCREEN_CALIBRATION_PRECISION
#define TOUCH_SCREEN_CALIBRATION_PRECISION 80 #define TOUCH_SCREEN_CALIBRATION_PRECISION 80
@ -28,14 +29,6 @@
#define TOUCH_SCREEN_HOLD_TO_CALIBRATE_MS 2500 #define TOUCH_SCREEN_HOLD_TO_CALIBRATE_MS 2500
#endif #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__)) { typedef struct __attribute__((__packed__)) {
int32_t x, y; int32_t x, y;
int16_t offset_x, offset_y; int16_t offset_x, offset_y;