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

[RF69] Fixed issues found by cppcheck

Browse source
This commit is contained in:
jgromes 2024-05-10 20:45:36 +01:00
parent 46e6f78731
commit 4d7c16bd44
4 changed files with 24 additions and 24 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/modules/RF69/RF69.cpp
View file

@ -566,9 +566,9 @@ int16_t RF69::setBitRate(float br) {
setMode(RADIOLIB_RF69_STANDBY); setMode(RADIOLIB_RF69_STANDBY);
// set bit rate // set bit rate
uint16_t bitRate = 32000 / br; uint16_t bitRateRaw = 32000 / br;
int16_t state = this->mod->SPIsetRegValue(RADIOLIB_RF69_REG_BITRATE_MSB, (bitRate & 0xFF00) >> 8, 7, 0); int16_t state = this->mod->SPIsetRegValue(RADIOLIB_RF69_REG_BITRATE_MSB, (bitRateRaw & 0xFF00) >> 8, 7, 0);
state |= this->mod->SPIsetRegValue(RADIOLIB_RF69_REG_BITRATE_LSB, bitRate & 0x00FF, 7, 0); state |= this->mod->SPIsetRegValue(RADIOLIB_RF69_REG_BITRATE_LSB, bitRateRaw & 0x00FF, 7, 0);
if(state == RADIOLIB_ERR_NONE) { if(state == RADIOLIB_ERR_NONE) {
this->bitRate = br; this->bitRate = br;
} }

32
src/modules/RF69/RF69.h
View file

@ -488,7 +488,7 @@ class RF69: public PhysicalLayer {
\brief Default constructor. \brief Default constructor.
\param module Instance of Module that will be used to communicate with the radio. \param module Instance of Module that will be used to communicate with the radio.
*/ */
RF69(Module* module); RF69(Module* module); // cppcheck-suppress noExplicitConstructor
// basic methods // basic methods
@ -538,7 +538,7 @@ class RF69: public PhysicalLayer {
\brief Sets the module to sleep mode. \brief Sets the module to sleep mode.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t sleep(); int16_t sleep() override;
/*! /*!
\brief Sets the module to standby mode. \brief Sets the module to standby mode.
@ -619,23 +619,23 @@ class RF69: public PhysicalLayer {
\brief Sets interrupt service routine to call when a packet is received. \brief Sets interrupt service routine to call when a packet is received.
\param func ISR to call. \param func ISR to call.
*/ */
void setPacketReceivedAction(void (*func)(void)); void setPacketReceivedAction(void (*func)(void)) override;
/*! /*!
\brief Clears interrupt service routine to call when a packet is received. \brief Clears interrupt service routine to call when a packet is received.
*/ */
void clearPacketReceivedAction(); void clearPacketReceivedAction() override;
/*! /*!
\brief Sets interrupt service routine to call when a packet is sent. \brief Sets interrupt service routine to call when a packet is sent.
\param func ISR to call. \param func ISR to call.
*/ */
void setPacketSentAction(void (*func)(void)); void setPacketSentAction(void (*func)(void)) override;
/*! /*!
\brief Clears interrupt service routine to call when a packet is sent. \brief Clears interrupt service routine to call when a packet is sent.
*/ */
void clearPacketSentAction(); void clearPacketSentAction() override;
/*! /*!
\brief Set interrupt service routine function to call when FIFO is empty. \brief Set interrupt service routine function to call when FIFO is empty.
@ -697,7 +697,7 @@ class RF69: public PhysicalLayer {
\brief Interrupt-driven receive method. GDO0 will be activated when full packet is received. \brief Interrupt-driven receive method. GDO0 will be activated when full packet is received.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t startReceive(); int16_t startReceive() override;
/*! /*!
\brief Interrupt-driven receive method, implemented for compatibility with PhysicalLayer. \brief Interrupt-driven receive method, implemented for compatibility with PhysicalLayer.
@ -707,7 +707,7 @@ class RF69: public PhysicalLayer {
\param len Ignored. \param len Ignored.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t startReceive(uint32_t timeout, uint32_t irqFlags, uint32_t irqMask, size_t len); int16_t startReceive(uint32_t timeout, uint32_t irqFlags, uint32_t irqMask, size_t len) override;
/*! /*!
\brief Reads data received after calling startReceive method. When the packet length is not known in advance, \brief Reads data received after calling startReceive method. When the packet length is not known in advance,
@ -727,7 +727,7 @@ class RF69: public PhysicalLayer {
\param freq Carrier frequency to be set in MHz. \param freq Carrier frequency to be set in MHz.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t setFrequency(float freq); int16_t setFrequency(float freq) override;
/*! /*!
\brief Gets carrier frequency. \brief Gets carrier frequency.
@ -741,7 +741,7 @@ class RF69: public PhysicalLayer {
\param br Bit rate to be set in kbps. \param br Bit rate to be set in kbps.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t setBitRate(float br); int16_t setBitRate(float br) override;
/*! /*!
\brief Sets receiver bandwidth. Allowed values are 2.6, 3.1, 3.9, 5.2, 6.3, 7.8, 10.4, 12.5, 15.6, \brief Sets receiver bandwidth. Allowed values are 2.6, 3.1, 3.9, 5.2, 6.3, 7.8, 10.4, 12.5, 15.6,
@ -944,7 +944,7 @@ class RF69: public PhysicalLayer {
\brief Gets RSSI (Recorded Signal Strength Indicator) of the last received packet. \brief Gets RSSI (Recorded Signal Strength Indicator) of the last received packet.
\returns Last packet RSSI in dBm. \returns Last packet RSSI in dBm.
*/ */
float getRSSI(); float getRSSI() override;
/*! /*!
\brief Sets the RSSI value above which the RSSI interrupt is signaled \brief Sets the RSSI value above which the RSSI interrupt is signaled
@ -963,7 +963,7 @@ class RF69: public PhysicalLayer {
\brief Get one truly random byte from RSSI noise. \brief Get one truly random byte from RSSI noise.
\returns TRNG byte. \returns TRNG byte.
*/ */
uint8_t randomByte(); uint8_t randomByte() override;
/*! /*!
\brief Read version SPI register. Should return RF69_CHIP_VERSION (0x24) if SX127x is connected and working. \brief Read version SPI register. Should return RF69_CHIP_VERSION (0x24) if SX127x is connected and working.
@ -976,13 +976,13 @@ class RF69: public PhysicalLayer {
\brief Set interrupt service routine function to call when data bit is received in direct mode. \brief Set interrupt service routine function to call when data bit is received in direct mode.
\param func Pointer to interrupt service routine. \param func Pointer to interrupt service routine.
*/ */
void setDirectAction(void (*func)(void)); void setDirectAction(void (*func)(void)) override;
/*! /*!
\brief Function to read and process data bit in direct reception mode. \brief Function to read and process data bit in direct reception mode.
\param pin Pin on which to read. \param pin Pin on which to read.
*/ */
void readBit(uint32_t pin); void readBit(uint32_t pin) override;
#endif #endif
/*! /*!
@ -991,12 +991,12 @@ class RF69: public PhysicalLayer {
\param value The value that indicates which function to place on that pin. See chip datasheet for details. \param value The value that indicates which function to place on that pin. See chip datasheet for details.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t setDIOMapping(uint32_t pin, uint32_t value); int16_t setDIOMapping(uint32_t pin, uint32_t value) override;
#if !RADIOLIB_GODMODE && !RADIOLIB_LOW_LEVEL #if !RADIOLIB_GODMODE && !RADIOLIB_LOW_LEVEL
protected: protected:
#endif #endif
Module* getMod(); Module* getMod() override;
#if !RADIOLIB_GODMODE #if !RADIOLIB_GODMODE
protected: protected:

4
src/modules/SX123x/SX1231.h
View file

@ -96,7 +96,7 @@ class SX1231: public RF69 {
\brief Default constructor. \brief Default constructor.
\param mod Instance of Module that will be used to communicate with the radio. \param mod Instance of Module that will be used to communicate with the radio.
*/ */
SX1231(Module* mod); SX1231(Module* mod); // cppcheck-suppress noExplicitConstructor
/*! /*!
\brief Initialization method. \brief Initialization method.
@ -111,7 +111,7 @@ class SX1231: public RF69 {
int16_t begin(float freq = 434.0, float br = 4.8, float freqDev = 5.0, float rxBw = 125.0, int8_t power = 10, uint8_t preambleLen = 16); int16_t begin(float freq = 434.0, float br = 4.8, float freqDev = 5.0, float rxBw = 125.0, int8_t power = 10, uint8_t preambleLen = 16);
#if !RADIOLIB_GODMODE #if !RADIOLIB_GODMODE
private: protected:
#endif #endif
uint8_t chipRevision = 0; uint8_t chipRevision = 0;
}; };

6
src/modules/SX123x/SX1233.h
View file

@ -26,7 +26,7 @@ class SX1233: public SX1231 {
\brief Default constructor. \brief Default constructor.
\param mod Instance of Module that will be used to communicate with the radio. \param mod Instance of Module that will be used to communicate with the radio.
*/ */
SX1233(Module* mod); SX1233(Module* mod); // cppcheck-suppress noExplicitConstructor
/*! /*!
\brief Initialization method. \brief Initialization method.
@ -48,12 +48,12 @@ class SX1233: public SX1231 {
\param br Bit rate to be set in kbps. \param br Bit rate to be set in kbps.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t setBitRate(float br); int16_t setBitRate(float br) override;
#if !RADIOLIB_GODMODE #if !RADIOLIB_GODMODE
private: private:
#endif #endif
uint8_t chipRevision = 0;
}; };
#endif #endif