Move FSMC_GRAPHICAL_TFT options to config-adv

MarlinFirmware · Aug 28, 2019 · b4ba0c5 · b4ba0c5
1 parent d03cc6b
commit b4ba0c5
Show file tree

Hide file tree

Showing 225 changed files with 1,224 additions and 985 deletions.
diff --git a/Marlin/Configuration.h b/Marlin/Configuration.h
@@ -2054,15 +2054,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 //#define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
-
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/Marlin/Configuration_adv.h b/Marlin/Configuration_adv.h
@@ -1214,6 +1214,18 @@
  //#define TOUCH_UI_PASSCODE
 #endif
 
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define TFT_MARLINUI_COLOR 0xFFFF // White
+ #define TFT_MARLINBG_COLOR 0x0000 // Black
+ #define TFT_DISABLED_COLOR 0x0003 // Almost black
+ #define TFT_BTCANCEL_COLOR 0xF800 // Red
+ #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
 // @section safety
 
 /**

diff --git a/config/default/Configuration.h b/config/default/Configuration.h
@@ -2054,14 +2054,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 //#define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/config/default/Configuration_adv.h b/config/default/Configuration_adv.h
@@ -1214,6 +1214,18 @@
  //#define TOUCH_UI_PASSCODE
 #endif
 
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define TFT_MARLINUI_COLOR 0xFFFF // White
+ #define TFT_MARLINBG_COLOR 0x0000 // Black
+ #define TFT_DISABLED_COLOR 0x0003 // Almost black
+ #define TFT_BTCANCEL_COLOR 0xF800 // Red
+ #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
 // @section safety
 
 /**

diff --git a/config/examples/3DFabXYZ/Migbot/Configuration.h b/config/examples/3DFabXYZ/Migbot/Configuration.h
@@ -2085,14 +2085,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 //#define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/config/examples/3DFabXYZ/Migbot/Configuration_adv.h b/config/examples/3DFabXYZ/Migbot/Configuration_adv.h
@@ -1214,6 +1214,18 @@
  //#define TOUCH_UI_PASSCODE
 #endif
 
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define TFT_MARLINUI_COLOR 0xFFFF // White
+ #define TFT_MARLINBG_COLOR 0x0000 // Black
+ #define TFT_DISABLED_COLOR 0x0003 // Almost black
+ #define TFT_BTCANCEL_COLOR 0xF800 // Red
+ #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
 // @section safety
 
 /**

diff --git a/config/examples/ADIMLab/Gantry v1/Configuration.h b/config/examples/ADIMLab/Gantry v1/Configuration.h
@@ -2055,14 +2055,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 //#define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/config/examples/ADIMLab/Gantry v1/Configuration_adv.h b/config/examples/ADIMLab/Gantry v1/Configuration_adv.h
@@ -1200,6 +1200,18 @@
  //#define TOUCH_UI_PASSCODE
 #endif
 
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define TFT_MARLINUI_COLOR 0xFFFF // White
+ #define TFT_MARLINBG_COLOR 0x0000 // Black
+ #define TFT_DISABLED_COLOR 0x0003 // Almost black
+ #define TFT_BTCANCEL_COLOR 0xF800 // Red
+ #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
 // @section safety
 
 /**

diff --git a/config/examples/ADIMLab/Gantry v2/Configuration.h b/config/examples/ADIMLab/Gantry v2/Configuration.h
@@ -2055,14 +2055,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 //#define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/config/examples/ADIMLab/Gantry v2/Configuration_adv.h b/config/examples/ADIMLab/Gantry v2/Configuration_adv.h
@@ -1214,6 +1214,18 @@
  //#define TOUCH_UI_PASSCODE
 #endif
 
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define TFT_MARLINUI_COLOR 0xFFFF // White
+ #define TFT_MARLINBG_COLOR 0x0000 // Black
+ #define TFT_DISABLED_COLOR 0x0003 // Almost black
+ #define TFT_BTCANCEL_COLOR 0xF800 // Red
+ #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
 // @section safety
 
 /**

diff --git a/config/examples/AlephObjects/TAZ4/Configuration.h b/config/examples/AlephObjects/TAZ4/Configuration.h
@@ -2074,14 +2074,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 //#define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/config/examples/AlephObjects/TAZ4/Configuration_adv.h b/config/examples/AlephObjects/TAZ4/Configuration_adv.h
@@ -1214,6 +1214,18 @@
  //#define TOUCH_UI_PASSCODE
 #endif
 
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define TFT_MARLINUI_COLOR 0xFFFF // White
+ #define TFT_MARLINBG_COLOR 0x0000 // Black
+ #define TFT_DISABLED_COLOR 0x0003 // Almost black
+ #define TFT_BTCANCEL_COLOR 0xF800 // Red
+ #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
 // @section safety
 
 /**

diff --git a/config/examples/Alfawise/U20/Configuration.h b/config/examples/Alfawise/U20/Configuration.h
@@ -2134,14 +2134,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 #define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/config/examples/Alfawise/U20/Configuration_adv.h b/config/examples/Alfawise/U20/Configuration_adv.h
@@ -1217,6 +1217,18 @@
  //#define TOUCH_UI_PASSCODE
 #endif
 
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define TFT_MARLINUI_COLOR 0xFFFF // White
+ #define TFT_MARLINBG_COLOR 0x0000 // Black
+ #define TFT_DISABLED_COLOR 0x0003 // Almost black
+ #define TFT_BTCANCEL_COLOR 0xF800 // Red
+ #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
 // @section safety
 
 /**

diff --git a/config/examples/AliExpress/CL-260/Configuration.h b/config/examples/AliExpress/CL-260/Configuration.h
@@ -2054,14 +2054,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 //#define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/config/examples/AliExpress/UM2pExt/Configuration.h b/config/examples/AliExpress/UM2pExt/Configuration.h
@@ -2065,14 +2065,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 //#define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/config/examples/AliExpress/UM2pExt/Configuration_adv.h b/config/examples/AliExpress/UM2pExt/Configuration_adv.h
@@ -1214,6 +1214,18 @@
  //#define TOUCH_UI_PASSCODE
 #endif
 
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define TFT_MARLINUI_COLOR 0xFFFF // White
+ #define TFT_MARLINBG_COLOR 0x0000 // Black
+ #define TFT_DISABLED_COLOR 0x0003 // Almost black
+ #define TFT_BTCANCEL_COLOR 0xF800 // Red
+ #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
 // @section safety
 
 /**

diff --git a/config/examples/Anet/A2/Configuration.h b/config/examples/Anet/A2/Configuration.h
@@ -2056,14 +2056,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 //#define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/config/examples/Anet/A2/Configuration_adv.h b/config/examples/Anet/A2/Configuration_adv.h
@@ -1214,6 +1214,18 @@
  //#define TOUCH_UI_PASSCODE
 #endif
 
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define TFT_MARLINUI_COLOR 0xFFFF // White
+ #define TFT_MARLINBG_COLOR 0x0000 // Black
+ #define TFT_DISABLED_COLOR 0x0003 // Almost black
+ #define TFT_BTCANCEL_COLOR 0xF800 // Red
+ #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
 // @section safety
 
 /**

diff --git a/config/examples/Anet/A2plus/Configuration.h b/config/examples/Anet/A2plus/Configuration.h
@@ -2056,14 +2056,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 //#define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/config/examples/Anet/A2plus/Configuration_adv.h b/config/examples/Anet/A2plus/Configuration_adv.h
@@ -1214,6 +1214,18 @@
  //#define TOUCH_UI_PASSCODE
 #endif
 
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define TFT_MARLINUI_COLOR 0xFFFF // White
+ #define TFT_MARLINBG_COLOR 0x0000 // Black
+ #define TFT_DISABLED_COLOR 0x0003 // Almost black
+ #define TFT_BTCANCEL_COLOR 0xF800 // Red
+ #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
 // @section safety
 
 /**

diff --git a/config/examples/Anet/A6/Configuration.h b/config/examples/Anet/A6/Configuration.h
@@ -2207,14 +2207,6 @@
 // FSMC display (MKS Robin, Alfawise U20, JGAurora A5S, REXYZ A1, etc.)
 //
 //#define FSMC_GRAPHICAL_TFT
-#if ENABLED(FSMC_GRAPHICAL_TFT)
- #define TFT_MARLINUI_COLOR 0xFFFF // White
- #define TFT_MARLINBG_COLOR 0x0000 // Black
- #define TFT_DISABLED_COLOR 0x0003 // Almost black
- #define TFT_BTCANCEL_COLOR 0xF800 // Red
- #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
- #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
-#endif
 
 //=============================================================================
 //============================ Other Controllers ============================

diff --git a/config/examples/Anet/A6/Configuration_adv.h b/config/examples/Anet/A6/Configuration_adv.h
@@ -1214,6 +1214,18 @@
  //#define TOUCH_UI_PASSCODE
 #endif
 
+//
+// FSMC Graphical TFT
+//
+#if ENABLED(FSMC_GRAPHICAL_TFT)
+ #define TFT_MARLINUI_COLOR 0xFFFF // White
+ #define TFT_MARLINBG_COLOR 0x0000 // Black
+ #define TFT_DISABLED_COLOR 0x0003 // Almost black
+ #define TFT_BTCANCEL_COLOR 0xF800 // Red
+ #define TFT_BTARROWS_COLOR 0xDEE6 // 11011 110111 00110 Yellow
+ #define TFT_BTOKMENU_COLOR 0x145F // 00010 100010 11111 Cyan
+#endif
+
 // @section safety
 
 /**