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

Fix for CN470 (formerly CN500)

Browse source
This commit is contained in:
StevenCellist 2025-03-06 18:31:20 +01:00
parent c88cf551cc
commit 7577ae413f
8 changed files with 29 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
examples/LoRaWAN/LoRaWAN_ABP/configABP.h
View file

@ -41,9 +41,11 @@ const uint32_t uplinkIntervalSeconds = 5UL * 60UL; // minutes x seconds
// for the curious, the #ifndef blocks allow for automated testing &/or you can
// put your EUI & keys in to your platformio.ini - see wiki for more tips
// regional choices: EU868, US915, AU915, AS923, AS923_2, AS923_3, AS923_4, IN865, KR920, CN500
// regional choices: EU868, US915, AU915, AS923, AS923_2, AS923_3, AS923_4, IN865, KR920, CN470
const LoRaWANBand_t Region = EU868;
const uint8_t subBand = 0; // For US915, change this to 2, otherwise leave on 0
// subband choice: for US915/AU915 set to 2, for CN470 set to 1, otherwise leave on 0
const uint8_t subBand = 0;
// ============================================================================
// Below is to support the sketch - only make changes if the notes say so ...

6
examples/LoRaWAN/LoRaWAN_Reference/config.h
View file

@ -37,9 +37,11 @@ const uint32_t uplinkIntervalSeconds = 5UL * 60UL; // minutes x seconds
// for the curious, the #ifndef blocks allow for automated testing &/or you can
// put your EUI & keys in to your platformio.ini - see wiki for more tips
// regional choices: EU868, US915, AU915, AS923, AS923_2, AS923_3, AS923_4, IN865, KR920, CN500
// regional choices: EU868, US915, AU915, AS923, AS923_2, AS923_3, AS923_4, IN865, KR920, CN470
const LoRaWANBand_t Region = EU868;
const uint8_t subBand = 0; // For US915, change this to 2, otherwise leave on 0
// subband choice: for US915/AU915 set to 2, for CN470 set to 1, otherwise leave on 0
const uint8_t subBand = 0;
// ============================================================================
// Below is to support the sketch - only make changes if the notes say so ...

6
examples/LoRaWAN/LoRaWAN_Starter/config.h
View file

@ -37,9 +37,11 @@ const uint32_t uplinkIntervalSeconds = 5UL * 60UL; // minutes x seconds
// for the curious, the #ifndef blocks allow for automated testing &/or you can
// put your EUI & keys in to your platformio.ini - see wiki for more tips
// regional choices: EU868, US915, AU915, AS923, AS923_2, AS923_3, AS923_4, IN865, KR920, CN500
// regional choices: EU868, US915, AU915, AS923, AS923_2, AS923_3, AS923_4, IN865, KR920, CN470
const LoRaWANBand_t Region = EU868;
const uint8_t subBand = 0; // For US915, change this to 2, otherwise leave on 0
// subband choice: for US915/AU915 set to 2, for CN470 set to 1, otherwise leave on 0
const uint8_t subBand = 0;
// ============================================================================
// Below is to support the sketch - only make changes if the notes say so ...

2
examples/LoRaWAN/README.md
View file

