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

Merge pull request #88 from Guglio95/master

Browse source 
[CC1101] Output power updated according to chosen frequency
This commit is contained in:
Jan Gromeš 2019-12-12 05:42:29 +01:00 • committed by GitHub
commit e61bd588b0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 6 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -315,7 +315,8 @@ int16_t CC1101::setFrequency(float freq) {
_freq = freq; _freq = freq;
} }
return(state); // Update the TX power accordingly to new freq. (PA values depend on chosen freq)
return setOutputPower(_power);
} }
int16_t CC1101::setBitRate(float br) { int16_t CC1101::setBitRate(float br) {
@ -389,6 +390,9 @@ int16_t CC1101::setFrequencyDeviation(float freqDev) {
} }
int16_t CC1101::setOutputPower(int8_t power) { int16_t CC1101::setOutputPower(int8_t power) {
// Store the value.
_power = power;
// round to the known frequency settings // round to the known frequency settings
uint8_t f; uint8_t f;
if(_freq < 374.0) { if(_freq < 374.0) {

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

@ -833,6 +833,7 @@ class CC1101: public PhysicalLayer {
bool _promiscuous; bool _promiscuous;
uint8_t _syncWordLength; uint8_t _syncWordLength;
int8_t _power;
int16_t config(); int16_t config();
int16_t directMode(); int16_t directMode();