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

[CC1101] Fixed shadowed variable name

Browse source
This commit is contained in:
jgromes 2023-04-23 19:40:56 +02:00
parent bba644377a
commit c62bb74f9d
2 changed files with 5 additions and 5 deletions
src/modules/CC1101
CC1101.cppCC1101.h

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

@ -498,7 +498,7 @@ int16_t CC1101::setFrequency(float freq) {
state |= SPIsetRegValue(RADIOLIB_CC1101_REG_FREQ0, FRF & 0x0000FF, 7, 0); state |= SPIsetRegValue(RADIOLIB_CC1101_REG_FREQ0, FRF & 0x0000FF, 7, 0);
if(state == RADIOLIB_ERR_NONE) { if(state == RADIOLIB_ERR_NONE) {
this->freq = freq; this->frequency = freq;
} }
// Update the TX power accordingly to new freq. (PA values depend on chosen freq) // Update the TX power accordingly to new freq. (PA values depend on chosen freq)
@ -601,13 +601,13 @@ int16_t CC1101::getFrequencyDeviation(float *freqDev) {
int16_t CC1101::setOutputPower(int8_t power) { int16_t CC1101::setOutputPower(int8_t power) {
// round to the known frequency settings // round to the known frequency settings
uint8_t f; uint8_t f;
if(this->freq < 374.0) { if(this->frequency < 374.0) {
// 315 MHz // 315 MHz
f = 0; f = 0;
} else if(this->freq < 650.5) { } else if(this->frequency < 650.5) {
// 434 MHz // 434 MHz
f = 1; f = 1;
} else if(this->freq < 891.5) { } else if(this->frequency < 891.5) {
// 868 MHz // 868 MHz
f = 2; f = 2;
} else { } else {

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

@ -940,7 +940,7 @@ class CC1101: public PhysicalLayer {
protected: protected:
#endif #endif
float freq = RADIOLIB_CC1101_DEFAULT_FREQ; float frequency = RADIOLIB_CC1101_DEFAULT_FREQ;
float bitRate = RADIOLIB_CC1101_DEFAULT_BR; float bitRate = RADIOLIB_CC1101_DEFAULT_BR;
uint8_t rawRSSI = 0; uint8_t rawRSSI = 0;
uint8_t rawLQI = 0; uint8_t rawLQI = 0;