forks/RadioLibSmol
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

[SX127x] Fixed copy-pasted code snippet

Browse source
This commit is contained in:
jgromes 2023-11-21 20:48:06 +01:00
parent 4aadd7aab2
commit 81c59f61ff
1 changed files with 18 additions and 29 deletions

33
src/modules/SX127x/SX127x.cpp
View file

@ -152,9 +152,19 @@ int16_t SX127x::transmit(uint8_t* data, size_t len, uint8_t addr) {
int16_t modem = getActiveModem(); int16_t modem = getActiveModem();
uint32_t start = 0; uint32_t start = 0;
uint32_t timeout = 0;
if(modem == RADIOLIB_SX127X_LORA) { if(modem == RADIOLIB_SX127X_LORA) {
// calculate timeout (150 % of expected time-on-air) // calculate timeout (150 % of expected time-on-air)
uint32_t timeout = getTimeOnAir(len) * 1.5; timeout = getTimeOnAir(len) * 1.5;
} else if(modem == RADIOLIB_SX127X_FSK_OOK) {
// calculate timeout (5ms + 500 % of expected time-on-air)
timeout = 5000 + getTimeOnAir(len) * 5;
} else {
return(RADIOLIB_ERR_UNKNOWN);
}
// start transmission // start transmission
state = startTransmit(data, len, addr); state = startTransmit(data, len, addr);
@ -170,27 +180,6 @@ int16_t SX127x::transmit(uint8_t* data, size_t len, uint8_t addr) {
} }
} }
} else if(modem == RADIOLIB_SX127X_FSK_OOK) {
// calculate timeout (5ms + 500 % of expected time-on-air)
uint32_t timeout = 5000 + getTimeOnAir(len) * 5;
// start transmission
state = startTransmit(data, len, addr);
RADIOLIB_ASSERT(state);
// wait for transmission end or timeout
start = this->mod->hal->micros();
while(!this->mod->hal->digitalRead(this->mod->getIrq())) {
this->mod->hal->yield();
if(this->mod->hal->micros() - start > timeout) {
finishTransmit();
return(RADIOLIB_ERR_TX_TIMEOUT);
}
}
} else {
return(RADIOLIB_ERR_UNKNOWN);
}
// update data rate // update data rate
uint32_t elapsed = this->mod->hal->micros() - start; uint32_t elapsed = this->mod->hal->micros() - start;
this->dataRate = (len*8.0)/((float)elapsed/1000000.0); this->dataRate = (len*8.0)/((float)elapsed/1000000.0);