diff --git a/src/modules/LLCC68/LLCC68.cpp b/src/modules/LLCC68/LLCC68.cpp index 18ce03dd..12de7a52 100644 --- a/src/modules/LLCC68/LLCC68.cpp +++ b/src/modules/LLCC68/LLCC68.cpp @@ -118,13 +118,13 @@ int16_t LLCC68::checkDataRate(DataRate_t dr) { int16_t LLCC68::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginFSK()); } break; - case(ModemType_t::LRFHSS): { + case(ModemType_t::RADIOLIB_MODEM_LRFHSS): { return(this->beginLRFHSS()); } break; default: diff --git a/src/modules/LR11x0/LR1110.cpp b/src/modules/LR11x0/LR1110.cpp index 26cbe2a7..1fbc696b 100644 --- a/src/modules/LR11x0/LR1110.cpp +++ b/src/modules/LR11x0/LR1110.cpp @@ -113,13 +113,13 @@ int16_t LR1110::checkOutputPower(int8_t power, int8_t* clipped, bool forceHighPo int16_t LR1110::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginGFSK()); } break; - case(ModemType_t::LRFHSS): { + case(ModemType_t::RADIOLIB_MODEM_LRFHSS): { return(this->beginLRFHSS()); } break; } diff --git a/src/modules/LR11x0/LR1120.cpp b/src/modules/LR11x0/LR1120.cpp index 61294b7f..fb627822 100644 --- a/src/modules/LR11x0/LR1120.cpp +++ b/src/modules/LR11x0/LR1120.cpp @@ -133,13 +133,13 @@ int16_t LR1120::checkOutputPower(int8_t power, int8_t* clipped, bool forceHighPo int16_t LR1120::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginGFSK()); } break; - case(ModemType_t::LRFHSS): { + case(ModemType_t::RADIOLIB_MODEM_LRFHSS): { return(this->beginLRFHSS()); } break; } diff --git a/src/modules/LR11x0/LR11x0.cpp b/src/modules/LR11x0/LR11x0.cpp index cedf5b5b..6891cd59 100644 --- a/src/modules/LR11x0/LR11x0.cpp +++ b/src/modules/LR11x0/LR11x0.cpp @@ -2038,13 +2038,13 @@ int16_t LR11x0::getModem(ModemType_t* modem) { switch(packetType) { case(RADIOLIB_LR11X0_PACKET_TYPE_LORA): - *modem = ModemType_t::LoRa; + *modem = ModemType_t::RADIOLIB_MODEM_LORA; return(RADIOLIB_ERR_NONE); case(RADIOLIB_LR11X0_PACKET_TYPE_GFSK): - *modem = ModemType_t::FSK; + *modem = ModemType_t::RADIOLIB_MODEM_FSK; return(RADIOLIB_ERR_NONE); case(RADIOLIB_LR11X0_PACKET_TYPE_LR_FHSS): - *modem = ModemType_t::LRFHSS; + *modem = ModemType_t::RADIOLIB_MODEM_LRFHSS; return(RADIOLIB_ERR_NONE); } diff --git a/src/modules/SX126x/SX1262.cpp b/src/modules/SX126x/SX1262.cpp index 85253ab8..426c2d05 100644 --- a/src/modules/SX126x/SX1262.cpp +++ b/src/modules/SX126x/SX1262.cpp @@ -116,13 +116,13 @@ int16_t SX1262::checkOutputPower(int8_t power, int8_t* clipped) { int16_t SX1262::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginFSK()); } break; - case(ModemType_t::LRFHSS): { + case(ModemType_t::RADIOLIB_MODEM_LRFHSS): { return(this->beginLRFHSS()); } break; default: diff --git a/src/modules/SX126x/SX1268.cpp b/src/modules/SX126x/SX1268.cpp index 6ae42ea8..7de82a22 100644 --- a/src/modules/SX126x/SX1268.cpp +++ b/src/modules/SX126x/SX1268.cpp @@ -117,13 +117,13 @@ int16_t SX1268::checkOutputPower(int8_t power, int8_t* clipped) { int16_t SX1268::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginFSK()); } break; - case(ModemType_t::LRFHSS): { + case(ModemType_t::RADIOLIB_MODEM_LRFHSS): { return(this->beginLRFHSS()); } break; default: diff --git a/src/modules/SX126x/SX126x.cpp b/src/modules/SX126x/SX126x.cpp index 16062db1..bddf8bec 100644 --- a/src/modules/SX126x/SX126x.cpp +++ b/src/modules/SX126x/SX126x.cpp @@ -1682,13 +1682,13 @@ int16_t SX126x::getModem(ModemType_t* modem) { uint8_t packetType = getPacketType(); switch(packetType) { case(RADIOLIB_SX126X_PACKET_TYPE_LORA): - *modem = ModemType_t::LoRa; + *modem = ModemType_t::RADIOLIB_MODEM_LORA; return(RADIOLIB_ERR_NONE); case(RADIOLIB_SX126X_PACKET_TYPE_GFSK): - *modem = ModemType_t::FSK; + *modem = ModemType_t::RADIOLIB_MODEM_FSK; return(RADIOLIB_ERR_NONE); case(RADIOLIB_SX126X_PACKET_TYPE_LR_FHSS): - *modem = ModemType_t::LRFHSS; + *modem = ModemType_t::RADIOLIB_MODEM_LRFHSS; return(RADIOLIB_ERR_NONE); } diff --git a/src/modules/SX127x/SX1272.cpp b/src/modules/SX127x/SX1272.cpp index ed615705..17a04dcf 100644 --- a/src/modules/SX127x/SX1272.cpp +++ b/src/modules/SX127x/SX1272.cpp @@ -587,10 +587,10 @@ void SX1272::errataFix(bool rx) { int16_t SX1272::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginFSK()); } break; default: diff --git a/src/modules/SX127x/SX1273.cpp b/src/modules/SX127x/SX1273.cpp index 0efbbe93..6a3af96d 100644 --- a/src/modules/SX127x/SX1273.cpp +++ b/src/modules/SX127x/SX1273.cpp @@ -117,10 +117,10 @@ int16_t SX1273::checkDataRate(DataRate_t dr) { int16_t SX1273::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginFSK()); } break; default: diff --git a/src/modules/SX127x/SX1276.cpp b/src/modules/SX127x/SX1276.cpp index 8890c6cb..062d11b0 100644 --- a/src/modules/SX127x/SX1276.cpp +++ b/src/modules/SX127x/SX1276.cpp @@ -81,10 +81,10 @@ int16_t SX1276::setFrequency(float freq) { int16_t SX1276::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginFSK()); } break; default: diff --git a/src/modules/SX127x/SX1277.cpp b/src/modules/SX127x/SX1277.cpp index c85a5fe5..59729e89 100644 --- a/src/modules/SX127x/SX1277.cpp +++ b/src/modules/SX127x/SX1277.cpp @@ -159,10 +159,10 @@ int16_t SX1277::checkDataRate(DataRate_t dr) { int16_t SX1277::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginFSK()); } break; default: diff --git a/src/modules/SX127x/SX1278.cpp b/src/modules/SX127x/SX1278.cpp index e53bfe34..c7685905 100644 --- a/src/modules/SX127x/SX1278.cpp +++ b/src/modules/SX127x/SX1278.cpp @@ -707,10 +707,10 @@ void SX1278::errataFix(bool rx) { int16_t SX1278::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginFSK()); } break; default: diff --git a/src/modules/SX127x/SX1279.cpp b/src/modules/SX127x/SX1279.cpp index 4babad05..a91273fd 100644 --- a/src/modules/SX127x/SX1279.cpp +++ b/src/modules/SX127x/SX1279.cpp @@ -81,10 +81,10 @@ int16_t SX1279::setFrequency(float freq) { int16_t SX1279::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginFSK()); } break; default: diff --git a/src/modules/SX127x/SX127x.cpp b/src/modules/SX127x/SX127x.cpp index a8c61227..e4ba4c75 100644 --- a/src/modules/SX127x/SX127x.cpp +++ b/src/modules/SX127x/SX127x.cpp @@ -1760,10 +1760,10 @@ int16_t SX127x::getModem(ModemType_t* modem) { int16_t packetType = getActiveModem(); switch(packetType) { case(RADIOLIB_SX127X_LORA): - *modem = ModemType_t::LoRa; + *modem = ModemType_t::RADIOLIB_MODEM_LORA; return(RADIOLIB_ERR_NONE); case(RADIOLIB_SX127X_FSK_OOK): - *modem = ModemType_t::FSK; + *modem = ModemType_t::RADIOLIB_MODEM_FSK; return(RADIOLIB_ERR_NONE); } diff --git a/src/modules/SX128x/SX128x.cpp b/src/modules/SX128x/SX128x.cpp index 7a5fc20b..37b93619 100644 --- a/src/modules/SX128x/SX128x.cpp +++ b/src/modules/SX128x/SX128x.cpp @@ -858,10 +858,10 @@ int16_t SX128x::checkOutputPower(int8_t pwr, int8_t* clipped) { int16_t SX128x::setModem(ModemType_t modem) { switch(modem) { - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { return(this->begin()); } break; - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { return(this->beginGFSK()); } break; default: @@ -875,10 +875,10 @@ int16_t SX128x::getModem(ModemType_t* modem) { uint8_t packetType = getPacketType(); switch(packetType) { case(RADIOLIB_SX128X_PACKET_TYPE_LORA): - *modem = ModemType_t::LoRa; + *modem = ModemType_t::RADIOLIB_MODEM_LORA; return(RADIOLIB_ERR_NONE); case(RADIOLIB_SX128X_PACKET_TYPE_GFSK): - *modem = ModemType_t::FSK; + *modem = ModemType_t::RADIOLIB_MODEM_FSK; return(RADIOLIB_ERR_NONE); } diff --git a/src/protocols/LoRaWAN/LoRaWAN.cpp b/src/protocols/LoRaWAN/LoRaWAN.cpp index 6b4666a4..b8350003 100644 --- a/src/protocols/LoRaWAN/LoRaWAN.cpp +++ b/src/protocols/LoRaWAN/LoRaWAN.cpp @@ -2776,11 +2776,11 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir, // set modem-dependent functions switch(this->band->dataRates[chnl->dr] & RADIOLIB_LORAWAN_DATA_RATE_MODEM) { case(RADIOLIB_LORAWAN_DATA_RATE_LORA): - if(modem != ModemType_t::LoRa) { - state = this->phyLayer->setModem(ModemType_t::LoRa); + if(modem != ModemType_t::RADIOLIB_MODEM_LORA) { + state = this->phyLayer->setModem(ModemType_t::RADIOLIB_MODEM_LORA); RADIOLIB_ASSERT(state); } - modem = ModemType_t::LoRa; + modem = ModemType_t::RADIOLIB_MODEM_LORA; // downlink messages are sent with inverted IQ if(dir == RADIOLIB_LORAWAN_DOWNLINK) { state = this->phyLayer->invertIQ(true); @@ -2791,11 +2791,11 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir, break; case(RADIOLIB_LORAWAN_DATA_RATE_FSK): - if(modem != ModemType_t::FSK) { - state = this->phyLayer->setModem(ModemType_t::FSK); + if(modem != ModemType_t::RADIOLIB_MODEM_FSK) { + state = this->phyLayer->setModem(ModemType_t::RADIOLIB_MODEM_FSK); RADIOLIB_ASSERT(state); } - modem = ModemType_t::FSK; + modem = ModemType_t::RADIOLIB_MODEM_FSK; state = this->phyLayer->setDataShaping(RADIOLIB_SHAPING_1_0); RADIOLIB_ASSERT(state); state = this->phyLayer->setEncoding(RADIOLIB_ENCODING_WHITENING); @@ -2803,11 +2803,11 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir, break; case(RADIOLIB_LORAWAN_DATA_RATE_LR_FHSS): - if(modem != ModemType_t::LRFHSS) { - state = this->phyLayer->setModem(ModemType_t::LRFHSS); + if(modem != ModemType_t::RADIOLIB_MODEM_LRFHSS) { + state = this->phyLayer->setModem(ModemType_t::RADIOLIB_MODEM_LRFHSS); RADIOLIB_ASSERT(state); } - modem = ModemType_t::LRFHSS; + modem = ModemType_t::RADIOLIB_MODEM_LRFHSS; break; default: @@ -2836,7 +2836,7 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir, uint8_t syncWordLen = 0; size_t preLen = 0; switch(modem) { - case(ModemType_t::FSK): { + case(ModemType_t::RADIOLIB_MODEM_FSK): { preLen = 8*RADIOLIB_LORAWAN_GFSK_PREAMBLE_LEN; syncWord[0] = (uint8_t)(RADIOLIB_LORAWAN_GFSK_SYNC_WORD >> 16); syncWord[1] = (uint8_t)(RADIOLIB_LORAWAN_GFSK_SYNC_WORD >> 8); @@ -2846,7 +2846,7 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir, dr.fsk.bitRate, dr.fsk.freqDev); } break; - case(ModemType_t::LoRa): { + case(ModemType_t::RADIOLIB_MODEM_LORA): { preLen = RADIOLIB_LORAWAN_LORA_PREAMBLE_LEN; syncWord[0] = RADIOLIB_LORAWAN_LORA_SYNC_WORD; syncWordLen = 1; @@ -2854,7 +2854,7 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir, dr.lora.spreadingFactor, dr.lora.bandwidth, dr.lora.codingRate, dir ? 'D' : 'U'); } break; - case(ModemType_t::LRFHSS): { + case(ModemType_t::RADIOLIB_MODEM_LRFHSS): { syncWord[0] = (uint8_t)(RADIOLIB_LORAWAN_LR_FHSS_SYNC_WORD >> 24); syncWord[1] = (uint8_t)(RADIOLIB_LORAWAN_LR_FHSS_SYNC_WORD >> 16); syncWord[2] = (uint8_t)(RADIOLIB_LORAWAN_LR_FHSS_SYNC_WORD >> 8); @@ -2875,7 +2875,7 @@ int16_t LoRaWANNode::setPhyProperties(const LoRaWANChannel_t* chnl, uint8_t dir, if(pre) { preLen = pre; } - if(modem != ModemType_t::LRFHSS) { + if(modem != ModemType_t::RADIOLIB_MODEM_LRFHSS) { state = this->phyLayer->setPreambleLength(preLen); } return(state); @@ -3305,7 +3305,7 @@ int16_t LoRaWANNode::findDataRate(uint8_t dr, DataRate_t* dataRate) { switch(dataRateBand & RADIOLIB_LORAWAN_DATA_RATE_MODEM) { case(RADIOLIB_LORAWAN_DATA_RATE_LORA): - modemNew = ModemType_t::LoRa; + modemNew = ModemType_t::RADIOLIB_MODEM_LORA; dataRate->lora.spreadingFactor = ((dataRateBand & RADIOLIB_LORAWAN_DATA_RATE_SF) >> 3) + 7; switch(dataRateBand & RADIOLIB_LORAWAN_DATA_RATE_BW) { case(RADIOLIB_LORAWAN_DATA_RATE_BW_125_KHZ): @@ -3323,12 +3323,12 @@ int16_t LoRaWANNode::findDataRate(uint8_t dr, DataRate_t* dataRate) { dataRate->lora.codingRate = 5; break; case(RADIOLIB_LORAWAN_DATA_RATE_FSK): - modemNew = ModemType_t::FSK; + modemNew = ModemType_t::RADIOLIB_MODEM_FSK; dataRate->fsk.bitRate = 50; dataRate->fsk.freqDev = 25; break; case(RADIOLIB_LORAWAN_DATA_RATE_LR_FHSS): - modemNew = ModemType_t::LRFHSS; + modemNew = ModemType_t::RADIOLIB_MODEM_LRFHSS; switch(dataRateBand & RADIOLIB_LORAWAN_DATA_RATE_BW) { case(RADIOLIB_LORAWAN_DATA_RATE_BW_137_KHZ): dataRate->lrFhss.bw = 0x02; // specific encoding diff --git a/src/protocols/PhysicalLayer/PhysicalLayer.h b/src/protocols/PhysicalLayer/PhysicalLayer.h index c5467990..a8f66ce1 100644 --- a/src/protocols/PhysicalLayer/PhysicalLayer.h +++ b/src/protocols/PhysicalLayer/PhysicalLayer.h @@ -135,9 +135,9 @@ union ChannelScanConfig_t { \brief Type of modem, used by setModem. */ enum ModemType_t { - FSK = 0, - LoRa, - LRFHSS, + RADIOLIB_MODEM_FSK = 0, + RADIOLIB_MODEM_LORA, + RADIOLIB_MODEM_LRFHSS, }; /*!