mirror of
https://github.com/meshtastic/firmware.git
synced 2025-05-04 04:47:25 +00:00
clean up position broadcasts, send them even if we don't have gps lock
This commit is contained in:
parent
52ec4d511c
commit
a872231f8a
@ -247,22 +247,5 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *unused)
|
|||||||
// Update our current position in the local DB
|
// Update our current position in the local DB
|
||||||
nodeDB.updatePosition(nodeDB.getNodeNum(), pos);
|
nodeDB.updatePosition(nodeDB.getNodeNum(), pos);
|
||||||
|
|
||||||
// We limit our GPS broadcasts to a max rate
|
|
||||||
static uint32_t lastGpsSend;
|
|
||||||
uint32_t now = millis();
|
|
||||||
if (lastGpsSend == 0 || now - lastGpsSend > getPref_position_broadcast_secs() * 1000) {
|
|
||||||
lastGpsSend = now;
|
|
||||||
|
|
||||||
static uint32_t currentGeneration;
|
|
||||||
|
|
||||||
// If we changed channels, ask everyone else for their latest info
|
|
||||||
bool requestReplies = currentGeneration != radioGeneration;
|
|
||||||
currentGeneration = radioGeneration;
|
|
||||||
|
|
||||||
DEBUG_MSG("Sending position to mesh (wantReplies=%d)\n", requestReplies);
|
|
||||||
assert(positionPlugin);
|
|
||||||
positionPlugin->sendOurPosition(NODENUM_BROADCAST, requestReplies);
|
|
||||||
}
|
|
||||||
|
|
||||||
return 0;
|
return 0;
|
||||||
}
|
}
|
||||||
|
@ -60,3 +60,22 @@ void PositionPlugin::sendOurPosition(NodeNum dest, bool wantReplies)
|
|||||||
|
|
||||||
service.sendToMesh(p);
|
service.sendToMesh(p);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
int32_t PositionPlugin::runOnce(){
|
||||||
|
|
||||||
|
// We limit our GPS broadcasts to a max rate
|
||||||
|
uint32_t now = millis();
|
||||||
|
if (lastGpsSend == 0 || now - lastGpsSend >= getPref_position_broadcast_secs() * 1000) {
|
||||||
|
lastGpsSend = now;
|
||||||
|
|
||||||
|
// If we changed channels, ask everyone else for their latest info
|
||||||
|
bool requestReplies = currentGeneration != radioGeneration;
|
||||||
|
currentGeneration = radioGeneration;
|
||||||
|
|
||||||
|
DEBUG_MSG("Sending position to mesh (wantReplies=%d)\n", requestReplies);
|
||||||
|
sendOurPosition(NODENUM_BROADCAST, requestReplies);
|
||||||
|
}
|
||||||
|
|
||||||
|
return 5000; // to save power only wake for our callback occasionally
|
||||||
|
}
|
@ -1,19 +1,26 @@
|
|||||||
#pragma once
|
#pragma once
|
||||||
#include "ProtobufPlugin.h"
|
#include "ProtobufPlugin.h"
|
||||||
|
#include "concurrency/OSThread.h"
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Position plugin for sending/receiving positions into the mesh
|
* Position plugin for sending/receiving positions into the mesh
|
||||||
*/
|
*/
|
||||||
class PositionPlugin : public ProtobufPlugin<Position>
|
class PositionPlugin : public ProtobufPlugin<Position>, private concurrency::OSThread
|
||||||
{
|
{
|
||||||
/// The id of the last packet we sent, to allow us to cancel it if we make something fresher
|
/// The id of the last packet we sent, to allow us to cancel it if we make something fresher
|
||||||
PacketId prevPacketId = 0;
|
PacketId prevPacketId = 0;
|
||||||
|
|
||||||
|
/// We limit our GPS broadcasts to a max rate
|
||||||
|
uint32_t lastGpsSend = 0;
|
||||||
|
|
||||||
|
/// We force a rebroadcast if the radio settings change
|
||||||
|
uint32_t currentGeneration = 0;
|
||||||
|
|
||||||
public:
|
public:
|
||||||
/** Constructor
|
/** Constructor
|
||||||
* name is for debugging output
|
* name is for debugging output
|
||||||
*/
|
*/
|
||||||
PositionPlugin() : ProtobufPlugin("position", PortNum_POSITION_APP, Position_fields) {}
|
PositionPlugin() : ProtobufPlugin("position", PortNum_POSITION_APP, Position_fields), concurrency::OSThread("PositionPlugin") {}
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Send our position into the mesh
|
* Send our position into the mesh
|
||||||
@ -31,6 +38,9 @@ class PositionPlugin : public ProtobufPlugin<Position>
|
|||||||
/** Messages can be received that have the want_response bit set. If set, this callback will be invoked
|
/** Messages can be received that have the want_response bit set. If set, this callback will be invoked
|
||||||
* so that subclasses can (optionally) send a response back to the original sender. */
|
* so that subclasses can (optionally) send a response back to the original sender. */
|
||||||
virtual MeshPacket *allocReply();
|
virtual MeshPacket *allocReply();
|
||||||
|
|
||||||
|
/** Does our periodic broadcast */
|
||||||
|
virtual int32_t runOnce();
|
||||||
};
|
};
|
||||||
|
|
||||||
extern PositionPlugin *positionPlugin;
|
extern PositionPlugin *positionPlugin;
|
Loading…
Reference in New Issue
Block a user