Skip to content

Commit

Permalink
Fix COLOR_UI without TOUCH_SCREEN_CALIBRATION (MarlinFirmware#20269)
Browse files Browse the repository at this point in the history
  • Loading branch information
rhapsodyv authored and Minims committed Nov 26, 2020
1 parent 9c9a438 commit 767422d
Show file tree
Hide file tree
Showing 2 changed files with 9 additions and 8 deletions.
8 changes: 8 additions & 0 deletions Marlin/src/lcd/tft_io/tft_io.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
9 changes: 1 addition & 8 deletions Marlin/src/lcd/tft_io/touch_calibration.h
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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;
Expand Down

0 comments on commit 767422d

Please sign in to comment.