Skip to content

Commit

Permalink
[CC1101] Fixed crash in blocking receive (#839)
Browse files Browse the repository at this point in the history
  • Loading branch information
jgromes committed Nov 18, 2023
1 parent 615cebc commit 455c3c8
Showing 1 changed file with 9 additions and 2 deletions.
11 changes: 9 additions & 2 deletions src/modules/CC1101/CC1101.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -145,7 +145,7 @@ int16_t CC1101::receive(uint8_t* data, size_t len) {

// wait for packet or timeout
uint32_t start = this->mod->hal->micros();
while(!this->mod->hal->digitalRead(this->mod->getIrq())) {
while(this->mod->hal->digitalRead(this->mod->getIrq())) {
this->mod->hal->yield();

if(this->mod->hal->micros() - start > timeout) {
Expand All @@ -155,6 +155,13 @@ int16_t CC1101::receive(uint8_t* data, size_t len) {
}
}

// for some reason, blocking receive will sometimes return impossible packet lengths
// reading packet length again in readData seems to resolve this
size_t length = getPacketLength();
if((length == 0) || (length > RADIOLIB_CC1101_MAX_PACKET_LENGTH)) {
this->packetLengthQueried = false;
}

// read packet data
return(readData(data, len));
}
Expand Down Expand Up @@ -1036,7 +1043,7 @@ int16_t CC1101::setPacketMode(uint8_t mode, uint16_t len) {
state = SPIsetRegValue(RADIOLIB_CC1101_REG_PKTLEN, len);
RADIOLIB_ASSERT(state);

// update the cached value
// update the cached values
this->packetLength = len;
this->packetLengthConfig = mode;
return(state);
Expand Down

0 comments on commit 455c3c8

Please sign in to comment.