Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix COLOR_UI compilation without TOUCH_SCREEN_CALIBRATION #20269

Merged
merged 1 commit into from
Nov 25, 2020
Merged

Fix COLOR_UI compilation without TOUCH_SCREEN_CALIBRATION #20269

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
8 changes: 8 additions & 0 deletions Marlin/src/lcd/tft_io/tft_io.h
View file
Open in desktop
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
View file
Open in desktop
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