Merge branch 'master' of https://github.com/meshtastic/Meshtastic-device

bin/uf2-convert.bat

@@ -0,0 +1,2 @@
+@echo off
+if [%1]==[] (echo "Please specify a platformio NRF target (i.e. rak4631) as the first argument.") else (python3 .\bin\uf2conv.py .\.pio\build\%1\firmware.hex -c -o .\.pio\build\%1\firmware.uf2 -f 0xADA52840)

src/mesh/generated/admin.pb.h

@@ -4,9 +4,9 @@
 #ifndef PB_ADMIN_PB_H_INCLUDED
 #define PB_ADMIN_PB_H_INCLUDED
 #include <pb.h>
+#include "channel.pb.h"
 #include "mesh.pb.h"
 #include "radioconfig.pb.h"
-#include "channel.pb.h"
 
 #if PB_PROTO_HEADER_VERSION != 40
 #error Regenerate this file with the current version of nanopb generator.

src/mesh/generated/deviceonly.pb.h

@@ -4,8 +4,8 @@
 #ifndef PB_DEVICEONLY_PB_H_INCLUDED
 #define PB_DEVICEONLY_PB_H_INCLUDED
 #include <pb.h>
-#include "mesh.pb.h"
 #include "channel.pb.h"
+#include "mesh.pb.h"
 #include "radioconfig.pb.h"
 
 #if PB_PROTO_HEADER_VERSION != 40

src/plugins/PositionPlugin.cpp

@@ -145,7 +145,7 @@ int32_t PositionPlugin::runOnce()
         DEBUG_MSG("Sending pos@%x:6 to mesh (wantReplies=%d)\n", node->position.pos_timestamp, requestReplies);
         sendOurPosition(NODENUM_BROADCAST, requestReplies);
     } else if (radioConfig.preferences.position_broadcast_smart == true) {
-        // NodeInfo *node = service.refreshMyNodeInfo(); // should guarantee there is now a position
+        NodeInfo *node = service.refreshMyNodeInfo(); // should guarantee there is now a position
 
         if (node->has_position && (node->position.latitude_i != 0 || node->position.longitude_i != 0)) {
             float distance = GeoCoord::latLongToMeter(lastGpsLatitude * 1e-7, lastGpsLongitude * 1e-7,
@@ -170,6 +170,11 @@ int32_t PositionPlugin::runOnce()
 
                 DEBUG_MSG("Sending smart pos@%x:6 to mesh (wantReplies=%d)\n", node->position.pos_timestamp, requestReplies);
                 sendOurPosition(NODENUM_BROADCAST, requestReplies);
+
+                /* Update lastGpsSend to now. This means if the device is stationary, then
+                   getPref_position_broadcast_secs will still apply.
+                */
+                lastGpsSend = now;
             }
         }
     }