Merge branch 'master' into tft-gui-work

src/mesh/ReliableRouter.cpp

@@ -167,8 +167,6 @@ bool ReliableRouter::stopRetransmission(GlobalPacketId key)
     auto old = findPendingPacket(key);
     if (old) {
         auto p = old->packet;
-        auto numErased = pending.erase(key);
-        assert(numErased == 1);
         /* Only when we already transmitted a packet via LoRa, we will cancel the packet in the Tx queue
           to avoid canceling a transmission if it was ACKed super fast via MQTT */
         if (old->numRetransmissions < NUM_RETRANSMISSIONS - 1) {
@@ -177,6 +175,8 @@ bool ReliableRouter::stopRetransmission(GlobalPacketId key)
             // now free the pooled copy for retransmission too
             packetPool.release(p);
         }
+        auto numErased = pending.erase(key);
+        assert(numErased == 1);
         return true;
     } else
         return false;

src/modules/RangeTestModule.cpp

@@ -114,7 +114,7 @@ void RangeTestModuleRadio::sendPayload(NodeNum dest, bool wantReplies)
     p->to = dest;
     p->decoded.want_response = wantReplies;
     p->hop_limit = 0;
-    p->want_ack = true;
+    p->want_ack = false;
 
     packetSequence++;
 

src/modules/Telemetry/Sensor/SHT31Sensor.cpp

@@ -12,6 +12,7 @@ int32_t SHT31Sensor::runOnce()
     if (!hasSensor()) {
         return DEFAULT_SENSOR_MINIMUM_WAIT_TIME_BETWEEN_READS;
     }
+    sht31 = Adafruit_SHT31(nodeTelemetrySensorsMap[sensorType].second);
     status = sht31.begin(nodeTelemetrySensorsMap[sensorType].first);
     return initI2CSensor();
 }

src/modules/Telemetry/Sensor/SHT31Sensor.h

@@ -5,7 +5,7 @@
 class SHT31Sensor : public TelemetrySensor
 {
   private:
-    Adafruit_SHT31 sht31 = Adafruit_SHT31(nodeTelemetrySensorsMap[sensorType].second);
+    Adafruit_SHT31 sht31;
 
   protected:
     virtual void setup() override;