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

[nRF24] Fixed variable shadowing

Browse source
This commit is contained in:
jgromes 2023-04-23 22:02:33 +02:00
parent 674c37d00b
commit c5a3c4d361
2 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
src/modules/nRF24/nRF24.cpp
View file

@ -304,14 +304,14 @@ int16_t nRF24::setBitRate(float br) {
return(state); return(state);
} }
int16_t nRF24::setOutputPower(int8_t power) { int16_t nRF24::setOutputPower(int8_t pwr) {
// set mode to standby // set mode to standby
int16_t state = standby(); int16_t state = standby();
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// check allowed values // check allowed values
uint8_t powerRaw = 0; uint8_t powerRaw = 0;
switch(power) { switch(pwr) {
case -18: case -18:
powerRaw = RADIOLIB_NRF24_RF_PWR_18_DBM; powerRaw = RADIOLIB_NRF24_RF_PWR_18_DBM;
break; break;
@ -332,10 +332,9 @@ int16_t nRF24::setOutputPower(int8_t power) {
state = this->mod->SPIsetRegValue(RADIOLIB_NRF24_REG_RF_SETUP, powerRaw, 2, 1); state = this->mod->SPIsetRegValue(RADIOLIB_NRF24_REG_RF_SETUP, powerRaw, 2, 1);
if(state == RADIOLIB_ERR_NONE) { if(state == RADIOLIB_ERR_NONE) {
this->power = power; this->power = pwr;
} }
return(state); return(state);
} }

4
src/modules/nRF24/nRF24.h
View file

@ -330,10 +330,10 @@ class nRF24: public PhysicalLayer {
/*! /*!
\brief Sets output power. Allowed values are -18, -12, -6 or 0 dBm. \brief Sets output power. Allowed values are -18, -12, -6 or 0 dBm.
\param power Output power to be set in dBm. \param pwr Output power to be set in dBm.
\returns \ref status_codes \returns \ref status_codes
*/ */
int16_t setOutputPower(int8_t power); int16_t setOutputPower(int8_t pwr);
/*! /*!
\brief Sets address width of transmit and receive pipes in bytes. Allowed values are 3, 4 or 5 bytes. \brief Sets address width of transmit and receive pipes in bytes. Allowed values are 3, 4 or 5 bytes.