MySmartHome/MySensors
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Linux: Fix compilation error for rfm95 (#846)

Browse Source 
Fix #843
This commit is contained in:
Marcelo Aquino
2017-05-16 07:59:49 +02:00
committed by Olivier
parent 582c653a19
commit 34444a48b3
1 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/RFM95/RFM95.cpp
+4 -3
View File
@@ -267,7 +267,8 @@ LOCAL uint8_t RFM95_recv(uint8_t* buf, const uint8_t maxBufSize)
noInterrupts(); noInterrupts();
const uint8_t payloadLen = min(RFM95.currentPacket.payloadLen, maxBufSize); const uint8_t payloadLen = RFM95.currentPacket.payloadLen < maxBufSize?
RFM95.currentPacket.payloadLen : maxBufSize;
const uint8_t sender = RFM95.currentPacket.header.sender; const uint8_t sender = RFM95.currentPacket.header.sender;
const rfm95_sequenceNumber_t sequenceNumber = RFM95.currentPacket.header.sequenceNumber; const rfm95_sequenceNumber_t sequenceNumber = RFM95.currentPacket.header.sequenceNumber;
const rfm95_controlFlags_t controlFlags = RFM95.currentPacket.header.controlFlags; const rfm95_controlFlags_t controlFlags = RFM95.currentPacket.header.controlFlags;
@@ -340,8 +341,8 @@ LOCAL void RFM95_setFrequency(const uint32_t frequencyHz)
LOCAL bool RFM95_setTxPowerLevel(rfm95_powerLevel_t newPowerLevel) LOCAL bool RFM95_setTxPowerLevel(rfm95_powerLevel_t newPowerLevel)
{ {
// RFM95/96/97/98 does not have RFO pins connected to anything. Only PA_BOOST // RFM95/96/97/98 does not have RFO pins connected to anything. Only PA_BOOST
newPowerLevel = max((uint8_t)RFM95_MIN_POWER_LEVEL_DBM, newPowerLevel); newPowerLevel = max((int8_t)RFM95_MIN_POWER_LEVEL_DBM, newPowerLevel);
newPowerLevel = min((uint8_t)RFM95_MAX_POWER_LEVEL_DBM, newPowerLevel); newPowerLevel = min((int8_t)RFM95_MAX_POWER_LEVEL_DBM, newPowerLevel);
if (newPowerLevel != RFM95.powerLevel) { if (newPowerLevel != RFM95.powerLevel) {
RFM95.powerLevel = newPowerLevel; RFM95.powerLevel = newPowerLevel;
uint8_t val; uint8_t val;