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

Update RFM69 to MYS coding standards (#694)

Browse Source
This commit is contained in:
Bruce Lacey
2016-12-17 12:50:52 -08:00
committed by GitHub
parent 4753c1ec3d
commit 3be2516ef8
1 changed files with 4 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files
drivers/RFM69/RFM69.cpp
+4 -2
View File
@@ -345,7 +345,8 @@ void RFM69::sendFrame(uint8_t toAddress, const void* buffer, uint8_t bufferSize,
setMode(RF69_MODE_TX); setMode(RF69_MODE_TX);
uint32_t txStart = millis(); uint32_t txStart = millis();
while (hwDigitalRead(_interruptPin) == 0 && while (hwDigitalRead(_interruptPin) == 0 &&
millis() - txStart < RF69_TX_LIMIT_MS) {} // wait for DIO0 to turn HIGH signalling transmission finish millis() - txStart <
RF69_TX_LIMIT_MS) {} // wait for DIO0 to turn HIGH signalling transmission finish
//while (readReg(REG_IRQFLAGS2) & RF_IRQFLAGS2_PACKETSENT == 0x00); // wait for ModeReady //while (readReg(REG_IRQFLAGS2) & RF_IRQFLAGS2_PACKETSENT == 0x00); // wait for ModeReady
setMode(RF69_MODE_STANDBY); setMode(RF69_MODE_STANDBY);
} }
@@ -364,7 +365,8 @@ void RFM69::interruptHandler()
PAYLOADLEN = PAYLOADLEN > 66 ? 66 : PAYLOADLEN; // precaution PAYLOADLEN = PAYLOADLEN > 66 ? 66 : PAYLOADLEN; // precaution
TARGETID = SPI.transfer(0); TARGETID = SPI.transfer(0);
if(!(_promiscuousMode || TARGETID == _address || if(!(_promiscuousMode || TARGETID == _address ||
TARGETID == RF69_BROADCAST_ADDR) // match this node's address, or broadcast address or anything in promiscuous mode TARGETID ==
RF69_BROADCAST_ADDR) // match this node's address, or broadcast address or anything in promiscuous mode
|| PAYLOADLEN < || PAYLOADLEN <
3) { // address situation could receive packets that are malformed and don't fit this libraries extra fields 3) { // address situation could receive packets that are malformed and don't fit this libraries extra fields
PAYLOADLEN = 0; PAYLOADLEN = 0;