Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-11-02 19:02:00 +00:00
Code Issues Packages Projects Releases Wiki Activity

fix(bot): !hops / {hops} say 'known route' as !path does, a route followed by ':' is found, {rssi} among the L2's placeholders

Browse Source 
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
Jakub
2026-10-26 22:40:30 +01:00
co-authored by Claude Opus 5.5
parent c1af501cc4
commit e8553d276d
5 changed files with 14 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/companion_radio/MsgExpand.h
+5 -3
View File
@@ -20,7 +20,7 @@
// {dist} — distance m (requires sm)
// {co2} — CO2 concentration ppm (requires sm)
// {name} — sender's name (bot replies only; requires sender_name, else left literal)
// {hops} — hop count: "direct" or "N hops" (bot replies only; requires hops>=0, else left literal)
// {hops} — hop count: "direct" or "N hops", "known route" when it came over a saved path (bot replies only; requires hops>=0, else left literal)
// {path} — inbound route as hop hashes, oldest first: "3f:a1:c8" (bot replies only; requires `in`, else left literal)
// {snr} — the message's last hop's SNR, "6.5dB" (bot replies only)
// {rssi} — and its RSSI, "-92dBm" (bot replies only)
@@ -28,6 +28,7 @@
struct BotInbound {
const char* path; // "direct" or the hop hashes
float snr, rssi; // the last hop's
bool routed; // came over a saved path, whose hops aren't carried: no hop count
};
inline void expandMsg(const char* tmpl, char* out, int out_len,
@@ -143,8 +144,9 @@ inline void expandMsg(const char* tmpl, char* out, int out_len,
p += 6;
} else if (strncmp(p, "{hops}", 6) == 0) {
if (hops >= 0) {
char b[10];
if (hops == 0) strcpy(b, "direct");
char b[12];
if (in && in->routed) strcpy(b, "known route");
else if (hops == 0) strcpy(b, "direct");
else snprintf(b, sizeof(b), "%u hops", (unsigned)hops);
APPEND(b, strlen(b));
} else { APPEND("{hops}", 6); }