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

[SX126x] Skip SPI verification during block calibration (#583)

Browse source
This commit is contained in:
jgromes 2022-10-04 18:19:54 +02:00
parent f6e5d02481
commit 170ce9752b
2 changed files with 25 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
src/modules/SX126x/SX126x.cpp
View file

@ -1617,7 +1617,7 @@ int16_t SX126x::config(uint8_t modem) {
// calibrate all blocks // calibrate all blocks
data[0] = RADIOLIB_SX126X_CALIBRATE_ALL; data[0] = RADIOLIB_SX126X_CALIBRATE_ALL;
state = SPIwriteCommand(RADIOLIB_SX126X_CMD_CALIBRATE, data, 1); state = SPIwriteCommand(RADIOLIB_SX126X_CMD_CALIBRATE, data, 1, true, false);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// wait for calibration completion // wait for calibration completion
@ -1662,43 +1662,55 @@ int16_t SX126x::checkCommandResult() {
return(state); return(state);
} }
int16_t SX126x::SPIwriteCommand(uint8_t* cmd, uint8_t cmdLen, uint8_t* data, uint8_t numBytes, bool waitForBusy) { int16_t SX126x::SPIwriteCommand(uint8_t* cmd, uint8_t cmdLen, uint8_t* data, uint8_t numBytes, bool waitForBusy, bool verify) {
// send the command // send the command
int16_t state = SX126x::SPItransfer(cmd, cmdLen, true, data, NULL, numBytes, waitForBusy); int16_t state = SX126x::SPItransfer(cmd, cmdLen, true, data, NULL, numBytes, waitForBusy);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// check the status // check the status
state = checkCommandResult(); if(verify) {
state = checkCommandResult();
}
return(state); return(state);
} }
int16_t SX126x::SPIwriteCommand(uint8_t cmd, uint8_t* data, uint8_t numBytes, bool waitForBusy) { int16_t SX126x::SPIwriteCommand(uint8_t cmd, uint8_t* data, uint8_t numBytes, bool waitForBusy, bool verify) {
// send the command // send the command
int16_t state = SX126x::SPItransfer(&cmd, 1, true, data, NULL, numBytes, waitForBusy); int16_t state = SX126x::SPItransfer(&cmd, 1, true, data, NULL, numBytes, waitForBusy);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// check the status // check the status
state = checkCommandResult(); if(verify) {
state = checkCommandResult();
}
return(state); return(state);
} }
int16_t SX126x::SPIreadCommand(uint8_t* cmd, uint8_t cmdLen, uint8_t* data, uint8_t numBytes, bool waitForBusy) { int16_t SX126x::SPIreadCommand(uint8_t* cmd, uint8_t cmdLen, uint8_t* data, uint8_t numBytes, bool waitForBusy, bool verify) {
// send the command // send the command
int16_t state = SX126x::SPItransfer(cmd, cmdLen, false, NULL, data, numBytes, waitForBusy); int16_t state = SX126x::SPItransfer(cmd, cmdLen, false, NULL, data, numBytes, waitForBusy);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// check the status // check the status
state = checkCommandResult(); if(verify) {
state = checkCommandResult();
}
return(state); return(state);
} }
int16_t SX126x::SPIreadCommand(uint8_t cmd, uint8_t* data, uint8_t numBytes, bool waitForBusy) { int16_t SX126x::SPIreadCommand(uint8_t cmd, uint8_t* data, uint8_t numBytes, bool waitForBusy, bool verify) {
// send the command // send the command
int16_t state = SX126x::SPItransfer(&cmd, 1, false, NULL, data, numBytes, waitForBusy); int16_t state = SX126x::SPItransfer(&cmd, 1, false, NULL, data, numBytes, waitForBusy);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// check the status // check the status
state = checkCommandResult(); if(verify) {
state = checkCommandResult();
}
return(state); return(state);
} }

8
src/modules/SX126x/SX126x.h
View file

@ -1005,10 +1005,10 @@ class SX126x: public PhysicalLayer {
Module* _mod; Module* _mod;
// common low-level SPI interface // common low-level SPI interface
int16_t SPIwriteCommand(uint8_t cmd, uint8_t* data, uint8_t numBytes, bool waitForBusy = true); int16_t SPIwriteCommand(uint8_t cmd, uint8_t* data, uint8_t numBytes, bool waitForBusy = true, bool verify = true);
int16_t SPIwriteCommand(uint8_t* cmd, uint8_t cmdLen, uint8_t* data, uint8_t numBytes, bool waitForBusy = true); int16_t SPIwriteCommand(uint8_t* cmd, uint8_t cmdLen, uint8_t* data, uint8_t numBytes, bool waitForBusy = true, bool verify = true);
int16_t SPIreadCommand(uint8_t cmd, uint8_t* data, uint8_t numBytes, bool waitForBusy = true); int16_t SPIreadCommand(uint8_t cmd, uint8_t* data, uint8_t numBytes, bool waitForBusy = true, bool verify = true);
int16_t SPIreadCommand(uint8_t* cmd, uint8_t cmdLen, uint8_t* data, uint8_t numBytes, bool waitForBusy = true); int16_t SPIreadCommand(uint8_t* cmd, uint8_t cmdLen, uint8_t* data, uint8_t numBytes, bool waitForBusy = true, bool verify = true);
int16_t SPItransfer(uint8_t* cmd, uint8_t cmdLen, bool write, uint8_t* dataOut, uint8_t* dataIn, uint8_t numBytes, bool waitForBusy, uint32_t timeout = 5000); int16_t SPItransfer(uint8_t* cmd, uint8_t cmdLen, bool write, uint8_t* dataOut, uint8_t* dataIn, uint8_t numBytes, bool waitForBusy, uint32_t timeout = 5000);
#if !defined(RADIOLIB_GODMODE) #if !defined(RADIOLIB_GODMODE)