From e230063dacee25f67a90eb8e6fd362c732616b42 Mon Sep 17 00:00:00 2001
From: Adrian Scillato <35405447+ascillato@users.noreply.github.com>
Date: Thu, 31 May 2018 06:22:35 -0300
Subject: [PATCH] Update user_config.h

---
 sonoff/user_config.h | 21 ++++++---------------
 1 file changed, 6 insertions(+), 15 deletions(-)

diff --git a/sonoff/user_config.h b/sonoff/user_config.h
index 4bdf30adf..25fa6eeca 100644
--- a/sonoff/user_config.h
+++ b/sonoff/user_config.h
@@ -315,13 +315,11 @@
  * DISPLAY
 \*********************************************************************************************/
 
-//#define USE_DISPLAY                            // Add I2C Display Support for LCD, Oled and up to eigth Matrices (+19k code)
-
-//#define DISPLAY_CONFIG                         // Display Support for LCD, Oled
-#ifdef DISPLAY_CONFIG
-
-#ifdef USE_I2C
-  #define USE_DISPLAY                            // Add I2C Display Support for LCD, Oled and up to eigth Matrices (+19k code)
+//#define USE_DISPLAY                              // Add Display Support for LCD, Oled and up to eigth Matrices (+19k code)
+                                                 //   Required USE_I2C to be defined for I2C Display Support
+                                                 //   Required USE_SPI to be defined for SPI Display Support using library TasmotaTFT for 320x240 and 480x320 TFT
+#ifdef USE_DISPLAY
+#ifdef USE_I2C                                   // For I2C Display Support. Not required if using SPI
     #define MTX_ADDRESS1       0x71              // [DisplayAddress[1]] I2C address of first 8x8 matrix module
     #define MTX_ADDRESS2       0x74              // [DisplayAddress[2]] I2C address of second 8x8 matrix module
     #define MTX_ADDRESS3       0x75              // [DisplayAddress[3]] I2C address of third 8x8 matrix module
@@ -331,14 +329,7 @@
     #define MTX_ADDRESS7       0x00              // [DisplayAddress[7]] I2C address of seventh 8x8 matrix module
     #define MTX_ADDRESS8       0x00              // [DisplayAddress[8]] I2C address of eigth 8x8 matrix module
 #endif  // USE_I2C
-
-#ifdef USE_SPI                                   // SPI using library TasmotaTFT
-  #ifndef USE_DISPLAY
-  #define USE_DISPLAY                            // Add SPI Display support for 320x240 and 480x320 TFT, using library TasmotaTFT
-  #endif
-#endif  // USE_SPI
-
-#endif  // DISPLAY_CONFIG
+#endif  // USE_DISPLAY
 
 /*********************************************************************************************\
  * TIME PROPORTIONAL CONTROLLER