manual merge of changes from Master

src/main.cpp

@@ -37,7 +37,7 @@
 #include "nimble/NimbleBluetooth.h"
 #endif
 
-#if HAS_WIFI || defined(ARCH_PORTDUINO)
+#if HAS_WIFI
 #include "mesh/wifi/WiFiServerAPI.h"
 #include "mqtt/MQTT.h"
 #endif
@@ -293,6 +293,10 @@ void setup()
     * Boards with an PMU need to be powered on to correctly scan to the device address, such as t-beam-s3-core
     */
     scanI2Cdevice();
+
+    // fixed screen override?
+    if (config.display.oled != Config_DisplayConfig_OledType_OLED_AUTO)
+        screen_model = config.display.oled;
     
     // Init our SPI controller (must be before screen and lora)
     initSPI();