rbxii3/firmware
1
0
Fork 0
mirror of https://github.com/meshtastic/firmware.git synced 2025-12-20 01:32:40 +00:00
Code Issues Packages Projects Releases Wiki Activity

send network pings when the user does something with their device

Browse Source
This commit is contained in:
geeksville
2020-02-12 14:07:06 -08:00
parent d3ca56f91a
commit e79c49d100
6 changed files with 71 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

49
src/MeshService.cpp
View File

@@ -153,10 +153,10 @@ void MeshService::loop()
handleFromRadio();
// FIXME, don't send user this often, but for now it is useful for testing
// occasionally send our owner info
static uint32_t lastsend;
uint32_t now = millis();
if (now - lastsend > 5 * 60 * 1000)
if (now - lastsend > radioConfig.preferences.send_owner_secs * 1000)
{
lastsend = now;
sendOurOwner();
@@ -193,7 +193,7 @@ void MeshService::handleToRadio(std::string s)
void MeshService::sendToMesh(MeshPacket *p)
{
nodeDB.updateFrom(*p);
nodeDB.updateFrom(*p); // update our local DB for this packet
assert(radio.send(p) == pdTRUE);
}
@@ -208,8 +208,33 @@ MeshPacket *MeshService::allocForSending()
return p;
}
void MeshService::sendNetworkPing()
{
NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
assert(node);
if (node->has_position)
sendOurPosition();
else
sendOurOwner();
}
void MeshService::sendOurPosition()
{
NodeInfo *node = nodeDB.getNode(nodeDB.getNodeNum());
assert(node);
assert(node->has_position);
// Update our local node info with our position (even if we don't decide to update anyone else)
MeshPacket *p = allocForSending();
p->payload.which_variant = SubPacket_position_tag;
p->payload.variant.position = node->position;
sendToMesh(p);
}
void MeshService::onGPSChanged()
{
// Update our local node info with our position (even if we don't decide to update anyone else)
MeshPacket *p = allocForSending();
p->payload.which_variant = SubPacket_position_tag;
Position &pos = p->payload.variant.position;
@@ -218,7 +243,23 @@ void MeshService::onGPSChanged()
pos.latitude = gps.location.lat();
pos.longitude = gps.location.lng();
sendToMesh(p);
// We limit our GPS broadcasts to a max rate
static uint32_t lastGpsSend;
uint32_t now = millis();
if (lastGpsSend == 0 || now - lastGpsSend > radioConfig.preferences.position_broadcast_secs * 1000)
{
lastGpsSend = now;
DEBUG_MSG("Sending position to mesh\n");
sendToMesh(p);
}
else
{
// We don't need to send this packet to anyone else, but it still serves as a nice uniform way to update our local state
nodeDB.updateFrom(*p);
releaseToPool(p);
}
}
void MeshService::onNotify(Observable *o)