Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-07-26 14:58:12 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/wio-unified' into wio-unified

Browse Source 
# Conflicts:
#	examples/companion_radio/DataStore.cpp
This commit is contained in:
Jakub
2026-06-04 17:13:49 +02:00
parent 3e2462eaf4 fb6d93ffd2
commit 2bbdb7fe6c
7 changed files with 52 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
examples/companion_radio/ui-new/UITask.cpp
View File

@@ -1448,11 +1448,28 @@ switch(t){
_last_notif_ch_idx = -1;
break;
}
case UIEventType::advertReceived: {
if (!buzzer.isQuiet()) {
int slot = _node_prefs ? (int)_node_prefs->notif_melody_ad : 0;
bool custom_played = false;
if (slot > 0 && _node_prefs) {
if (buzzer.isPlaying()) buzzer.stop(); // stop before overwriting _notif_mel_buf
buildMelodyFromPrefs(_node_prefs, slot, _notif_mel_buf, sizeof(_notif_mel_buf));
if (_notif_mel_buf[0]) {
buzzer.play(_notif_mel_buf);
custom_played = true;
}
}
if (!custom_played) {
buzzer.play("MsgRcv3:d=4,o=6,b=200:32e,32g,32b,16c7");
}
}
break;
}
case UIEventType::ack:
buzzer.play("ack:d=32,o=8,b=120:c");
break;
case UIEventType::roomMessage:
case UIEventType::newContactMessage:
case UIEventType::none:
default:
break;