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

[Mod] Fix issues from cppcheck scan

Browse source
This commit is contained in:
jgromes 2024-05-01 15:51:01 +01:00
parent cb9cb87556
commit 809025eba6
1 changed files with 16 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
src/Module.cpp
View file

@ -76,13 +76,18 @@ int16_t Module::SPIsetRegValue(uint32_t reg, uint8_t value, uint8_t msb, uint8_t
// check register value each millisecond until check interval is reached // check register value each millisecond until check interval is reached
// some registers need a bit of time to process the change (e.g. SX127X_REG_OP_MODE) // some registers need a bit of time to process the change (e.g. SX127X_REG_OP_MODE)
RadioLibTime_t start = this->hal->micros(); RadioLibTime_t start = this->hal->micros();
#if RADIOLIB_DEBUG_SPI
uint8_t readValue = 0x00; uint8_t readValue = 0x00;
#endif
while(this->hal->micros() - start < (checkInterval * 1000)) { while(this->hal->micros() - start < (checkInterval * 1000)) {
readValue = SPIreadRegister(reg); uint8_t val = SPIreadRegister(reg);
if((readValue & checkMask) == (newValue & checkMask)) { if((val & checkMask) == (newValue & checkMask)) {
// check passed, we can stop the loop // check passed, we can stop the loop
return(RADIOLIB_ERR_NONE); return(RADIOLIB_ERR_NONE);
} }
#if RADIOLIB_DEBUG_SPI
readValue = val;
#endif
} }
// check failed, print debug info // check failed, print debug info
@ -309,17 +314,15 @@ int16_t Module::SPIcheckStream() {
} }
int16_t Module::SPItransferStream(uint8_t* cmd, uint8_t cmdLen, bool write, uint8_t* dataOut, uint8_t* dataIn, size_t numBytes, bool waitForGpio, RadioLibTime_t timeout) { int16_t Module::SPItransferStream(uint8_t* cmd, uint8_t cmdLen, bool write, uint8_t* dataOut, uint8_t* dataIn, size_t numBytes, bool waitForGpio, RadioLibTime_t timeout) {
// prepare the buffers // prepare the output buffer
size_t buffLen = cmdLen + numBytes; size_t buffLen = cmdLen + numBytes;
if(!write) { if(!write) {
buffLen += (this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_STATUS] / 8); buffLen += (this->spiConfig.widths[RADIOLIB_MODULE_SPI_WIDTH_STATUS] / 8);
} }
#if RADIOLIB_STATIC_ONLY #if RADIOLIB_STATIC_ONLY
uint8_t buffOut[RADIOLIB_STATIC_ARRAY_SIZE]; uint8_t buffOut[RADIOLIB_STATIC_ARRAY_SIZE];
uint8_t buffIn[RADIOLIB_STATIC_ARRAY_SIZE];
#else #else
uint8_t* buffOut = new uint8_t[buffLen]; uint8_t* buffOut = new uint8_t[buffLen];
uint8_t* buffIn = new uint8_t[buffLen];
#endif #endif
uint8_t* buffOutPtr = buffOut; uint8_t* buffOutPtr = buffOut;
@ -346,13 +349,19 @@ int16_t Module::SPItransferStream(uint8_t* cmd, uint8_t cmdLen, bool write, uint
RADIOLIB_DEBUG_BASIC_PRINTLN("GPIO pre-transfer timeout, is it connected?"); RADIOLIB_DEBUG_BASIC_PRINTLN("GPIO pre-transfer timeout, is it connected?");
#if !RADIOLIB_STATIC_ONLY #if !RADIOLIB_STATIC_ONLY
delete[] buffOut; delete[] buffOut;
delete[] buffIn;
#endif #endif
return(RADIOLIB_ERR_SPI_CMD_TIMEOUT); return(RADIOLIB_ERR_SPI_CMD_TIMEOUT);
} }
} }
} }
// prepare the input buffer
#if RADIOLIB_STATIC_ONLY
uint8_t buffIn[RADIOLIB_STATIC_ARRAY_SIZE];
#else
uint8_t* buffIn = new uint8_t[buffLen];
#endif
// do the transfer // do the transfer
this->hal->spiBeginTransaction(); this->hal->spiBeginTransaction();
this->hal->digitalWrite(this->csPin, this->hal->GpioLevelLow); this->hal->digitalWrite(this->csPin, this->hal->GpioLevelLow);
@ -539,7 +548,7 @@ size_t Module::serialPrintf(const char* format, ...) {
vsnprintf(buffer, len + 1, format, arg); vsnprintf(buffer, len + 1, format, arg);
va_end(arg); va_end(arg);
} }
len = RADIOLIB_DEBUG_PORT.write((const uint8_t*)buffer, len); len = RADIOLIB_DEBUG_PORT.write(reinterpret_cast<const uint8_t*>(buffer), len);
if (buffer != temp) { if (buffer != temp) {
delete[] buffer; delete[] buffer;
} }