Merge pull request #68 from meshtastic/master

from main to my fork

src/plugins/NodeInfoPlugin.cpp

@@ -28,9 +28,15 @@ bool NodeInfoPlugin::handleReceivedProtobuf(const MeshPacket &mp, const User &p)
 
 void NodeInfoPlugin::sendOurNodeInfo(NodeNum dest, bool wantReplies)
 {
+    // cancel any not yet sent (now stale) position packets
+    if(prevPacketId) // if we wrap around to zero, we'll simply fail to cancel in that rare case (no big deal)
+        service.cancelSending(prevPacketId);
+
     MeshPacket *p = allocReply();
     p->to = dest;
     p->decoded.want_response = wantReplies;
+    p->priority = MeshPacket_Priority_BACKGROUND;
+    prevPacketId = p->id;
 
     service.sendToMesh(p);
 }

src/plugins/NodeInfoPlugin.h

@@ -6,6 +6,9 @@
  */
 class NodeInfoPlugin : public ProtobufPlugin<User>
 {
+    /// The id of the last packet we sent, to allow us to cancel it if we make something fresher
+    PacketId prevPacketId = 0;
+      
   public:
     /** Constructor
      * name is for debugging output

src/plugins/PositionPlugin.cpp

@@ -37,9 +37,15 @@ MeshPacket *PositionPlugin::allocReply()
 
 void PositionPlugin::sendOurPosition(NodeNum dest, bool wantReplies)
 {
+    // cancel any not yet sent (now stale) position packets
+    if(prevPacketId) // if we wrap around to zero, we'll simply fail to cancel in that rare case (no big deal)
+        service.cancelSending(prevPacketId);
+
     MeshPacket *p = allocReply();
     p->to = dest;
     p->decoded.want_response = wantReplies;
+    p->priority = MeshPacket_Priority_BACKGROUND;
+    prevPacketId = p->id;
 
     service.sendToMesh(p);
 }

src/plugins/PositionPlugin.h

@@ -6,6 +6,9 @@
  */
 class PositionPlugin : public ProtobufPlugin<Position>
 {
+    /// The id of the last packet we sent, to allow us to cancel it if we make something fresher
+    PacketId prevPacketId = 0;
+
   public:
     /** Constructor
      * name is for debugging output