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

SX127x - fixed setFrequency function

Browse source
This commit is contained in:
Jan Gromeš 2018-07-04 14:26:58 +02:00
parent 4b5159afb4
commit cdecf9ec7e
6 changed files with 19 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
src/modules/SX1272.cpp
View file

@ -37,6 +37,14 @@ uint8_t SX1272::setCodingRate(uint8_t cr) {
return(state);
}
uint8_t SX1272::setFrequency(float freq) {
uint8_t state = SX1272::config(_bw, _sf, _cr, freq, _syncWord);
if(state == ERR_NONE) {
_freq = freq;
}
return(state);
}
uint8_t SX1272::config(float freq, uint32_t bw, uint8_t sf, uint8_t cr, uint8_t syncWord) {
uint8_t status = ERR_NONE;
uint8_t newBandwidth, newSpreadingFactor, newCodingRate;

1
src/modules/SX1272.h
View file

@ -52,6 +52,7 @@ class SX1272: public SX127x {
uint8_t setBandwidth(uint32_t bw);
uint8_t setSpreadingFactor(uint8_t sf);
uint8_t setCodingRate(uint8_t cr);
uint8_t setFrequency(float freq);
protected:
uint8_t configCommon(uint8_t bw, uint8_t sf, uint8_t cr, float freq, uint8_t syncWord); // common for SX1272/73

8
src/modules/SX1278.cpp
View file

@ -37,6 +37,14 @@ uint8_t SX1278::setCodingRate(uint8_t cr) {
return(state);
}
uint8_t SX1278::setFrequency(float freq) {
uint8_t state = SX1278::config(_bw, _sf, _cr, freq, _syncWord);
if(state == ERR_NONE) {
_freq = freq;
}
return(state);
}
uint8_t SX1278::config(float freq, uint32_t bw, uint8_t sf, uint8_t cr, uint8_t syncWord) {
uint8_t status = ERR_NONE;
uint8_t newBandwidth, newSpreadingFactor, newCodingRate;

1
src/modules/SX1278.h
View file

@ -69,6 +69,7 @@ class SX1278: public SX127x {
uint8_t setBandwidth(uint32_t bw);
uint8_t setSpreadingFactor(uint8_t sf);
uint8_t setCodingRate(uint8_t cr);
uint8_t setFrequency(float freq);
protected:
uint8_t configCommon(uint8_t bw, uint8_t sf, uint8_t cr, float freq, uint8_t syncWord); // common for SX1276/77/78/79

10
src/modules/SX127x.cpp
View file

@ -232,16 +232,8 @@ uint8_t SX127x::standby() {
return(setMode(SX127X_STANDBY));
}
uint8_t SX127x::setFrequency(float freq) {
uint8_t state = config(_bw, _sf, _cr, freq, _syncWord);
if(state == ERR_NONE) {
_freq = freq;
}
return(state);
}
uint8_t SX127x::setSyncWord(uint8_t syncWord) {
uint8_t state = config(_bw, _sf, _cr, _freq, syncWord);
uint8_t state = SX127x::config(_bw, _sf, _cr, _freq, syncWord);
if(state == ERR_NONE) {
_syncWord = syncWord;
}

1
src/modules/SX127x.h
View file

@ -181,7 +181,6 @@ class SX127x {
uint8_t sleep();
uint8_t standby();
uint8_t setFrequency(float freq);
uint8_t setSyncWord(uint8_t syncWord);
uint8_t setOutputPower(int8_t power);