From 6e648f58da0ee4769e4bb9df569b7c393156bc50 Mon Sep 17 00:00:00 2001 From: Marcelo Aquino Date: Tue, 16 May 2017 03:00:47 -0300 Subject: [PATCH] Linux: Fix compilation error for rfm69 (#848) --- drivers/RFM69/new/RFM69_new.cpp | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/drivers/RFM69/new/RFM69_new.cpp b/drivers/RFM69/new/RFM69_new.cpp index 5826881..1a8eeac 100644 --- a/drivers/RFM69/new/RFM69_new.cpp +++ b/drivers/RFM69/new/RFM69_new.cpp @@ -315,8 +315,10 @@ LOCAL void RFM69_interruptHandler(void) headerRead = true; if (RFM69.currentPacket.header.version >= RFM69_MIN_PACKET_HEADER_VERSION) { // read payload - readingLength = min(RFM69.currentPacket.header.packetLen - (RFM69_HEADER_LEN - 1), - RFM69_MAX_PACKET_LEN); + readingLength = RFM69.currentPacket.header.packetLen - (RFM69_HEADER_LEN - 1); + if (readingLength < RFM69_MAX_PACKET_LEN) { + readingLength = RFM69_MAX_PACKET_LEN; + } RFM69.currentPacket.payloadLen = readingLength; RFM69.ackReceived = RFM69_getACKReceived(RFM69.currentPacket.header.controlFlags); RFM69.dataReceived = !RFM69.ackReceived;