pohui_pohui/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-10-28 15:22:55 +00:00
Code Issues Actions 5 Packages Projects Releases Wiki Activity

trunk fix

Browse Source
This commit is contained in:
HarukiToreda 2025-10-10 00:18:36 -04:00
parent e6093533ab
commit 6069dc2ad8
1 changed files with 3 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/graphics/draw/MessageRenderer.cpp
View File

@ -724,8 +724,7 @@ void handleNewMessage(const StoredMessage &sm, const meshtastic_MeshPacket &pack
// Determine if message belongs to a muted channel // Determine if message belongs to a muted channel
bool isMuted = false; bool isMuted = false;
if (sm.type == MessageType::BROADCAST) { if (sm.type == MessageType::BROADCAST) {
const meshtastic_Channel channel = const meshtastic_Channel channel = channels.getByIndex(packet.channel ? packet.channel : channels.getPrimaryIndex());
channels.getByIndex(packet.channel ? packet.channel : channels.getPrimaryIndex());
if (channel.settings.mute) if (channel.settings.mute)
isMuted = true; isMuted = true;
} }
@ -744,8 +743,7 @@ void handleNewMessage(const StoredMessage &sm, const meshtastic_MeshPacket &pack
bool isAlert = false; bool isAlert = false;
// Check if alert detection is enabled via external notification module // Check if alert detection is enabled via external notification module
if (moduleConfig.external_notification.alert_bell || if (moduleConfig.external_notification.alert_bell || moduleConfig.external_notification.alert_bell_vibra ||
moduleConfig.external_notification.alert_bell_vibra ||
moduleConfig.external_notification.alert_bell_buzzer) { moduleConfig.external_notification.alert_bell_buzzer) {
for (size_t i = 0; i < packet.decoded.payload.size && i < 100; i++) { for (size_t i = 0; i < packet.decoded.payload.size && i < 100; i++) {
if (msgRaw[i] == '\x07') { if (msgRaw[i] == '\x07') {
@ -817,8 +815,7 @@ void handleNewMessage(const StoredMessage &sm, const meshtastic_MeshPacket &pack
// Only beep if allowed by device settings or alert rules // Only beep if allowed by device settings or alert rules
if (config.device.buzzer_mode != meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY || if (config.device.buzzer_mode != meshtastic_Config_DeviceConfig_BuzzerMode_DIRECT_MSG_ONLY ||
(isAlert && moduleConfig.external_notification.alert_bell_buzzer) || (isAlert && moduleConfig.external_notification.alert_bell_buzzer) || (!isBroadcast(packet.to) && isToUs(packet))) {
(!isBroadcast(packet.to) && isToUs(packet))) {
playLongBeep(); playLongBeep();
} }
#else #else