diff --git a/examples/LoRaWAN/LoRaWAN_ABP/configABP.h b/examples/LoRaWAN/LoRaWAN_ABP/configABP.h index f4b8a896..67008adf 100644 --- a/examples/LoRaWAN/LoRaWAN_ABP/configABP.h +++ b/examples/LoRaWAN/LoRaWAN_ABP/configABP.h @@ -28,7 +28,7 @@ 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, CN780, CN500 +// regional choices: EU868, US915, AU915, AS923, AS923_2, AS923_3, AS923_4, IN865, KR920, CN500 const LoRaWANBand_t Region = EU868; const uint8_t subBand = 0; // For US915, change this to 2, otherwise leave on 0 diff --git a/examples/LoRaWAN/LoRaWAN_Reference/config.h b/examples/LoRaWAN/LoRaWAN_Reference/config.h index a721a932..f3a43c83 100644 --- a/examples/LoRaWAN/LoRaWAN_Reference/config.h +++ b/examples/LoRaWAN/LoRaWAN_Reference/config.h @@ -24,7 +24,7 @@ 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, CN780, CN500 +// regional choices: EU868, US915, AU915, AS923, AS923_2, AS923_3, AS923_4, IN865, KR920, CN500 const LoRaWANBand_t Region = EU868; const uint8_t subBand = 0; // For US915, change this to 2, otherwise leave on 0 diff --git a/examples/LoRaWAN/LoRaWAN_Starter/config.h b/examples/LoRaWAN/LoRaWAN_Starter/config.h index a721a932..f3a43c83 100644 --- a/examples/LoRaWAN/LoRaWAN_Starter/config.h +++ b/examples/LoRaWAN/LoRaWAN_Starter/config.h @@ -24,7 +24,7 @@ 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, CN780, CN500 +// regional choices: EU868, US915, AU915, AS923, AS923_2, AS923_3, AS923_4, IN865, KR920, CN500 const LoRaWANBand_t Region = EU868; const uint8_t subBand = 0; // For US915, change this to 2, otherwise leave on 0 diff --git a/keywords.txt b/keywords.txt index 773df7a2..dab4fb05 100644 --- a/keywords.txt +++ b/keywords.txt @@ -83,11 +83,13 @@ Bell202 KEYWORD1 # LoRaWAN bands EU868 KEYWORD1 US915 KEYWORD1 -CN780 KEYWORD1 EU433 KEYWORD1 AU915 KEYWORD1 CN500 KEYWORD1 AS923 KEYWORD1 +AS923_2 KEYWORD1 +AS923_3 KEYWORD1 +AS923_4 KEYWORD1 KR920 KEYWORD1 IN865 KEYWORD1 diff --git a/src/protocols/LoRaWAN/LoRaWAN.h b/src/protocols/LoRaWAN/LoRaWAN.h index 11bb7c59..3af9477f 100644 --- a/src/protocols/LoRaWAN/LoRaWAN.h +++ b/src/protocols/LoRaWAN/LoRaWAN.h @@ -436,7 +436,6 @@ struct LoRaWANBand_t { // supported bands extern const LoRaWANBand_t EU868; extern const LoRaWANBand_t US915; -extern const LoRaWANBand_t CN780; extern const LoRaWANBand_t EU433; extern const LoRaWANBand_t AU915; extern const LoRaWANBand_t CN500; @@ -454,7 +453,6 @@ extern const LoRaWANBand_t IN865; enum LoRaWANBandNum_t { BandEU868, BandUS915, - BandCN780, BandEU433, BandAU915, BandCN500, diff --git a/src/protocols/LoRaWAN/LoRaWANBands.cpp b/src/protocols/LoRaWAN/LoRaWANBands.cpp index 4bb30a33..f67b8573 100644 --- a/src/protocols/LoRaWAN/LoRaWANBands.cpp +++ b/src/protocols/LoRaWAN/LoRaWANBands.cpp @@ -6,7 +6,6 @@ const LoRaWANBand_t* LoRaWANBands[RADIOLIB_LORAWAN_NUM_SUPPORTED_BANDS] = { &EU868, &US915, - &CN780, &EU433, &AU915, &CN500, @@ -131,52 +130,6 @@ const LoRaWANBand_t US915 = { } }; -const LoRaWANBand_t CN780 = { - .bandNum = BandCN780, - .bandType = RADIOLIB_LORAWAN_BAND_DYNAMIC, - .payloadLenMax = { 59, 59, 59, 123, 230, 230, 250, 230, 0, 0, 0, 0, 0, 0, 0 }, - .powerMax = 12, - .powerNumSteps = 5, - .dutyCycle = 3600, - .dwellTimeUp = 0, - .dwellTimeDn = 0, - .txFreqs = { - { .enabled = true, .idx = 0, .freq = 779.500, .drMin = 0, .drMax = 5}, - { .enabled = true, .idx = 1, .freq = 779.700, .drMin = 0, .drMax = 5}, - { .enabled = true, .idx = 2, .freq = 779.900, .drMin = 0, .drMax = 5}, - }, - .txJoinReq = { - { .enabled = true, .idx = 3, .freq = 780.500, .drMin = 0, .drMax = 5}, - { .enabled = true, .idx = 4, .freq = 780.700, .drMin = 0, .drMax = 5}, - { .enabled = true, .idx = 5, .freq = 780.900, .drMin = 0, .drMax = 5} - }, - .numTxSpans = 0, - .txSpans = { - RADIOLIB_LORAWAN_CHANNEL_SPAN_NONE, - RADIOLIB_LORAWAN_CHANNEL_SPAN_NONE - }, - .rx1Span = RADIOLIB_LORAWAN_CHANNEL_SPAN_NONE, - .rx1DataRateBase = 0, - .rx2 = { .enabled = true, .idx = 0, .freq = 786.000, .drMin = 0, .drMax = 0 }, - .dataRates = { - RADIOLIB_LORAWAN_DATA_RATE_SF_12 | RADIOLIB_LORAWAN_DATA_RATE_BW_125_KHZ | RADIOLIB_LORAWAN_DATA_RATE_CR_4_5, - RADIOLIB_LORAWAN_DATA_RATE_SF_11 | RADIOLIB_LORAWAN_DATA_RATE_BW_125_KHZ | RADIOLIB_LORAWAN_DATA_RATE_CR_4_5, - RADIOLIB_LORAWAN_DATA_RATE_SF_10 | RADIOLIB_LORAWAN_DATA_RATE_BW_125_KHZ | RADIOLIB_LORAWAN_DATA_RATE_CR_4_5, - RADIOLIB_LORAWAN_DATA_RATE_SF_9 | RADIOLIB_LORAWAN_DATA_RATE_BW_125_KHZ | RADIOLIB_LORAWAN_DATA_RATE_CR_4_5, - RADIOLIB_LORAWAN_DATA_RATE_SF_8 | RADIOLIB_LORAWAN_DATA_RATE_BW_125_KHZ | RADIOLIB_LORAWAN_DATA_RATE_CR_4_5, - RADIOLIB_LORAWAN_DATA_RATE_SF_7 | RADIOLIB_LORAWAN_DATA_RATE_BW_125_KHZ | RADIOLIB_LORAWAN_DATA_RATE_CR_4_5, - RADIOLIB_LORAWAN_DATA_RATE_SF_7 | RADIOLIB_LORAWAN_DATA_RATE_BW_250_KHZ | RADIOLIB_LORAWAN_DATA_RATE_CR_4_5, - RADIOLIB_LORAWAN_DATA_RATE_FSK_50_K, - RADIOLIB_LORAWAN_DATA_RATE_UNUSED, - RADIOLIB_LORAWAN_DATA_RATE_UNUSED, - RADIOLIB_LORAWAN_DATA_RATE_UNUSED, - RADIOLIB_LORAWAN_DATA_RATE_UNUSED, - RADIOLIB_LORAWAN_DATA_RATE_UNUSED, - RADIOLIB_LORAWAN_DATA_RATE_UNUSED, - RADIOLIB_LORAWAN_DATA_RATE_UNUSED - } -}; - const LoRaWANBand_t EU433 = { .bandNum = BandEU433, .bandType = RADIOLIB_LORAWAN_BAND_DYNAMIC,