[SX128x] Fixed blocking receive
This commit is contained in:
parent
7f40ee49c6
commit
36530b00fc
1 changed files with 17 additions and 3 deletions
|
@ -353,16 +353,30 @@ int16_t SX128x::receive(uint8_t* data, size_t len) {
|
||||||
RADIOLIB_ASSERT(state);
|
RADIOLIB_ASSERT(state);
|
||||||
|
|
||||||
// wait for packet reception or timeout
|
// wait for packet reception or timeout
|
||||||
|
bool softTimeout = false;
|
||||||
uint32_t start = this->mod->hal->micros();
|
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();
|
this->mod->hal->yield();
|
||||||
|
// safety check, the timeout should be done by the radio
|
||||||
if(this->mod->hal->micros() - start > timeout) {
|
if(this->mod->hal->micros() - start > timeout) {
|
||||||
clearIrqStatus();
|
softTimeout = true;
|
||||||
standby();
|
break;
|
||||||
return(RADIOLIB_ERR_RX_TIMEOUT);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
// if it was a timeout, this will return an error code
|
||||||
|
state = standby();
|
||||||
|
if((state != RADIOLIB_ERR_NONE) && (state != RADIOLIB_ERR_SPI_CMD_TIMEOUT)) {
|
||||||
|
return(state);
|
||||||
|
}
|
||||||
|
|
||||||
|
// check whether this was a timeout or not
|
||||||
|
if((getIrqStatus() & RADIOLIB_SX128X_IRQ_RX_TX_TIMEOUT) || softTimeout) {
|
||||||
|
standby();
|
||||||
|
clearIrqStatus();
|
||||||
|
return(RADIOLIB_ERR_RX_TIMEOUT);
|
||||||
|
}
|
||||||
|
|
||||||
// read the received data
|
// read the received data
|
||||||
return(readData(data, len));
|
return(readData(data, len));
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Reference in a new issue