Merge branch 'master' of github.com:rfquack/RadioLib
* 'master' of github.com:rfquack/RadioLib: [RF69] Fixed setOOK() [CC1101] Fix in promiscuous mode Fixed compiling issues
This commit is contained in:
commit
54006662f1
1 changed files with 2 additions and 2 deletions
|
@ -677,7 +677,6 @@ int16_t CC1101::setOOK(bool enableOOK) {
|
||||||
state = SPIsetRegValue(CC1101_REG_FREND0, 1, 2, 0);
|
state = SPIsetRegValue(CC1101_REG_FREND0, 1, 2, 0);
|
||||||
RADIOLIB_ASSERT(state);
|
RADIOLIB_ASSERT(state);
|
||||||
|
|
||||||
|
|
||||||
// update current modulation
|
// update current modulation
|
||||||
_modulation = CC1101_MOD_FORMAT_ASK_OOK;
|
_modulation = CC1101_MOD_FORMAT_ASK_OOK;
|
||||||
} else {
|
} else {
|
||||||
|
@ -696,7 +695,6 @@ int16_t CC1101::setOOK(bool enableOOK) {
|
||||||
return(setOutputPower(_power));
|
return(setOutputPower(_power));
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
float CC1101::getRSSI() const {
|
float CC1101::getRSSI() const {
|
||||||
float rssi;
|
float rssi;
|
||||||
if(_rawRSSI >= 128) {
|
if(_rawRSSI >= 128) {
|
||||||
|
@ -783,6 +781,8 @@ int16_t CC1101::setPromiscuousMode(bool promiscuous) {
|
||||||
state = setCrcFiltering(true);
|
state = setCrcFiltering(true);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
_promiscuous = promiscuous;
|
||||||
|
|
||||||
return(state);
|
return(state);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue