Browse Source

Fix COLOR_UI without TOUCH_SCREEN_CALIBRATION (#20269)

vanilla_fb_2.0.x
Victor Oliveira 4 years ago
committed by GitHub
parent
commit
04c4c6004e
No known key found for this signature in database GPG Key ID: 4AEE18F83AFDEB23
  1. 8
      Marlin/src/lcd/tft_io/tft_io.h
  2. 9
      Marlin/src/lcd/tft_io/touch_calibration.h

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

@ -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

@ -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;

Loading…
Cancel
Save