make user presses ask other nodes for their latest status

see related bug
https://github.com/meshtastic/Meshtastic-esp32/issues/59
This commit is contained in:
geeksville
2020-03-25 13:09:12 -07:00
parent 45babab8c4
commit 50d724780a
4 changed files with 18 additions and 11 deletions
+11 -7
View File
@@ -71,10 +71,11 @@ void MeshService::init()
// sendOwnerPeriod();
}
void MeshService::sendOurOwner(NodeNum dest)
void MeshService::sendOurOwner(NodeNum dest, bool wantReplies)
{
MeshPacket *p = allocForSending();
p->to = dest;
p->payload.want_response = wantReplies;
p->payload.which_variant = SubPacket_user_tag;
User &u = p->payload.variant.user;
u = owner;
@@ -257,9 +258,10 @@ void MeshService::sendToMesh(MeshPacket *p)
// nodes shouldn't trust it anyways) Note: for now, we allow a device with a local GPS to include the time, so that gpsless
// devices can get time.
if (p->has_payload && p->payload.which_variant == SubPacket_position_tag) {
if (!myNodeInfo.has_gps)
if (!myNodeInfo.has_gps) {
DEBUG_MSG("Stripping time %u from position send\n", p->payload.variant.position.time);
p->payload.variant.position.time = 0;
else
} else
DEBUG_MSG("Providing time to mesh %u\n", p->payload.variant.position.time);
}
@@ -285,18 +287,19 @@ MeshPacket *MeshService::allocForSending()
return p;
}
void MeshService::sendNetworkPing(NodeNum dest)
void MeshService::sendNetworkPing(NodeNum dest, bool wantReplies)
{
NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
assert(node);
DEBUG_MSG("Sending network ping to 0x%x, with position=%d, wantReplies=%d\n", dest, node->has_position, wantReplies);
if (node->has_position)
sendOurPosition(dest);
sendOurPosition(dest, wantReplies);
else
sendOurOwner(dest);
sendOurOwner(dest, wantReplies);
}
void MeshService::sendOurPosition(NodeNum dest)
void MeshService::sendOurPosition(NodeNum dest, bool wantReplies)
{
NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
assert(node);
@@ -307,6 +310,7 @@ void MeshService::sendOurPosition(NodeNum dest)
p->to = dest;
p->payload.which_variant = SubPacket_position_tag;
p->payload.variant.position = node->position;
p->payload.want_response = wantReplies;
p->payload.variant.position.time =
gps.getValidTime(); // This nodedb timestamp might be stale, so update it if our clock is valid.
sendToMesh(p);