From 021f872507e0a57da95dff75b45ff37951b0bce4 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Mon, 19 May 2025 21:53:58 -0500
Subject: [PATCH] Gate more modules behind config.display.displaymode

---
 src/mesh/eth/ethClient.cpp                       | 4 +++-
 src/mesh/wifi/WiFiAPClient.cpp                   | 8 ++++++--
 src/modules/Modules.cpp                          | 4 +++-
 variants/seeed-sensecap-indicator/platformio.ini | 5 -----
 variants/t-deck/platformio.ini                   | 3 ---
 5 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/src/mesh/eth/ethClient.cpp b/src/mesh/eth/ethClient.cpp
index 70c6e3fe4..9c92a6c27 100644
--- a/src/mesh/eth/ethClient.cpp
+++ b/src/mesh/eth/ethClient.cpp
@@ -64,7 +64,9 @@ static int32_t reconnectETH()
             }
 
 #if !MESHTASTIC_EXCLUDE_SOCKETAPI
-            initApiServer();
+            if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
+                initApiServer();
+            }
 #endif
 
             ethStartupComplete = true;
diff --git a/src/mesh/wifi/WiFiAPClient.cpp b/src/mesh/wifi/WiFiAPClient.cpp
index 789f8ac44..ad7127d6e 100644
--- a/src/mesh/wifi/WiFiAPClient.cpp
+++ b/src/mesh/wifi/WiFiAPClient.cpp
@@ -124,10 +124,14 @@ static void onNetworkConnected()
         }
 
 #if defined(ARCH_ESP32) && !MESHTASTIC_EXCLUDE_WEBSERVER
-        initWebServer();
+        if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
+            initWebServer();
+        }
 #endif
 #if !MESHTASTIC_EXCLUDE_SOCKETAPI
-        initApiServer();
+        if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
+            initApiServer();
+        }
 #endif
         APStartupComplete = true;
     }
diff --git a/src/modules/Modules.cpp b/src/modules/Modules.cpp
index f0dafa332..0ecdadf4c 100644
--- a/src/modules/Modules.cpp
+++ b/src/modules/Modules.cpp
@@ -234,7 +234,9 @@ void setupModules()
 #if (defined(ARCH_ESP32) || defined(ARCH_NRF52) || defined(ARCH_RP2040)) && !defined(CONFIG_IDF_TARGET_ESP32S2) &&               \
     !defined(CONFIG_IDF_TARGET_ESP32C3)
 #if !MESHTASTIC_EXCLUDE_SERIAL
-        new SerialModule();
+        if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR) {
+            new SerialModule();
+        }
 #endif
 #endif
 #ifdef ARCH_ESP32
diff --git a/variants/seeed-sensecap-indicator/platformio.ini b/variants/seeed-sensecap-indicator/platformio.ini
index 56c77113a..f2495c340 100644
--- a/variants/seeed-sensecap-indicator/platformio.ini
+++ b/variants/seeed-sensecap-indicator/platformio.ini
@@ -36,11 +36,6 @@ upload_speed = 460800
 
 build_flags =
   ${env:seeed-sensecap-indicator.build_flags}
-  -D MESHTASTIC_EXCLUDE_CANNEDMESSAGES=1
-  -D MESHTASTIC_EXCLUDE_ENVIRONMENTAL_SENSOR=1
-  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
-  -D MESHTASTIC_EXCLUDE_SERIAL=1
-  -D MESHTASTIC_EXCLUDE_SOCKETAPI=1
   -D INPUTDRIVER_BUTTON_TYPE=38
   -D HAS_TELEMETRY=0
   -D CONFIG_DISABLE_HAL_LOCKS=1
diff --git a/variants/t-deck/platformio.ini b/variants/t-deck/platformio.ini
index a45a9708e..707e94166 100644
--- a/variants/t-deck/platformio.ini
+++ b/variants/t-deck/platformio.ini
@@ -25,9 +25,6 @@ extends = env:t-deck
 build_flags =
   ${env:t-deck.build_flags}
   -D CONFIG_DISABLE_HAL_LOCKS=1 ; "feels" to be a bit more stable without locks
-  -D MESHTASTIC_EXCLUDE_WEBSERVER=1
-  -D MESHTASTIC_EXCLUDE_SERIAL=1
-  -D MESHTASTIC_EXCLUDE_SOCKETAPI=1
   -D INPUTDRIVER_I2C_KBD_TYPE=0x55
   -D INPUTDRIVER_ENCODER_TYPE=3
   -D INPUTDRIVER_ENCODER_LEFT=1