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

Added option to disable "paranoid" SPI mode (enabled by default)

Browse source
This commit is contained in:
jgromes 2021-02-12 21:03:49 +01:00
parent 4461e9a98e
commit 9a9af85fdc
2 changed files with 41 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/BuildOpt.h
View file

@ -390,6 +390,13 @@
//#define RADIOLIB_STATIC_ONLY //#define RADIOLIB_STATIC_ONLY
/*
* Uncomment to enable "paranoid" SPI mode
* Every write to an SPI register using SPI set function will be verified by a subsequent read operation.
* This improves reliablility, but slightly slows down communication.
*/
#define RADIOLIB_SPI_PARANOID
// set the size of static arrays to use // set the size of static arrays to use
#if !defined(RADIOLIB_STATIC_ARRAY_SIZE) #if !defined(RADIOLIB_STATIC_ARRAY_SIZE)
#define RADIOLIB_STATIC_ARRAY_SIZE 256 #define RADIOLIB_STATIC_ARRAY_SIZE 256

64
src/Module.cpp
View file

@ -216,39 +216,43 @@ int16_t Module::SPIsetRegValue(uint8_t reg, uint8_t value, uint8_t msb, uint8_t
uint8_t newValue = (currentValue & ~mask) | (value & mask); uint8_t newValue = (currentValue & ~mask) | (value & mask);
SPIwriteRegister(reg, newValue); SPIwriteRegister(reg, newValue);
// check register value each millisecond until check interval is reached #if defined(RADIOLIB_SPI_PARANOID)
// some registers need a bit of time to process the change (e.g. SX127X_REG_OP_MODE) // check register value each millisecond until check interval is reached
uint32_t start = Module::micros(); // some registers need a bit of time to process the change (e.g. SX127X_REG_OP_MODE)
uint8_t readValue = 0x00; uint32_t start = Module::micros();
while(Module::micros() - start < (checkInterval * 1000)) { uint8_t readValue = 0x00;
readValue = SPIreadRegister(reg); while(Module::micros() - start < (checkInterval * 1000)) {
if(readValue == newValue) { readValue = SPIreadRegister(reg);
// check passed, we can stop the loop if(readValue == newValue) {
return(ERR_NONE); // check passed, we can stop the loop
return(ERR_NONE);
}
} }
}
// check failed, print debug info // check failed, print debug info
RADIOLIB_DEBUG_PRINTLN(); RADIOLIB_DEBUG_PRINTLN();
RADIOLIB_DEBUG_PRINT(F("address:\t0x")); RADIOLIB_DEBUG_PRINT(F("address:\t0x"));
RADIOLIB_DEBUG_PRINTLN(reg, HEX); RADIOLIB_DEBUG_PRINTLN(reg, HEX);
RADIOLIB_DEBUG_PRINT(F("bits:\t\t")); RADIOLIB_DEBUG_PRINT(F("bits:\t\t"));
RADIOLIB_DEBUG_PRINT(msb); RADIOLIB_DEBUG_PRINT(msb);
RADIOLIB_DEBUG_PRINT(' '); RADIOLIB_DEBUG_PRINT(' ');
RADIOLIB_DEBUG_PRINTLN(lsb); RADIOLIB_DEBUG_PRINTLN(lsb);
RADIOLIB_DEBUG_PRINT(F("value:\t\t0b")); RADIOLIB_DEBUG_PRINT(F("value:\t\t0b"));
RADIOLIB_DEBUG_PRINTLN(value, BIN); RADIOLIB_DEBUG_PRINTLN(value, BIN);
RADIOLIB_DEBUG_PRINT(F("current:\t0b")); RADIOLIB_DEBUG_PRINT(F("current:\t0b"));
RADIOLIB_DEBUG_PRINTLN(currentValue, BIN); RADIOLIB_DEBUG_PRINTLN(currentValue, BIN);
RADIOLIB_DEBUG_PRINT(F("mask:\t\t0b")); RADIOLIB_DEBUG_PRINT(F("mask:\t\t0b"));
RADIOLIB_DEBUG_PRINTLN(mask, BIN); RADIOLIB_DEBUG_PRINTLN(mask, BIN);
RADIOLIB_DEBUG_PRINT(F("new:\t\t0b")); RADIOLIB_DEBUG_PRINT(F("new:\t\t0b"));
RADIOLIB_DEBUG_PRINTLN(newValue, BIN); RADIOLIB_DEBUG_PRINTLN(newValue, BIN);
RADIOLIB_DEBUG_PRINT(F("read:\t\t0b")); RADIOLIB_DEBUG_PRINT(F("read:\t\t0b"));
RADIOLIB_DEBUG_PRINTLN(readValue, BIN); RADIOLIB_DEBUG_PRINTLN(readValue, BIN);
RADIOLIB_DEBUG_PRINTLN(); RADIOLIB_DEBUG_PRINTLN();
return(ERR_SPI_WRITE_FAILED); return(ERR_SPI_WRITE_FAILED);
#else
return(ERR_NONE);
#endif
} }
void Module::SPIreadRegisterBurst(uint8_t reg, uint8_t numBytes, uint8_t* inBytes) { void Module::SPIreadRegisterBurst(uint8_t reg, uint8_t numBytes, uint8_t* inBytes) {