Merge branch 'master' into nmea-serial

src/mesh/MeshService.cpp

@@ -283,3 +283,8 @@ int MeshService::onGPSChanged(const meshtastic::GPSStatus *newStatus)
 
     return 0;
 }
+
+bool MeshService::isToPhoneQueueEmpty() 
+{
+    return toPhoneQueue.isEmpty();
+}

src/mesh/MeshService.h

@@ -89,6 +89,8 @@ class MeshService
       /// Send a packet to the phone
     void sendToPhone(MeshPacket *p);
 
+    bool isToPhoneQueueEmpty();
+
   private:
     /// Called when our gps position has changed - updates nodedb and sends Location message out into the mesh
     /// returns 0 to allow futher processing

src/modules/Telemetry/DeviceTelemetry.cpp

@@ -9,6 +9,7 @@
 #include "main.h"
 #include <OLEDDisplay.h>
 #include <OLEDDisplayUi.h>
+#include "MeshService.h"
 
 int32_t DeviceTelemetryModule::runOnce()
 {
@@ -18,8 +19,9 @@ int32_t DeviceTelemetryModule::runOnce()
         && airTime->channelUtilizationPercent() < max_channel_util_percent) {
         sendTelemetry();
         lastSentToMesh = now;
-    } else {
+    } else if (service.isToPhoneQueueEmpty()) {
         // Just send to phone when it's not our time to send to mesh yet
+        // Only send while queue is empty (phone assumed connected)
         sendTelemetry(NODENUM_BROADCAST, true);
     }
     return sendToPhoneIntervalMs;

src/modules/Telemetry/DeviceTelemetry.h

@@ -11,7 +11,8 @@ class DeviceTelemetryModule : private concurrency::OSThread, public ProtobufModu
     DeviceTelemetryModule()
         : concurrency::OSThread("DeviceTelemetryModule"), ProtobufModule("DeviceTelemetry", PortNum_TELEMETRY_APP, &Telemetry_msg)
     {
-        lastMeasurementPacket = nullptr;
+      lastMeasurementPacket = nullptr;
+      setIntervalFromNow(10 * 1000);
     }
     virtual bool wantUIFrame() { return false; }
 

src/modules/Telemetry/EnvironmentTelemetry.h

@@ -12,7 +12,8 @@ class EnvironmentTelemetryModule : private concurrency::OSThread, public Protobu
         : concurrency::OSThread("EnvironmentTelemetryModule"),
           ProtobufModule("EnvironmentTelemetry", PortNum_TELEMETRY_APP, &Telemetry_msg)
     {
-        lastMeasurementPacket = nullptr;
+      lastMeasurementPacket = nullptr;
+      setIntervalFromNow(10 * 1000);
     }
     virtual bool wantUIFrame() override;
 #if !HAS_SCREEN