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

7
examples/companion_radio/NodePrefs.h
View File

@@ -69,9 +69,10 @@ struct NodePrefs { // persisted to file
uint8_t ringtone2_bpm_idx;
uint8_t ringtone2_len;
uint8_t ringtone2_notes[32];
// Global melody for notifications: 0=built-in, 1=melody1, 2=melody2
// Global melodies for notifications: 0=built-in, 1=melody1, 2=melody2
uint8_t notif_melody_dm;
uint8_t notif_melody_ch;
uint8_t notif_melody_ad;
// Per-channel melody override (2 bitmasks, 1 bit per channel)
uint64_t ch_notif_melody_set; // bit i = channel i has explicit melody
uint64_t ch_notif_melody_2; // bit i = use melody 2 (else melody 1, when set bit is set)
@@ -119,7 +120,7 @@ struct NodePrefs { // persisted to file
// adding/removing/reordering fields in DataStore::savePrefs/loadPrefsInt so
// older saves are detected on load and skipped (zero-init defaults kept).
// High 24 bits identify the file format; low byte is the schema revision.
static const uint32_t SCHEMA_SENTINEL = 0xC0DE0006;
static const uint32_t SCHEMA_SENTINEL = 0xC0DE0007;
// Bit-index for each home page. Used by page_order (entries store bit+1) and
// by home_pages_mask. Single source of truth — both HomeScreen::pageBit/bitToPage
@@ -187,4 +188,4 @@ struct NodePrefs { // persisted to file
}
if (pos < size) buf[pos] = '\0';
}
};
};