Check for null screen

src/Power.cpp

@@ -853,6 +853,7 @@ int32_t Power::runOnce()
 #ifndef T_WATCH_S3 // FIXME - why is this triggering on the T-Watch S3?
         if (PMU->isPekeyLongPressIrq()) {
             LOG_DEBUG("PEK long button press");
+            if (screen)
                 screen->setOn(false);
         }
 #endif

src/PowerFSM.cpp

@@ -82,6 +82,7 @@ static uint32_t secsSlept;
 static void lsEnter()
 {
     LOG_INFO("lsEnter begin, ls_secs=%u", config.power.ls_secs);
+    if (screen)
         screen->setOn(false);
     secsSlept = 0; // How long have we been sleeping this time
 
@@ -160,6 +161,7 @@ static void lsExit()
 static void nbEnter()
 {
     LOG_DEBUG("State: NB");
+    if (screen)
         screen->setOn(false);
 #ifdef ARCH_ESP32
     // Only ESP32 should turn off bluetooth
@@ -190,6 +192,7 @@ static void serialExit()
 {
     // Turn bluetooth back on when we leave serial stream API
     setBluetoothEnable(true);
+    if (screen)
         screen->print("Serial disconnected\n");
 }
 
@@ -201,7 +204,7 @@ static void powerEnter()
         LOG_INFO("Loss of power in Powered");
         powerFSM.trigger(EVENT_POWER_DISCONNECTED);
     } else {
-	if (config.display.displaymode != meshtastic_Config_DisplayConfig_DisplayMode_COLOR )
+	if (screen)
 	        screen->setOn(true);
         setBluetoothEnable(true);
         // within enter() the function getState() returns the state we came from
@@ -237,6 +240,7 @@ static void powerExit()
 static void onEnter()
 {
     LOG_DEBUG("State: ON");
+    if (screen)
         screen->setOn(true);
     setBluetoothEnable(true);
 }
@@ -251,6 +255,7 @@ static void onIdle()
 
 static void screenPress()
 {
+    if (screen)
         screen->onPress();
 }
 

src/input/ScanAndSelect.cpp

@@ -84,6 +84,7 @@ int32_t ScanAndSelectInput::runOnce()
         // Dismiss the alert screen several seconds after it appears
         if (!Throttle::isWithinTimespanMs(alertingSinceMs, durationAlertMs)) {
             alertingNoMessage = false;
+            if (screen)
                 screen->endAlert();
         }
     }
@@ -183,6 +184,7 @@ void ScanAndSelectInput::alertNoMessage()
     alertingSinceMs = millis();
 
     // Graphics code: the alert frame to show on screen
+    if (screen) {
         screen->startAlert([](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
             display->setTextAlignment(TEXT_ALIGN_CENTER_BOTH);
             display->setFont(FONT_SMALL);
@@ -190,6 +192,7 @@ void ScanAndSelectInput::alertNoMessage()
             int16_t textY = display->getHeight() / 2;
             display->drawString(textX + x, textY + y, "No Canned Messages");
         });
+    }
 }
 
 // Remove the canned message frame from screen

src/main.cpp

@@ -1227,6 +1227,7 @@ void setup()
         nodeDB->saveToDisk(SEGMENT_CONFIG);
         if (!rIf->reconfigure()) {
             LOG_WARN("Reconfigure failed, rebooting");
+            if (screen)
                 screen->startAlert("Rebooting...");
             rebootAtMsec = millis() + 5000;
         }

src/mesh/http/ContentHandler.cpp

@@ -903,6 +903,7 @@ void handleBlinkLED(HTTPRequest *req, HTTPResponse *res)
         }
     } else {
 #if HAS_SCREEN
+    if (screen)
         screen->blink();
 #endif
     }

src/mesh/http/WebServer.cpp

@@ -154,6 +154,7 @@ void createSSLCert()
                     esp_task_wdt_reset();
 #if HAS_SCREEN
                     if (millis() / 1000 >= 3) {
+                        if (screen)
                             screen->setSSLFrames();
                     }
 #endif

src/modules/AdminModule.cpp

