Cansat
/
RFM69_LowPowerLab
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #168 from jdede/esp8266-ACK-fix 

Fix for esp8266 ACK problem. Solution as suggested in #49 and #105
This commit is contained in:
Felix Rusu 2022-02-25 11:03:28 -05:00 committed by GitHub
parent 6469dac833 d8d4ee6ffe
commit b65f6c4eb1
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 12 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
RFM69.cpp
View File

@ -307,7 +307,12 @@ void RFM69::send(uint16_t toAddress, const void* buffer, uint8_t bufferSize, boo
{ {
writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFB) | RF_PACKET2_RXRESTART); // avoid RX deadlocks writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFB) | RF_PACKET2_RXRESTART); // avoid RX deadlocks
uint32_t now = millis(); uint32_t now = millis();
while (!canSend() && millis() - now < RF69_CSMA_LIMIT_MS) receiveDone(); while (!canSend() && millis() - now < RF69_CSMA_LIMIT_MS){
receiveDone();
#ifdef ESP8266
delay(1); // Give esp8266-based boards to handle background tasks. Seems to work better than yield();
#endif
}
sendFrame(toAddress, buffer, bufferSize, requestACK, false); sendFrame(toAddress, buffer, bufferSize, requestACK, false);
} }
@ -350,7 +355,12 @@ void RFM69::sendACK(const void* buffer, uint8_t bufferSize) {
int16_t _RSSI = RSSI; // save payload received RSSI value int16_t _RSSI = RSSI; // save payload received RSSI value
writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFB) | RF_PACKET2_RXRESTART); // avoid RX deadlocks writeReg(REG_PACKETCONFIG2, (readReg(REG_PACKETCONFIG2) & 0xFB) | RF_PACKET2_RXRESTART); // avoid RX deadlocks
uint32_t now = millis(); uint32_t now = millis();
while (!canSend() && millis() - now < RF69_CSMA_LIMIT_MS) receiveDone(); while (!canSend() && millis() - now < RF69_CSMA_LIMIT_MS){
receiveDone();
#ifdef ESP8266
delay(1); // Give esp8266-based boards to handle background tasks. Seems to work better than yield().
#endif
}
SENDERID = sender; // TWS: Restore SenderID after it gets wiped out by receiveDone() SENDERID = sender; // TWS: Restore SenderID after it gets wiped out by receiveDone()
sendFrame(sender, buffer, bufferSize, false, true); sendFrame(sender, buffer, bufferSize, false, true);
RSSI = _RSSI; // restore payload RSSI RSSI = _RSSI; // restore payload RSSI