Mirrors/MeshCore-Solo
1
0
Fork 0
mirror of https://github.com/MarekZegare4/MeshCore-Solo.git synced 2026-11-02 10:51:57 +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/MyMeshBot.h
+6 -4
View File
@@ -134,7 +134,7 @@ bool MyMesh::botInQuietHours() const {
// "3fa1:c802"); "direct" if heard directly. The sender's position: its
// contact's, when it has one (on a channel, the contact of that name).
static char s_bot_path[MAX_PATH_SIZE * 3 + 8];
static BotInbound s_bot_in = { s_bot_path, 0, 0 };
static BotInbound s_bot_in = { s_bot_path, 0, 0, false };
static const ContactInfo* s_bot_sender = nullptr; // the asker's contact, if known (Actions by)
static bool s_bot_from_pos = false;
static int32_t s_bot_from_lat = 0, s_bot_from_lon = 0;
@@ -148,7 +148,8 @@ void MyMesh::setBotInbound(const mesh::Packet* pkt, const ContactInfo* sender) {
if (s_bot_from_pos) { s_bot_from_lat = sender->gps_lat; s_bot_from_lon = sender->gps_lon; }
// A direct-routed packet's path is used up on the way (each repeater takes
// its own hash off), so it says nothing about the hops it went through.
if (pkt && pkt->isRouteDirect()) { strcpy(s_bot_path, "known route"); return; }
s_bot_in.routed = pkt && pkt->isRouteDirect();
if (s_bot_in.routed) { strcpy(s_bot_path, "known route"); return; }
if (n == 0) { strcpy(s_bot_path, "direct"); return; }
char* o = s_bot_path;
for (uint8_t h = 0; h < n; h++) {
@@ -322,8 +323,9 @@ bool MyMesh::botCommandReply(const char* cmd, const char* arg, const char* arg2,
return true;
}
if (!strcmp(cmd, "hops")) {
if (hops == 0) strncpy(out, "direct", out_len); // heard directly (0 repeaters)
else snprintf(out, out_len, "%u hops", (unsigned)hops);
if (s_bot_in.routed) strncpy(out, "known route", out_len); // a saved path's hops aren't carried (see !path)
else if (hops == 0) strncpy(out, "direct", out_len); // heard directly (0 repeaters)
else snprintf(out, out_len, "%u hops", (unsigned)hops);
out[out_len - 1] = '\0';
return true;
}