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

[SX126x] Fixed presence check

Browse source
This commit is contained in:
jgromes 2019-09-28 11:58:06 +02:00
parent 11b501cbc9
commit 9ae3a22894
1 changed files with 9 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

17
src/modules/SX126x.cpp
View file

@ -1297,12 +1297,13 @@ int16_t SX126x::SPItransfer(uint8_t* cmd, uint8_t cmdLen, bool write, uint8_t* d
// check status
if(((in & 0b00001110) == SX126X_STATUS_CMD_TIMEOUT) ||
((in & 0b00001110) == SX126X_STATUS_CMD_INVALID) ||
((in & 0b00001110) == SX126X_STATUS_CMD_FAILED) ||
in == 0x00 || in == 0xFF) {
((in & 0b00001110) == SX126X_STATUS_CMD_FAILED)) {
status = in;
} else if(in == 0x00 || in == 0xFF) {
status = ERR_CHIP_NOT_FOUND;
}
}
RADIOLIB_VERBOSE_PRINT();
RADIOLIB_VERBOSE_PRINTLN();
} else {
// skip the first byte for read-type commands (status-only)
uint8_t in = spi->transfer(SX126X_CMD_NOP);
@ -1314,9 +1315,10 @@ int16_t SX126x::SPItransfer(uint8_t* cmd, uint8_t cmdLen, bool write, uint8_t* d
// check status
if(((in & 0b00001110) == SX126X_STATUS_CMD_TIMEOUT) ||
((in & 0b00001110) == SX126X_STATUS_CMD_INVALID) ||
((in & 0b00001110) == SX126X_STATUS_CMD_FAILED) ||
in == 0x00 || in == 0xFF) {
((in & 0b00001110) == SX126X_STATUS_CMD_FAILED)) {
status = in;
} else if(in == 0x00 || in == 0xFF) {
status = ERR_CHIP_NOT_FOUND;
}
for(uint8_t n = 0; n < numBytes; n++) {
dataIn[n] = spi->transfer(SX126X_CMD_NOP);
@ -1325,7 +1327,7 @@ int16_t SX126x::SPItransfer(uint8_t* cmd, uint8_t cmdLen, bool write, uint8_t* d
RADIOLIB_VERBOSE_PRINT(dataIn[n], HEX);
RADIOLIB_VERBOSE_PRINT('\t');
}
RADIOLIB_VERBOSE_PRINT();
RADIOLIB_VERBOSE_PRINTLN();
}
// stop transfer
@ -1351,8 +1353,7 @@ int16_t SX126x::SPItransfer(uint8_t* cmd, uint8_t cmdLen, bool write, uint8_t* d
return(ERR_SPI_CMD_INVALID);
case SX126X_STATUS_CMD_FAILED:
return(ERR_SPI_CMD_FAILED);
case(0x00):
case(0xFF):
case(ERR_CHIP_NOT_FOUND):
return(ERR_CHIP_NOT_FOUND);
default:
return(ERR_NONE);