@@ -200,6 +200,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
 #if defined(ARCH_ESP32)
 #if !MESHTASTIC_EXCLUDE_BLUETOOTH
         if (!BleOta::getOtaAppVersion().isEmpty()) {
+            if (screen)
                 screen->startFirmwareUpdateScreen();
             BleOta::switchToOtaApp();
             LOG_INFO("Rebooting to BLE OTA");
@@ -207,6 +208,7 @@ bool AdminModule::handleReceivedProtobuf(const meshtastic_MeshPacket &mp, meshta
 #endif
 #if !MESHTASTIC_EXCLUDE_WIFI
         if (WiFiOTA::trySwitchToOTA()) {
+            if (screen)
                 screen->startFirmwareUpdateScreen();
             WiFiOTA::saveConfig(&config.network);
             LOG_INFO("Rebooting to WiFi OTA");
@@ -1111,6 +1113,7 @@ void AdminModule::handleGetDeviceUIConfig(const meshtastic_MeshPacket &req)
 void AdminModule::reboot(int32_t seconds)
 {
     LOG_INFO("Reboot in %d seconds", seconds);
+    if (screen)
         screen->startAlert("Rebooting...");
     rebootAtMsec = (seconds < 0) ? 0 : (millis() + seconds * 1000);
 }

src/modules/RemoteHardwareModule.cpp

@@ -84,6 +84,7 @@ bool RemoteHardwareModule::handleReceivedProtobuf(const meshtastic_MeshPacket &r
         switch (p.type) {
         case meshtastic_HardwareMessage_Type_WRITE_GPIOS: {
             // Print notification to LCD screen
+            if (screen)
                 screen->print("Write GPIOs\n");
 
             pinModes(p.gpio_mask, OUTPUT, availablePins);

src/modules/ReplyModule.cpp

@@ -14,7 +14,7 @@ meshtastic_MeshPacket *ReplyModule::allocReply()
     // The incoming message is in p.payload
     LOG_INFO("Received message from=0x%0x, id=%d, msg=%.*s", req.from, req.id, p.payload.size, p.payload.bytes);
 #endif
-
+    if (screen)
         screen->print("Send reply\n");
 
     const char *replyStr = "Message Received";

src/motion/BMX160Sensor.cpp

@@ -37,6 +37,7 @@ int32_t BMX160Sensor::runOnce()
         if (!showingScreen) {
             powerFSM.trigger(EVENT_PRESS); // keep screen alive during calibration
             showingScreen = true;
+            if (screen)
                 screen->startAlert((FrameCallback)drawFrameCalibration);
         }
 
@@ -58,6 +59,7 @@ int32_t BMX160Sensor::runOnce()
             doCalibration = false;
             endCalibrationAt = 0;
             showingScreen = false;
+            if (screen)
                 screen->endAlert();
         }
 
@@ -103,7 +105,7 @@ int32_t BMX160Sensor::runOnce()
         heading += 270;
         break;
     }
-
+    if (screen)
         screen->setHeading(heading);
 #endif
 
@@ -118,6 +120,7 @@ void BMX160Sensor::calibrate(uint16_t forSeconds)
     doCalibration = true;
     uint16_t calibrateFor = forSeconds * 1000; // calibrate for seconds provided
     endCalibrationAt = millis() + calibrateFor;
+    if (screen)
         screen->setEndCalibration(endCalibrationAt);
 #endif
 }

src/motion/ICM20948Sensor.cpp

@@ -60,6 +60,7 @@ int32_t ICM20948Sensor::runOnce()
         if (!showingScreen) {
             powerFSM.trigger(EVENT_PRESS); // keep screen alive during calibration
             showingScreen = true;
+            if (screen)
                 screen->startAlert((FrameCallback)drawFrameCalibration);
         }
 
@@ -81,6 +82,7 @@ int32_t ICM20948Sensor::runOnce()
             doCalibration = false;
             endCalibrationAt = 0;
             showingScreen = false;
+            if (screen)
                 screen->endAlert();
         }
 
@@ -124,7 +126,7 @@ int32_t ICM20948Sensor::runOnce()
         heading += 270;
         break;
     }
-
+    if (screen)
         screen->setHeading(heading);
 #endif
 
@@ -159,6 +161,7 @@ void ICM20948Sensor::calibrate(uint16_t forSeconds)
     doCalibration = true;
     uint16_t calibrateFor = forSeconds * 1000; // calibrate for seconds provided
     endCalibrationAt = millis() + calibrateFor;
+    if (screen)
         screen->setEndCalibration(endCalibrationAt);
 #endif
 }

src/nimble/NimbleBluetooth.cpp

@@ -94,6 +94,7 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
         bluetoothStatus->updateStatus(new meshtastic::BluetoothStatus(std::to_string(passkey)));
 
 #if HAS_SCREEN // Todo: migrate this display code back into Screen class, and observe bluetoothStatus
+        if (screen) {
             screen->startAlert([passkey](OLEDDisplay *display, OLEDDisplayUiState *state, int16_t x, int16_t y) -> void {
                 char btPIN[16] = "888888";
                 snprintf(btPIN, sizeof(btPIN), "%06u", passkey);
@@ -119,6 +120,7 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
                 y_offset = display->height() == 64 ? y_offset + FONT_HEIGHT_LARGE - 6 : y_offset + FONT_HEIGHT_LARGE + 5;
                 display->drawString(x_offset + x, y_offset + y, deviceName);
             });
+        }
 #endif
         passkeyShowing = true;
 
@@ -134,6 +136,7 @@ class NimbleBluetoothServerCallback : public NimBLEServerCallbacks
         // Todo: migrate this display code back into Screen class, and observe bluetoothStatus
         if (passkeyShowing) {
             passkeyShowing = false;
+            if (screen)
                 screen->endAlert();
         }
     }

src/shutdown.h

@@ -41,7 +41,7 @@ void powerCommandsCheck()
     }
 
 #if defined(ARCH_ESP32) || defined(ARCH_NRF52)
-    if (shutdownAtMsec) {
+    if (shutdownAtMsec && screen) {
         screen->startAlert("Shutting down...");
     }
 #endif

src/sleep.cpp

@@ -221,7 +221,7 @@ void doDeepSleep(uint32_t msecToWake, bool skipPreflight = false, bool skipSaveN
 #endif
 
     powerMon->setState(meshtastic_PowerMon_State_CPU_DeepSleep);
-
+    if (screen)
         screen->doDeepSleep(); // datasheet says this will draw only 10ua
 
     if (!skipSaveNodeDb) {