From 8e134a7980876c80acf47e818e084093d2c49ffa Mon Sep 17 00:00:00 2001 From: jgromes Date: Sun, 14 Nov 2021 11:43:25 +0100 Subject: [PATCH] [RFM9x] Update to 5.0.0 --- src/modules/RFM9x/RFM95.cpp | 12 ++++++------ src/modules/RFM9x/RFM95.h | 6 +++--- src/modules/RFM9x/RFM96.cpp | 12 ++++++------ src/modules/RFM9x/RFM96.h | 6 +++--- src/modules/RFM9x/RFM97.cpp | 16 ++++++++-------- 5 files changed, 26 insertions(+), 26 deletions(-) diff --git a/src/modules/RFM9x/RFM95.cpp b/src/modules/RFM9x/RFM95.cpp index 69538731..2beb4b25 100644 --- a/src/modules/RFM9x/RFM95.cpp +++ b/src/modules/RFM9x/RFM95.cpp @@ -7,12 +7,12 @@ RFM95::RFM95(Module* mod) : SX1278(mod) { int16_t RFM95::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_t syncWord, int8_t power, uint16_t preambleLength, uint8_t gain) { // execute common part - int16_t state = SX127x::begin(RFM9X_CHIP_VERSION_OFFICIAL, syncWord, preambleLength); - if(state == ERR_CHIP_NOT_FOUND) { + int16_t state = SX127x::begin(RADIOLIB_RFM9X_CHIP_VERSION_OFFICIAL, syncWord, preambleLength); + if(state == RADIOLIB_ERR_CHIP_NOT_FOUND) { // SX127X_REG_VERSION might be set 0x12 - state = SX127x::begin(RFM9X_CHIP_VERSION_UNOFFICIAL, syncWord, preambleLength); + state = SX127x::begin(RADIOLIB_RFM9X_CHIP_VERSION_UNOFFICIAL, syncWord, preambleLength); RADIOLIB_ASSERT(state); - } else if(state != ERR_NONE) { + } else if(state != RADIOLIB_ERR_NONE) { // some other error return(state); } @@ -41,11 +41,11 @@ int16_t RFM95::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_t syncW } int16_t RFM95::setFrequency(float freq) { - RADIOLIB_CHECK_RANGE(freq, 862.0, 1020.0, ERR_INVALID_FREQUENCY); + RADIOLIB_CHECK_RANGE(freq, 862.0, 1020.0, RADIOLIB_ERR_INVALID_FREQUENCY); // set frequency and if successful, save the new setting int16_t state = SX127x::setFrequencyRaw(freq); - if(state == ERR_NONE) { + if(state == RADIOLIB_ERR_NONE) { SX127x::_freq = freq; } return(state); diff --git a/src/modules/RFM9x/RFM95.h b/src/modules/RFM9x/RFM95.h index d98ed2ce..6a6eb1c7 100644 --- a/src/modules/RFM9x/RFM95.h +++ b/src/modules/RFM9x/RFM95.h @@ -10,8 +10,8 @@ #include "../SX127x/SX1278.h" // SX127X_REG_VERSION -#define RFM9X_CHIP_VERSION_OFFICIAL 0x11 -#define RFM9X_CHIP_VERSION_UNOFFICIAL 0x12 // according to datasheet, only 0x11 should be possible, but some modules seem to have 0x12 +#define RADIOLIB_RFM9X_CHIP_VERSION_OFFICIAL 0x11 +#define RADIOLIB_RFM9X_CHIP_VERSION_UNOFFICIAL 0x12 // according to datasheet, only 0x11 should be possible, but some modules seem to have 0x12 /*! \class RFM95 @@ -55,7 +55,7 @@ class RFM95: public SX1278 { \returns \ref status_codes */ - int16_t begin(float freq = 915.0, float bw = 125.0, uint8_t sf = 9, uint8_t cr = 7, uint8_t syncWord = SX127X_SYNC_WORD, int8_t power = 10, uint16_t preambleLength = 8, uint8_t gain = 0); + int16_t begin(float freq = 915.0, float bw = 125.0, uint8_t sf = 9, uint8_t cr = 7, uint8_t syncWord = RADIOLIB_SX127X_SYNC_WORD, int8_t power = 10, uint16_t preambleLength = 8, uint8_t gain = 0); // configuration methods diff --git a/src/modules/RFM9x/RFM96.cpp b/src/modules/RFM9x/RFM96.cpp index ff937eb8..4e510a3a 100644 --- a/src/modules/RFM9x/RFM96.cpp +++ b/src/modules/RFM9x/RFM96.cpp @@ -7,12 +7,12 @@ RFM96::RFM96(Module* mod) : SX1278(mod) { int16_t RFM96::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_t syncWord, int8_t power, uint16_t preambleLength, uint8_t gain) { // execute common part - int16_t state = SX127x::begin(RFM9X_CHIP_VERSION_OFFICIAL, syncWord, preambleLength); - if(state == ERR_CHIP_NOT_FOUND) { + int16_t state = SX127x::begin(RADIOLIB_RFM9X_CHIP_VERSION_OFFICIAL, syncWord, preambleLength); + if(state == RADIOLIB_ERR_CHIP_NOT_FOUND) { // SX127X_REG_VERSION might be set 0x12 - state = SX127x::begin(RFM9X_CHIP_VERSION_UNOFFICIAL, syncWord, preambleLength); + state = SX127x::begin(RADIOLIB_RFM9X_CHIP_VERSION_UNOFFICIAL, syncWord, preambleLength); RADIOLIB_ASSERT(state); - } else if(state != ERR_NONE) { + } else if(state != RADIOLIB_ERR_NONE) { // some other error return(state); } @@ -42,11 +42,11 @@ int16_t RFM96::begin(float freq, float bw, uint8_t sf, uint8_t cr, uint8_t syncW } int16_t RFM96::setFrequency(float freq) { - RADIOLIB_CHECK_RANGE(freq, 410.0, 525.0, ERR_INVALID_FREQUENCY); + RADIOLIB_CHECK_RANGE(freq, 410.0, 525.0, RADIOLIB_ERR_INVALID_FREQUENCY); // set frequency and if successful, save the new setting int16_t state = SX127x::setFrequencyRaw(freq); - if(state == ERR_NONE) { + if(state == RADIOLIB_ERR_NONE) { SX127x::_freq = freq; } return(state); diff --git a/src/modules/RFM9x/RFM96.h b/src/modules/RFM9x/RFM96.h index 31a72cd6..85389d34 100644 --- a/src/modules/RFM9x/RFM96.h +++ b/src/modules/RFM9x/RFM96.h @@ -10,8 +10,8 @@ #include "../SX127x/SX1278.h" // SX127X_REG_VERSION -#define RFM9X_CHIP_VERSION_OFFICIAL 0x11 -#define RFM9X_CHIP_VERSION_UNOFFICIAL 0x12 // according to datasheet, only 0x11 should be possible, but some modules seem to have 0x12 +#define RADIOLIB_RFM9X_CHIP_VERSION_OFFICIAL 0x11 +#define RADIOLIB_RFM9X_CHIP_VERSION_UNOFFICIAL 0x12 // according to datasheet, only 0x11 should be possible, but some modules seem to have 0x12 /*! \class RFM96 @@ -55,7 +55,7 @@ class RFM96: public SX1278 { \returns \ref status_codes */ - int16_t begin(float freq = 434.0, float bw = 125.0, uint8_t sf = 9, uint8_t cr = 7, uint8_t syncWord = SX127X_SYNC_WORD, int8_t power = 10, uint16_t preambleLength = 8, uint8_t gain = 0); + int16_t begin(float freq = 434.0, float bw = 125.0, uint8_t sf = 9, uint8_t cr = 7, uint8_t syncWord = RADIOLIB_SX127X_SYNC_WORD, int8_t power = 10, uint16_t preambleLength = 8, uint8_t gain = 0); // configuration methods diff --git a/src/modules/RFM9x/RFM97.cpp b/src/modules/RFM9x/RFM97.cpp index ccf19134..e51e5a99 100644 --- a/src/modules/RFM9x/RFM97.cpp +++ b/src/modules/RFM9x/RFM97.cpp @@ -7,8 +7,8 @@ RFM97::RFM97(Module* mod) : RFM95(mod) { int16_t RFM97::setSpreadingFactor(uint8_t sf) { // check active modem - if(getActiveModem() != SX127X_LORA) { - return(ERR_WRONG_MODEM); + if(getActiveModem() != RADIOLIB_SX127X_LORA) { + return(RADIOLIB_ERR_WRONG_MODEM); } uint8_t newSpreadingFactor; @@ -16,24 +16,24 @@ int16_t RFM97::setSpreadingFactor(uint8_t sf) { // check allowed spreading factor values switch(sf) { case 6: - newSpreadingFactor = SX127X_SF_6; + newSpreadingFactor = RADIOLIB_SX127X_SF_6; break; case 7: - newSpreadingFactor = SX127X_SF_7; + newSpreadingFactor = RADIOLIB_SX127X_SF_7; break; case 8: - newSpreadingFactor = SX127X_SF_8; + newSpreadingFactor = RADIOLIB_SX127X_SF_8; break; case 9: - newSpreadingFactor = SX127X_SF_9; + newSpreadingFactor = RADIOLIB_SX127X_SF_9; break; default: - return(ERR_INVALID_SPREADING_FACTOR); + return(RADIOLIB_ERR_INVALID_SPREADING_FACTOR); } // set spreading factor and if successful, save the new setting int16_t state = SX1278::setSpreadingFactorRaw(newSpreadingFactor); - if(state == ERR_NONE) { + if(state == RADIOLIB_ERR_NONE) { SX127x::_sf = sf; } return(state);