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

Merge pull request #627 from rfquack/master

Browse source 
[RF69/CC1101] Fixed corner case in `setPromiscuousMode(false)`
This commit is contained in:
Jan Gromeš 2022-12-01 18:22:37 +01:00 • committed by GitHub
commit e054172f7a
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 20 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -824,14 +824,21 @@ int16_t CC1101::setPromiscuousMode(bool promiscuous) {
} }
if (promiscuous == true) { if (promiscuous == true) {
// disable preamble and sync word filtering and insertion // disable preamble detection and generation
state = setPreambleLength(0);
RADIOLIB_ASSERT(state);
// disable sync word filtering and insertion
state = disableSyncWordFiltering(); state = disableSyncWordFiltering();
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// disable CRC filtering // disable CRC filtering
state = setCrcFiltering(false); state = setCrcFiltering(false);
} else { } else {
// enable preamble and sync word filtering and insertion state = setPreambleLength(RADIOLIB_CC1101_DEFAULT_PREAMBLELEN);
RADIOLIB_ASSERT(state);
// enable sync word filtering and insertion
state = enableSyncWordFiltering(); state = enableSyncWordFiltering();
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);

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

@ -801,15 +801,8 @@ int16_t RF69::enableSyncWordFiltering(uint8_t maxErrBits) {
} }
int16_t RF69::disableSyncWordFiltering() { int16_t RF69::disableSyncWordFiltering() {
// disable preamble detection and generation
int16_t state = _mod->SPIsetRegValue(RADIOLIB_RF69_REG_PREAMBLE_LSB, 0, 7, 0);
state |= _mod->SPIsetRegValue(RADIOLIB_RF69_REG_PREAMBLE_MSB, 0, 7, 0);
RADIOLIB_ASSERT(state);
// disable sync word detection and generation // disable sync word detection and generation
state = _mod->SPIsetRegValue(RADIOLIB_RF69_REG_SYNC_CONFIG, RADIOLIB_RF69_SYNC_OFF | RADIOLIB_RF69_FIFO_FILL_CONDITION, 7, 6); return(_mod->SPIsetRegValue(RADIOLIB_RF69_REG_SYNC_CONFIG, RADIOLIB_RF69_SYNC_OFF | RADIOLIB_RF69_FIFO_FILL_CONDITION, 7, 6));
return(state);
} }
int16_t RF69::enableContinuousModeBitSync() { int16_t RF69::enableContinuousModeBitSync() {
@ -846,14 +839,22 @@ int16_t RF69::setPromiscuousMode(bool promiscuous) {
} }
if (promiscuous == true) { if (promiscuous == true) {
// disable preamble and sync word filtering and insertion // disable preamble detection and generation
state = setPreambleLength(0);
RADIOLIB_ASSERT(state);
// disable sync word filtering and insertion
state = disableSyncWordFiltering(); state = disableSyncWordFiltering();
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// disable CRC filtering // disable CRC filtering
state = setCrcFiltering(false); state = setCrcFiltering(false);
} else { } else {
// enable preamble and sync word filtering and insertion // enable preamble detection and generation
state = setPreambleLength(RADIOLIB_RF69_DEFAULT_PREAMBLELEN);
RADIOLIB_ASSERT(state);
// enable sync word filtering and insertion
state = enableSyncWordFiltering(); state = enableSyncWordFiltering();
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);