From 910b6b7512c432e2ab7a59bb9acf4627dd824028 Mon Sep 17 00:00:00 2001
From: panaceya <panaceya@users.noreply.github.com>
Date: Thu, 12 Sep 2024 03:31:30 +0300
Subject: [PATCH] OLED_ can be configured via userPrefs.h (#4624)

---
 src/graphics/Screen.cpp     | 2 +-
 variants/diy/platformio.ini | 4 ----
 2 files changed, 1 insertion(+), 5 deletions(-)

diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index 68fdba207..da573bade 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -19,8 +19,8 @@ You should have received a copy of the GNU General Public License
 along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
 */
-#include "Screen.h"
 #include "../userPrefs.h"
+#include "Screen.h"
 #include "PowerMon.h"
 #include "configuration.h"
 #if HAS_SCREEN
diff --git a/variants/diy/platformio.ini b/variants/diy/platformio.ini
index adc10de44..2a55f7a79 100644
--- a/variants/diy/platformio.ini
+++ b/variants/diy/platformio.ini
@@ -7,7 +7,6 @@ build_flags =
   ${esp32_base.build_flags}
   -D DIY_V1
   -D EBYTE_E22
-  -D OLED_RU
   -I variants/diy/v1
 
 ; Meshtastic DIY v1.1 new schematic based on ESP32-WROOM-32 & SX1262/SX1268 modules
@@ -19,7 +18,6 @@ build_flags =
   ${esp32_base.build_flags}
   -D DIY_V1
   -D EBYTE_E22
-  -D OLED_RU
   -I variants/diy/v1_1
 
 ; Port to Disaster Radio's ESP32-v3 Dev Board
@@ -52,7 +50,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
   -I variants/diy/nrf52_promicro_diy_xtal
   -D NRF52_PROMICRO_DIY
-  -D OLED_RU
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_xtal>
 lib_deps = 
@@ -68,7 +65,6 @@ board_level = extra
 build_flags = ${nrf52840_base.build_flags}
   -I variants/diy/nrf52_promicro_diy_tcxo
   -D NRF52_PROMICRO_DIY
-  -D OLED_RU
   -L "${platformio.libdeps_dir}/${this.__env__}/bsec2/src/cortex-m4/fpv4-sp-d16-hard"
 build_src_filter = ${nrf52_base.build_src_filter} +<../variants/diy/nrf52_promicro_diy_tcxo>
 lib_deps =