@ -8,7 +8,7 @@ RadioLib LoRaWAN examples.
## LoRaWAN versions & regional parameters
RadioLib implements both LoRaWAN Specification 1.1 and 1.0.4. Confusingly, 1.0.4 is newer than 1.1, but 1.1 includes more security checks and as such **LoRaWAN 1.1 is preferred**.
The catch is in the Regional Parameters: as RP002 1.0.4 is newer than RP001 1.1, it is more up to date regarding local laws & regulations. Therefore, RadioLib implements 1.0.4 as baseline and 1.1 (revision B) as fallback, and as such **RP002 Regional Parameters 1.0.4 is preferred**.
_Note: the CN500 band is implemented as specified in RP001 1.1 revision B, as the RP002 1.0.4 version is much too complex._
_Note: the CN470 band is implemented as specified in RP001 1.1 revision B, as the RP002 1.0.4 version is much too complex._
To activate a LoRaWAN 1.1 session, supply all the required keys:
```cpp

2
keywords.txt
View file

@ -86,7 +86,7 @@ EU868 KEYWORD1
US915 KEYWORD1
EU433 KEYWORD1
AU915 KEYWORD1
CN500 KEYWORD1
CN470 KEYWORD1
AS923 KEYWORD1
AS923_2 KEYWORD1
AS923_3 KEYWORD1

18
src/protocols/LoRaWAN/LoRaWAN.cpp
View file

@ -2422,9 +2422,9 @@ void LoRaWANNode::preprocessMacLinkAdr(uint8_t* mPtr, uint8_t cLen, uint8_t* mAd
chMaskGrp45 |= (uint32_t)chMask;
break;
case 5:
// for CN500, this is just a normal channel mask
// for CN470, this is just a normal channel mask
// for all other bands, the first 10 bits enable banks of 8 125kHz channels
if(this->band->bandNum == BandCN500) {
if(this->band->bandNum == BandCN470) {
chMaskGrp45 |= (uint32_t)chMask << 16;
} else {
int bank = 0;
@ -2443,19 +2443,19 @@ void LoRaWANNode::preprocessMacLinkAdr(uint8_t* mPtr, uint8_t cLen, uint8_t* mAd
case 6:
// for dynamic bands: all channels ON (that are currently defined)
// for fixed bands: all 125kHz channels ON, channel mask similar to ChMask = 4
// except for CN500: all 125kHz channels ON
// except for CN470: all 125kHz channels ON
// for dynamic bands: retrieve all currently defined channels
// for fixed bands: cannot store all defined channels, so select a random one from each bank
this->getChannelPlanMask(&chMaskGrp0123, &chMaskGrp45);
if(this->band->bandType == RADIOLIB_LORAWAN_BAND_FIXED && this->band->bandNum != BandCN500) {
if(this->band->bandType == RADIOLIB_LORAWAN_BAND_FIXED && this->band->bandNum != BandCN470) {
chMaskGrp45 |= (uint32_t)chMask;
}
break;
case 7:
// for fixed bands: all 125kHz channels ON, channel mask similar to ChMask = 4
// except for CN500: RFU
if(this->band->bandType == RADIOLIB_LORAWAN_BAND_FIXED && this->band->bandNum != BandCN500) {
// except for CN470: RFU
if(this->band->bandType == RADIOLIB_LORAWAN_BAND_FIXED && this->band->bandNum != BandCN470) {
chMaskGrp0123 = 0;
chMaskGrp45 |= (uint32_t)chMask;
}
@ -3031,7 +3031,7 @@ void LoRaWANNode::getChannelPlanMask(uint64_t* chMaskGrp0123, uint32_t* chMaskGr
*chMaskGrp0123 |= (uint64_t)0xFF << ((this->subBand - 1) * 8);
*chMaskGrp45 |= (uint32_t)0x01 << (this->subBand - 1);
} else if(this->subBand > 8 && this->subBand <= 12) {
// CN500 only: for sub band 9-12, set bank of 8 125kHz channels
// CN470 only: for sub band 9-12, set bank of 8 125kHz channels
*chMaskGrp45 |= (uint32_t)0xFF << ((this->subBand - 9) * 8);
} else {
// if subband is set to 0, all 125kHz channels are enabled.
@ -3049,8 +3049,8 @@ void LoRaWANNode::getChannelPlanMask(uint64_t* chMaskGrp0123, uint32_t* chMaskGr
}
}
// the 500 kHz channels are in the usual channel plan however
// these are the channel indices 64-71 for bands other than CN500
if(this->band->bandNum != BandCN500) {
// these are the channel indices 64-71 for bands other than CN470
if(this->band->bandNum != BandCN470) {
for(int i = 0; i < RADIOLIB_LORAWAN_NUM_AVAILABLE_CHANNELS; i++) {
uint8_t idx = this->channelPlan[RADIOLIB_LORAWAN_UPLINK][i].idx;
if(idx != RADIOLIB_LORAWAN_CHANNEL_INDEX_NONE && idx >= 64) {

4
src/protocols/LoRaWAN/LoRaWAN.h
View file

@ -435,7 +435,7 @@ extern const LoRaWANBand_t EU868;
extern const LoRaWANBand_t US915;
extern const LoRaWANBand_t EU433;
extern const LoRaWANBand_t AU915;
extern const LoRaWANBand_t CN500;
extern const LoRaWANBand_t CN470;
extern const LoRaWANBand_t AS923;
extern const LoRaWANBand_t AS923_2;
extern const LoRaWANBand_t AS923_3;
@ -452,7 +452,7 @@ enum LoRaWANBandNum_t {
BandUS915,
BandEU433,
BandAU915,
BandCN500,
BandCN470,
BandAS923,
BandAS923_2,
BandAS923_3,

8
src/protocols/LoRaWAN/LoRaWANBands.cpp
View file

@ -8,7 +8,7 @@ const LoRaWANBand_t* LoRaWANBands[RADIOLIB_LORAWAN_NUM_SUPPORTED_BANDS] = {
&US915,
&EU433,
&AU915,
&CN500,
&CN470,
&AS923,
&AS923_2,
&AS923_3,
@ -331,8 +331,8 @@ const LoRaWANBand_t AU915 = {
}
};
const LoRaWANBand_t CN500 = {
.bandNum = BandCN500,
const LoRaWANBand_t CN470 = {
.bandNum = BandCN470,
.bandType = RADIOLIB_LORAWAN_BAND_FIXED,
.freqMin = 4700000,
.freqMax = 5100000,
@ -356,7 +356,7 @@ const LoRaWANBand_t CN500 = {
.freqStep = 2000,
.drMin = 0,
.drMax = 5,
.drJoinRequest = 0
.drJoinRequest = 3
},
RADIOLIB_LORAWAN_CHANNEL_SPAN_NONE
},