From af34dd9691f0e4c0a7cbc587c26f36079ac66798 Mon Sep 17 00:00:00 2001 From: jgromes Date: Fri, 17 Jan 2025 22:30:37 +0100 Subject: [PATCH] [CC1101] Cppcheck fixes --- src/modules/CC1101/CC1101.cpp | 36 +++++++++++++++++------------------ src/modules/CC1101/CC1101.h | 4 ++-- 2 files changed, 20 insertions(+), 20 deletions(-) diff --git a/src/modules/CC1101/CC1101.cpp b/src/modules/CC1101/CC1101.cpp index b2bf595a..1c0222c1 100644 --- a/src/modules/CC1101/CC1101.cpp +++ b/src/modules/CC1101/CC1101.cpp @@ -436,23 +436,23 @@ int16_t CC1101::setRxBandwidth(float rxBw) { } int16_t CC1101::autoSetRxBandwidth() { - // Uncertainty ~ +/- 40ppm for a cheap CC1101 - // Uncertainty * 2 for both transmitter and receiver - float uncertainty = ((this->frequency) * 40 * 2); - uncertainty = (uncertainty/1000); //Since bitrate is in kBit - float minbw = ((this->bitRate) + uncertainty); - - int possibles[16] = {58, 68, 81, 102, 116, 135, 162, 203, 232, 270, 325, 406, 464, 541, 650, 812}; - - for (int i = 0; i < 16; i++) { - if (possibles[i] > minbw) { - int16_t state = setRxBandwidth(possibles[i]); - return(state); - } + // Uncertainty ~ +/- 40ppm for a cheap CC1101 + // Uncertainty * 2 for both transmitter and receiver + float uncertainty = ((this->frequency) * 40 * 2); + uncertainty = (uncertainty/1000); //Since bitrate is in kBit + float minbw = ((this->bitRate) + uncertainty); + + const int options[16] = { 58, 68, 81, 102, 116, 135, 162, 203, 232, 270, 325, 406, 464, 541, 650, 812 }; + + for(int i = 0; i < 16; i++) { + if(options[i] > minbw) { + return(setRxBandwidth(options[i])); } - return(RADIOLIB_ERR_UNKNOWN); } + return(RADIOLIB_ERR_UNKNOWN); +} + int16_t CC1101::setFrequencyDeviation(float freqDev) { // set frequency deviation to lowest available setting (required for digimodes) float newFreqDev = freqDev; @@ -519,7 +519,7 @@ int16_t CC1101::setOutputPower(int8_t pwr) { // PA_TABLE[0] is the power to be used when transmitting a 0 (no power) // PA_TABLE[1] is the power to be used when transmitting a 1 (full power) - uint8_t paValues[2] = {0x00, powerRaw}; + const uint8_t paValues[2] = { 0x00, powerRaw }; SPIwriteRegisterBurst(RADIOLIB_CC1101_REG_PATABLE, paValues, 2); return(RADIOLIB_ERR_NONE); @@ -598,7 +598,7 @@ int16_t CC1101::checkOutputPower(int8_t power, int8_t* clipped, uint8_t* raw) { return(RADIOLIB_ERR_INVALID_OUTPUT_POWER); } -int16_t CC1101::setSyncWord(uint8_t* syncWord, uint8_t len, uint8_t maxErrBits, bool requireCarrierSense) { +int16_t CC1101::setSyncWord(const uint8_t* syncWord, uint8_t len, uint8_t maxErrBits, bool requireCarrierSense) { if((maxErrBits > 1) || (len != 2)) { return(RADIOLIB_ERR_INVALID_SYNC_WORD); } @@ -1007,7 +1007,7 @@ int16_t CC1101::beginCommon(float freq, float br, float freqDev, float rxBw, int RADIOLIB_ASSERT(state); // set default sync word - uint8_t sw[RADIOLIB_CC1101_DEFAULT_SW_LEN] = RADIOLIB_CC1101_DEFAULT_SW; + const uint8_t sw[RADIOLIB_CC1101_DEFAULT_SW_LEN] = RADIOLIB_CC1101_DEFAULT_SW; state = setSyncWord(sw[0], sw[1], 0, false); RADIOLIB_ASSERT(state); @@ -1161,7 +1161,7 @@ void CC1101::SPIwriteRegister(uint8_t reg, uint8_t data) { return(this->mod->SPIwriteRegister(reg, data)); } -void CC1101::SPIwriteRegisterBurst(uint8_t reg, uint8_t* data, size_t len) { +void CC1101::SPIwriteRegisterBurst(uint8_t reg, const uint8_t* data, size_t len) { this->mod->SPIwriteRegisterBurst(reg | RADIOLIB_CC1101_CMD_BURST, data, len); } diff --git a/src/modules/CC1101/CC1101.h b/src/modules/CC1101/CC1101.h index a586d3da..576f8d73 100644 --- a/src/modules/CC1101/CC1101.h +++ b/src/modules/CC1101/CC1101.h @@ -839,7 +839,7 @@ class CC1101: public PhysicalLayer { \param requireCarrierSense Require carrier sense above threshold in addition to sync word. \returns \ref status_codes */ - int16_t setSyncWord(uint8_t* syncWord, uint8_t len, uint8_t maxErrBits = 0, bool requireCarrierSense = false); + int16_t setSyncWord(const uint8_t* syncWord, uint8_t len, uint8_t maxErrBits = 0, bool requireCarrierSense = false); /*! \brief Sets preamble length. @@ -1009,7 +1009,7 @@ class CC1101: public PhysicalLayer { int16_t SPIsetRegValue(uint8_t reg, uint8_t value, uint8_t msb = 7, uint8_t lsb = 0, uint8_t checkInterval = 2); void SPIreadRegisterBurst(uint8_t reg, uint8_t numBytes, uint8_t* inBytes); uint8_t SPIreadRegister(uint8_t reg); - void SPIwriteRegisterBurst(uint8_t reg, uint8_t* data, size_t len); + void SPIwriteRegisterBurst(uint8_t reg, const uint8_t* data, size_t len); void SPIwriteRegister(uint8_t reg, uint8_t data); void SPIsendCommand(uint8_t cmd);