iarv/Meck
1
0
Fork 1
mirror of https://github.com/pelgraine/Meck.git synced 2026-05-02 03:22:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

temp cmd 54 support

Browse Source
This commit is contained in:
pelgraine
2026-04-19 19:40:03 +10:00
parent 81b3cd2591
commit ce6acdfd34
1 changed files with 12 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

17
examples/companion_radio/MyMesh.cpp
View File

@@ -604,13 +604,18 @@ void MyMesh::sendFloodScoped(const mesh::GroupChannel& channel, mesh::Packet* pk
MESH_DEBUG_PRINTLN("SentTrack: captured fingerprint for channel msg");
}
// Scope priority: per-channel scope → device default → unscoped
// Scope priority: BLE app send_scope → per-channel scope → device default → unscoped
TransportKey scope;
const char* ch_scope = getChannelScopeName(channel);
if (ch_scope && ch_scope[0]) {
deriveScopeKey(ch_scope, scope);
if (!send_scope.isNull()) {
// BLE app has set a scope via CMD 54 — use it (highest priority)
memcpy(scope.key, send_scope.key, sizeof(scope.key));
} else {
memcpy(scope.key, _prefs.default_scope_key, sizeof(scope.key));
const char* ch_scope = getChannelScopeName(channel);
if (ch_scope && ch_scope[0]) {
deriveScopeKey(ch_scope, scope);
} else {
memcpy(scope.key, _prefs.default_scope_key, sizeof(scope.key));
}
}
sendFloodScoped(scope, pkt, delay_millis);
}
@@ -2313,8 +2318,10 @@ void MyMesh::handleCmdFrame(size_t len) {
} else if (cmd_frame[0] == CMD_SET_FLOOD_SCOPE_KEY && len >= 2 && cmd_frame[1] == 0) {
if (len >= 2 + 16) {
memcpy(send_scope.key, &cmd_frame[2], sizeof(send_scope.key)); // set curr scope TransportKey
Serial.printf("[CMD54] Per-channel scope key set (%d bytes)\n", len - 2);
} else {
memset(send_scope.key, 0, sizeof(send_scope.key)); // set scope to null
Serial.println("[CMD54] Per-channel scope cleared");
}
writeOKFrame();
} else if (cmd_frame[0] == CMD_SET_DEFAULT_FLOOD_SCOPE && len >= 1) {