Merge pull request #1917 from meshtastic/master

Master Rollup

Dockerfile

@@ -12,4 +12,4 @@ FROM frolvlad/alpine-glibc
 WORKDIR /root/
 COPY --from=builder /firmware/release/meshtasticd_linux_amd64 ./
 RUN apk --update add --no-cache g++
-CMD ["./meshtasticd_linux_amd64"]
+CMD sh -cx "./meshtasticd_linux_amd64 --hwid '$RANDOM'"

docker-compose.yml

@@ -0,0 +1,13 @@
+version: "3.7"
+
+services:
+  meshtastic-node:
+    build: .
+    deploy:
+      mode: replicated
+      replicas: 80
+    networks:
+      - mesh
+    
+networks:
+  mesh:

src/mesh/RadioLibInterface.cpp

@@ -317,7 +317,13 @@ ErrorCode RadioLibInterface::send(MeshPacket *p)
     void RadioLibInterface::handleReceiveInterrupt()
     {
         uint32_t xmitMsec;
-        assert(isReceiving);
+        
+        // when this is called, we should be in receive mode - if we are not, just jump out instead of bombing. Possible Race Condition?
+        if (!isReceiving) {
+            DEBUG_MSG("*** WAS_ASSERT *** handleReceiveInterrupt called when not in receive mode\n");
+            return;
+        }
+        
         isReceiving = false;
 
         // read the number of actually received bytes