From 6d899c9fd90601e94390f8c51a5624938eb25f91 Mon Sep 17 00:00:00 2001
From: Jason P <applewiz@mac.com>
Date: Fri, 10 Oct 2025 08:58:27 -0500
Subject: [PATCH] Clean up how muting works along with when we wake the screen

---
 src/MessageStore.h                    |  5 -----
 src/graphics/draw/MessageRenderer.cpp | 24 ++++++------------------
 2 files changed, 6 insertions(+), 23 deletions(-)

diff --git a/src/MessageStore.h b/src/MessageStore.h
index a93e1e3e2..4c1c2c8f8 100644
--- a/src/MessageStore.h
+++ b/src/MessageStore.h
@@ -2,11 +2,6 @@
 
 #if HAS_SCREEN
 
-// Disable debug logging entirely on release builds
-#if !defined(DEBUG)
-#define LOG_DEBUG(...)
-#endif
-
 // Disable message persistence to flash if you’re short on space
 #ifndef ENABLE_MESSAGE_PERSISTENCE
 #define ENABLE_MESSAGE_PERSISTENCE 1
diff --git a/src/graphics/draw/MessageRenderer.cpp b/src/graphics/draw/MessageRenderer.cpp
index 361c76fdb..08fa62fcc 100644
--- a/src/graphics/draw/MessageRenderer.cpp
+++ b/src/graphics/draw/MessageRenderer.cpp
@@ -722,16 +722,11 @@ void handleNewMessage(const StoredMessage &sm, const meshtastic_MeshPacket &pack
         hasUnreadMessage = true;
 
         // Determine if message belongs to a muted channel
-        bool isMuted = false;
+        bool isChannelMuted = false;
         if (sm.type == MessageType::BROADCAST) {
             const meshtastic_Channel channel = channels.getByIndex(packet.channel ? packet.channel : channels.getPrimaryIndex());
             if (channel.settings.mute)
-                isMuted = true;
-        }
-
-        if (shouldWakeOnReceivedMessage()) {
-            screen->setOn(true);
-            // screen->forceDisplay();  <-- remove, let Screen handle this
+                isChannelMuted = true;
         }
 
         // Banner logic
@@ -760,7 +755,7 @@ void handleNewMessage(const StoredMessage &sm, const meshtastic_MeshPacket &pack
                 strcpy(banner, "Alert Received");
         } else {
             // Skip muted channels unless it's an alert
-            if (isMuted)
+            if (isChannelMuted)
                 return;
 
             if (longName && longName[0]) {
@@ -809,18 +804,11 @@ void handleNewMessage(const StoredMessage &sm, const meshtastic_MeshPacket &pack
         // Shorter banner if already in a conversation (Channel or Direct)
         bool inThread = (getThreadMode() != ThreadMode::ALL);
 
-#if defined(M5STACK_UNITC6L)
-        screen->setOn(true);
-        screen->showSimpleBanner(banner, inThread ? 1000 : 1500);
-
-        // Only beep if allowed by device settings or alert rules
-        if (config.device.buzzer_mode != meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY ||
-            (isAlert && moduleConfig.external_notification.alert_bell_buzzer) || (!isBroadcast(packet.to) && isToUs(packet))) {
-            playLongBeep();
+        if (shouldWakeOnReceivedMessage()) {
+            screen->setOn(true);
         }
-#else
+
         screen->showSimpleBanner(banner, inThread ? 1000 : 3000);
-#endif
     }
 
     // No setFrames() here anymore