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

[SX127x] Fixed top-level configFSK not being called

Browse source
This commit is contained in:
jgromes 2021-02-13 16:21:00 +01:00
parent 85ba05c1f8
commit 09a73591ba
3 changed files with 8 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/modules/SX127x/SX1272.cpp
View file

@ -42,6 +42,10 @@ int16_t SX1272::beginFSK(float freq, float br, float rxBw, float freqDev, int8_t
int16_t state = SX127x::beginFSK(SX1272_CHIP_VERSION, br, rxBw, freqDev, preambleLength, enableOOK); int16_t state = SX127x::beginFSK(SX1272_CHIP_VERSION, br, rxBw, freqDev, preambleLength, enableOOK);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// configure settings not accessible by API
state = configFSK();
RADIOLIB_ASSERT(state);
// configure publicly accessible settings // configure publicly accessible settings
state = setFrequency(freq); state = setFrequency(freq);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
@ -436,11 +440,6 @@ int16_t SX1272::configFSK() {
// set fast PLL hop // set fast PLL hop
state = _mod->SPIsetRegValue(SX1272_REG_PLL_HOP, SX127X_FAST_HOP_ON, 7, 7); state = _mod->SPIsetRegValue(SX1272_REG_PLL_HOP, SX127X_FAST_HOP_ON, 7, 7);
RADIOLIB_ASSERT(state);
// set Gauss filter BT product to 0.5
state = _mod->SPIsetRegValue(SX127X_REG_OP_MODE, SX1272_FSK_GAUSSIAN_0_5, 4, 3);
return(state); return(state);
} }

9
src/modules/SX127x/SX1278.cpp
View file

@ -37,6 +37,10 @@ int16_t SX1278::beginFSK(float freq, float br, float freqDev, float rxBw, int8_t
int16_t state = SX127x::beginFSK(SX1278_CHIP_VERSION, br, freqDev, rxBw, preambleLength, enableOOK); int16_t state = SX127x::beginFSK(SX1278_CHIP_VERSION, br, freqDev, rxBw, preambleLength, enableOOK);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// configure settings not accessible by API
state = configFSK();
RADIOLIB_ASSERT(state);
// configure publicly accessible settings // configure publicly accessible settings
state = setFrequency(freq); state = setFrequency(freq);
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
@ -513,11 +517,6 @@ int16_t SX1278::configFSK() {
// set fast PLL hop // set fast PLL hop
state = _mod->SPIsetRegValue(SX1278_REG_PLL_HOP, SX127X_FAST_HOP_ON, 7, 7); state = _mod->SPIsetRegValue(SX1278_REG_PLL_HOP, SX127X_FAST_HOP_ON, 7, 7);
RADIOLIB_ASSERT(state);
// set Gauss filter BT product to 0.5
state = _mod->SPIsetRegValue(SX127X_REG_PA_RAMP, SX1278_FSK_GAUSSIAN_0_5, 6, 5);
return(state); return(state);
} }

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

@ -69,10 +69,6 @@ int16_t SX127x::beginFSK(uint8_t chipVersion, float br, float freqDev, float rxB
int16_t state = standby(); int16_t state = standby();
RADIOLIB_ASSERT(state); RADIOLIB_ASSERT(state);
// configure settings not accessible by API
state = configFSK();
RADIOLIB_ASSERT(state);
// check currently active modem // check currently active modem
if(getActiveModem() != SX127X_FSK_OOK) { if(getActiveModem() != SX127X_FSK_OOK) {
// set FSK mode // set FSK mode