diff --git a/src/modules/CC1101/CC1101.cpp b/src/modules/CC1101/CC1101.cpp index 46e10452..ba93bdc5 100644 --- a/src/modules/CC1101/CC1101.cpp +++ b/src/modules/CC1101/CC1101.cpp @@ -641,7 +641,6 @@ int16_t CC1101::setOOK(bool enableOOK) { state = SPIsetRegValue(CC1101_REG_FREND0, 1, 2, 0); RADIOLIB_ASSERT(state); - // update current modulation _modulation = CC1101_MOD_FORMAT_ASK_OOK; } else { @@ -660,7 +659,6 @@ int16_t CC1101::setOOK(bool enableOOK) { return(setOutputPower(_power)); } - float CC1101::getRSSI() const { float rssi; if(_rawRSSI >= 128) { @@ -750,6 +748,8 @@ int16_t CC1101::setPromiscuousMode(bool promiscuous) { state = setCrcFiltering(true); } + _promiscuous = promiscuous; + return(state); } diff --git a/src/modules/CC1101/CC1101.h b/src/modules/CC1101/CC1101.h index 5f9e3e2d..af5899bc 100644 --- a/src/modules/CC1101/CC1101.h +++ b/src/modules/CC1101/CC1101.h @@ -881,6 +881,7 @@ class CC1101: public PhysicalLayer { Module* _mod; float _freq = 0; + float _br = 0; uint8_t _rawRSSI = 0; uint8_t _rawLQI = 0; uint8_t _modulation = CC1101_MOD_FORMAT_2_FSK; diff --git a/src/modules/RF69/RF69.cpp b/src/modules/RF69/RF69.cpp index 24002914..2e7f755e 100644 --- a/src/modules/RF69/RF69.cpp +++ b/src/modules/RF69/RF69.cpp @@ -369,20 +369,14 @@ int16_t RF69::readData(uint8_t* data, size_t len) { return(ERR_NONE); } -int16_t CC1101::setOOK(bool enableOOK) { +int16_t RF69::setOOK(bool enableOOK) { // Change modulation if(enableOOK) { int16_t state = SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_OOK, 4, 3); RADIOLIB_ASSERT(state); - - // update current modulation - _modulation = CC1101_MOD_FORMAT_ASK_OOK; } else { int16_t state = SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_FSK, 4, 3); RADIOLIB_ASSERT(state); - - // update current modulation - _modulation = CC1101_MOD_FORMAT_2_FSK; } return(setOutputPower(_power));