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

Merge pull request #1 from FiorixF1/master

Browse source 
Fixed compiling issues
This commit is contained in:
Federico Maggi 2020-12-04 15:44:32 +01:00 • committed by GitHub
commit 8ce8080577
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 4 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -641,7 +641,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 {
@ -660,7 +659,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) {
@ -750,6 +748,8 @@ int16_t CC1101::setPromiscuousMode(bool promiscuous) {
state = setCrcFiltering(true); state = setCrcFiltering(true);
} }
_promiscuous = promiscuous;
return(state); return(state);
} }

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

@ -881,6 +881,7 @@ class CC1101: public PhysicalLayer {
Module* _mod; Module* _mod;
float _freq = 0; float _freq = 0;
float _br = 0;
uint8_t _rawRSSI = 0; uint8_t _rawRSSI = 0;
uint8_t _rawLQI = 0; uint8_t _rawLQI = 0;
uint8_t _modulation = CC1101_MOD_FORMAT_2_FSK; uint8_t _modulation = CC1101_MOD_FORMAT_2_FSK;

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

@ -369,20 +369,14 @@ int16_t RF69::readData(uint8_t* data, size_t len) {
return(ERR_NONE); return(ERR_NONE);
} }
int16_t CC1101::setOOK(bool enableOOK) { int16_t RF69::setOOK(bool enableOOK) {
// Change modulation // Change modulation
if(enableOOK) { if(enableOOK) {
int16_t state = SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_OOK, 4, 3); int16_t state = SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_OOK, 4, 3);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// update current modulation
_modulation = CC1101_MOD_FORMAT_ASK_OOK;
} else { } else {
int16_t state = SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_FSK, 4, 3); int16_t state = SPIsetRegValue(RF69_REG_DATA_MODUL, RF69_FSK, 4, 3);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// update current modulation
_modulation = CC1101_MOD_FORMAT_2_FSK;
} }
return(setOutputPower(_power)); return(setOutputPower(_power));