move macros to compile COLOR_UI with and without TOUCH_SCREEN_CALIBRA…

…TION
MarlinFirmware · Nov 25, 2020 · 95d56ea · 95d56ea
1 parent e38abef
commit 95d56ea
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 8 deletions.
diff --git a/Marlin/src/lcd/tft_io/tft_io.h b/Marlin/src/lcd/tft_io/tft_io.h
@@ -33,6 +33,14 @@
   #error "TFT IO only supports SPI or FSMC interface"
 #endif
 
+#define TOUCH_ORIENTATION_NONE  0
+#define TOUCH_LANDSCAPE         1
+#define TOUCH_PORTRAIT          2
+
+#ifndef TOUCH_ORIENTATION
+  #define TOUCH_ORIENTATION    TOUCH_LANDSCAPE
+#endif
+
 #define TFT_EXCHANGE_XY (1UL << 1)
 #define TFT_INVERT_X    (1UL << 2)
 #define TFT_INVERT_Y    (1UL << 3)

diff --git a/Marlin/src/lcd/tft_io/touch_calibration.h b/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;