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

[CC1101] Fixes from cppcheck scan

Browse source
This commit is contained in:
jgromes 2020-07-04 14:10:09 +02:00
parent 7e62dbd1d8
commit e3fb895969
2 changed files with 26 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/modules/CC1101/CC1101.cpp
View file

@ -3,11 +3,6 @@
CC1101::CC1101(Module* module) : PhysicalLayer(CC1101_FREQUENCY_STEP_SIZE, CC1101_MAX_PACKET_LENGTH) { CC1101::CC1101(Module* module) : PhysicalLayer(CC1101_FREQUENCY_STEP_SIZE, CC1101_MAX_PACKET_LENGTH) {
_mod = module; _mod = module;
_packetLengthQueried = false;
_packetLengthConfig = CC1101_LENGTH_CONFIG_VARIABLE;
_modulation = CC1101_MOD_FORMAT_2_FSK;
_syncWordLength = 2;
} }
int16_t CC1101::begin(float freq, float br, float freqDev, float rxBw, int8_t power, uint8_t preambleLength) { int16_t CC1101::begin(float freq, float br, float freqDev, float rxBw, int8_t power, uint8_t preambleLength) {
@ -598,7 +593,7 @@ int16_t CC1101::setOOK(bool enableOOK) {
} }
float CC1101::getRSSI() { float CC1101::getRSSI() const {
float rssi; float rssi;
if(_rawRSSI >= 128) { if(_rawRSSI >= 128) {
rssi = (((float)_rawRSSI - 256.0)/2.0) - 74.0; rssi = (((float)_rawRSSI - 256.0)/2.0) - 74.0;
@ -608,7 +603,7 @@ float CC1101::getRSSI() {
return(rssi); return(rssi);
} }
uint8_t CC1101::getLQI() { uint8_t CC1101::getLQI() const {
return(_rawLQI); return(_rawLQI);
} }

48
src/modules/CC1101/CC1101.h
View file

@ -549,7 +549,7 @@ class CC1101: public PhysicalLayer {
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t transmit(uint8_t* data, size_t len, uint8_t addr = 0); int16_t transmit(uint8_t* data, size_t len, uint8_t addr = 0) override;
/*! /*!
\brief Blocking binary receive method. \brief Blocking binary receive method.
@ -561,14 +561,14 @@ class CC1101: public PhysicalLayer {
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t receive(uint8_t* data, size_t len); int16_t receive(uint8_t* data, size_t len) override;
/*! /*!
\brief Sets the module to standby mode. \brief Sets the module to standby mode.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t standby(); int16_t standby() override;
/*! /*!
\brief Starts direct mode transmission. \brief Starts direct mode transmission.
@ -577,14 +577,14 @@ class CC1101: public PhysicalLayer {
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t transmitDirect(uint32_t frf = 0); int16_t transmitDirect(uint32_t frf = 0) override;
/*! /*!
\brief Starts direct mode reception. \brief Starts direct mode reception.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t receiveDirect(); int16_t receiveDirect() override;
/*! /*!
\brief Stops direct mode. It is required to call this method to switch from direct transmissions to packet-based transmissions. \brief Stops direct mode. It is required to call this method to switch from direct transmissions to packet-based transmissions.
@ -633,7 +633,7 @@ class CC1101: public PhysicalLayer {
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t startTransmit(uint8_t* data, size_t len, uint8_t addr = 0); int16_t startTransmit(uint8_t* data, size_t len, uint8_t addr = 0) override;
/*! /*!
\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.
@ -651,7 +651,7 @@ class CC1101: public PhysicalLayer {
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t readData(uint8_t* data, size_t len); int16_t readData(uint8_t* data, size_t len) override;
// configuration methods // configuration methods
@ -689,7 +689,7 @@ class CC1101: public PhysicalLayer {
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t setFrequencyDeviation(float freqDev); int16_t setFrequencyDeviation(float freqDev) override;
/*! /*!
\brief Sets output power. Allowed values are -30, -20, -15, -10, 0, 5, 7 or 10 dBm. \brief Sets output power. Allowed values are -30, -20, -15, -10, 0, 5, 7 or 10 dBm.
@ -771,14 +771,14 @@ class CC1101: public PhysicalLayer {
\returns Last packet RSSI in dBm. \returns Last packet RSSI in dBm.
*/ */
float getRSSI(); float getRSSI() const;
/*! /*!
\brief Gets LQI (Link Quality Indicator) of the last received packet. \brief Gets LQI (Link Quality Indicator) of the last received packet.
\returns Last packet LQI (lower is better). \returns Last packet LQI (lower is better).
*/ */
uint8_t getLQI(); uint8_t getLQI() const;
/*! /*!
\brief Query modem for the packet length of received payload. \brief Query modem for the packet length of received payload.
@ -787,7 +787,7 @@ class CC1101: public PhysicalLayer {
\returns Length of last received packet in bytes. \returns Length of last received packet in bytes.
*/ */
size_t getPacketLength(bool update = true); size_t getPacketLength(bool update = true) override;
/*! /*!
\brief Set modem in fixed packet length mode. \brief Set modem in fixed packet length mode.
@ -853,7 +853,7 @@ class CC1101: public PhysicalLayer {
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t setDataShaping(float sh); int16_t setDataShaping(float sh) override;
/*! /*!
\brief Sets transmission encoding. \brief Sets transmission encoding.
@ -862,7 +862,7 @@ class CC1101: public PhysicalLayer {
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t setEncoding(uint8_t encoding); int16_t setEncoding(uint8_t encoding) override;
/*! /*!
\brief Some modules contain external RF switch controlled by two pins. This function gives RadioLib control over those two pins to automatically switch Rx and Tx state. \brief Some modules contain external RF switch controlled by two pins. This function gives RadioLib control over those two pins to automatically switch Rx and Tx state.
@ -879,24 +879,24 @@ class CC1101: public PhysicalLayer {
#endif #endif
Module* _mod; Module* _mod;
float _freq; float _freq = 0;
uint8_t _rawRSSI; uint8_t _rawRSSI = 0;
uint8_t _rawLQI; uint8_t _rawLQI = 0;
uint8_t _modulation; uint8_t _modulation = CC1101_MOD_FORMAT_2_FSK;
size_t _packetLength; size_t _packetLength = 0;
bool _packetLengthQueried; bool _packetLengthQueried = false;
uint8_t _packetLengthConfig; uint8_t _packetLengthConfig = CC1101_LENGTH_CONFIG_VARIABLE;
bool _promiscuous; bool _promiscuous = false;
bool _crcOn = true; bool _crcOn = true;
uint8_t _syncWordLength; uint8_t _syncWordLength = 2;
int8_t _power; int8_t _power = 0;
int16_t config(); int16_t config();
int16_t directMode(); int16_t directMode();
void getExpMant(float target, uint16_t mantOffset, uint8_t divExp, uint8_t expMax, uint8_t& exp, uint8_t& mant); static void getExpMant(float target, uint16_t mantOffset, uint8_t divExp, uint8_t expMax, uint8_t& exp, uint8_t& mant);
int16_t setPacketMode(uint8_t mode, uint8_t len); int16_t setPacketMode(uint8_t mode, uint8_t len);
// SPI read overrides to set bit for burst write and status registers access // SPI read overrides to set bit for burst write and status registers access