diff --git a/Dockerfile b/Dockerfile index 01d262ce3..0ce4e3326 100644 --- a/Dockerfile +++ b/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'" \ No newline at end of file diff --git a/docker-compose.yml b/docker-compose.yml new file mode 100644 index 000000000..f137139c2 --- /dev/null +++ b/docker-compose.yml @@ -0,0 +1,13 @@ +version: "3.7" + +services: + meshtastic-node: + build: . + deploy: + mode: replicated + replicas: 80 + networks: + - mesh + +networks: + mesh: \ No newline at end of file diff --git a/src/mesh/RadioLibInterface.cpp b/src/mesh/RadioLibInterface.cpp index 262a10c18..c08220555 100644 --- a/src/mesh/RadioLibInterface.cpp +++ b/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