From 4bab148e3b75a51bdcd8aaa91ba0f904cf8a4a95 Mon Sep 17 00:00:00 2001
From: Jonathan Bennett <jbennett@incomsystems.biz>
Date: Thu, 10 Jul 2025 22:51:43 -0500
Subject: [PATCH] Make the shouldWake function always available, and remove the
 bool (#7300)

---
 src/graphics/Screen.cpp           | 46 ++++++++++++++-----------------
 src/graphics/Screen.h             |  2 --
 src/modules/TextMessageModule.cpp |  3 +-
 3 files changed, 22 insertions(+), 29 deletions(-)

diff --git a/src/graphics/Screen.cpp b/src/graphics/Screen.cpp
index f670225c3..59888c938 100644
--- a/src/graphics/Screen.cpp
+++ b/src/graphics/Screen.cpp
@@ -83,29 +83,6 @@ extern uint16_t TFT_MESH;
 #include "platform/portduino/PortduinoGlue.h"
 #endif
 
-bool shouldWakeOnReceivedMessage()
-{
-    /*
-    The goal here is to determine when we do NOT wake up the screen on message received:
-    - Any ext. notifications are turned on
-    - If role is not client / client_mute
-    - If the battery level is very low
-    */
-    if (moduleConfig.external_notification.enabled) {
-        return false;
-    }
-    if (config.device.role != meshtastic_Config_DeviceConfig_Role_CLIENT &&
-        config.device.role != meshtastic_Config_DeviceConfig_Role_CLIENT_MUTE) {
-        return false;
-    }
-    if (powerStatus && powerStatus->getBatteryChargePercent() < 10) {
-        return false;
-    }
-    return true;
-}
-
-bool wake_on_received_message = shouldWakeOnReceivedMessage(); // Master Switch to enable here
-
 using namespace meshtastic; /** @todo remove */
 
 namespace graphics
@@ -1282,8 +1259,7 @@ int Screen::handleTextMessage(const meshtastic_MeshPacket *packet)
             setFrames(FOCUS_PRESERVE);              // Refresh frame list without switching view
 
             // Only wake/force display if the configuration allows it
-            wake_on_received_message = shouldWakeOnReceivedMessage();
-            if (wake_on_received_message) {
+            if (shouldWakeOnReceivedMessage()) {
                 setOn(true);    // Wake up the screen first
                 forceDisplay(); // Forces screen redraw
 
@@ -1452,3 +1428,23 @@ bool Screen::isOverlayBannerShowing()
 #else
 graphics::Screen::Screen(ScanI2C::DeviceAddress, meshtastic_Config_DisplayConfig_OledType, OLEDDISPLAY_GEOMETRY) {}
 #endif // HAS_SCREEN
+
+bool shouldWakeOnReceivedMessage()
+{
+    /*
+    The goal here is to determine when we do NOT wake up the screen on message received:
+    - Any ext. notifications are turned on
+    - If role is not client / client_mute
+    - If the battery level is very low
+    */
+    if (moduleConfig.external_notification.enabled) {
+        return false;
+    }
+    if (!meshtastic_Config_DeviceConfig_Role_CLIENT && !meshtastic_Config_DeviceConfig_Role_CLIENT_MUTE) {
+        return false;
+    }
+    if (powerStatus && powerStatus->getBatteryChargePercent() < 10) {
+        return false;
+    }
+    return true;
+}
\ No newline at end of file
diff --git a/src/graphics/Screen.h b/src/graphics/Screen.h
index 19d14ecca..265900131 100644
--- a/src/graphics/Screen.h
+++ b/src/graphics/Screen.h
@@ -125,8 +125,6 @@ class Screen
 #define SEGMENT_WIDTH 16
 #define SEGMENT_HEIGHT 4
 
-extern bool wake_on_received_message;
-
 /// Convert an integer GPS coords to a floating point
 #define DegD(i) (i * 1e-7)
 extern bool hasUnreadMessage;
diff --git a/src/modules/TextMessageModule.cpp b/src/modules/TextMessageModule.cpp
index f0835073b..970f4429c 100644
--- a/src/modules/TextMessageModule.cpp
+++ b/src/modules/TextMessageModule.cpp
@@ -18,9 +18,8 @@ ProcessMessage TextMessageModule::handleReceived(const meshtastic_MeshPacket &mp
     devicestate.rx_text_message = mp;
     devicestate.has_rx_text_message = true;
 
-    wake_on_received_message = shouldWakeOnReceivedMessage();
     // Only trigger screen wake if configuration allows it
-    if (wake_on_received_message) {
+    if (shouldWakeOnReceivedMessage()) {
         powerFSM.trigger(EVENT_RECEIVED_MSG);
     }
     notifyObservers(&mp);