diff --git a/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor b/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor index d01ba2daa..8455a4fd2 100644 --- a/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor +++ b/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor @@ -75,7 +75,17 @@ + Australia 915-928 MHz, FSB 1 + Australia 915-928 MHz, FSB 2 + Australia 915-928 MHz, FSB 3 + Australia 915-928 MHz, FSB 4 + Australia 915-928 MHz, FSB 5 + Australia 915-928 MHz, FSB 6 + Australia 915-928 MHz, FSB 7 + Australia 915-928 MHz, FSB 8 Europe 863-870 MHz + China 470-510 MHz, RP 1 + China 470-510 MHz, RP 2 United States 902-928 MHz, FSB 1 United States 902-928 MHz, FSB 2 United States 902-928 MHz, FSB 3 @@ -83,8 +93,6 @@ United States 902-928 MHz, FSB 5 United States 902-928 MHz, FSB 6 United States 902-928 MHz, FSB 7 - China 470-510 MHz, RP 1 - China 470-510 MHz, RP 2 diff --git a/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor b/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor index d58594291..90b309727 100644 --- a/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor +++ b/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor @@ -57,7 +57,17 @@ + Australia 915-928 MHz, FSB 1 + Australia 915-928 MHz, FSB 2 + Australia 915-928 MHz, FSB 3 + Australia 915-928 MHz, FSB 4 + Australia 915-928 MHz, FSB 5 + Australia 915-928 MHz, FSB 6 + Australia 915-928 MHz, FSB 7 + Australia 915-928 MHz, FSB 8 Europe 863-870 MHz + China 470-510 MHz, RP 1 + China 470-510 MHz, RP 2 United States 902-928 MHz, FSB 1 United States 902-928 MHz, FSB 2 United States 902-928 MHz, FSB 3 @@ -65,8 +75,6 @@ United States 902-928 MHz, FSB 5 United States 902-928 MHz, FSB 6 United States 902-928 MHz, FSB 7 - China 470-510 MHz, RP 1 - China 470-510 MHz, RP 2 diff --git a/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_1.json b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_1.json new file mode 100644 index 000000000..435761142 --- /dev/null +++ b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_1.json @@ -0,0 +1,128 @@ +{ + "routerConfig": { + "NetID": [ + 1 + ], + "JoinEui": [], + "region": "AS923", + "hwspec": "sx1301/1", + "freq_range": [ + 915000000, + 928000000 + ], + "DRs": [ + [ + 12, + 125, + 0 + ], + [ + 11, + 125, + 0 + ], + [ + 10, + 125, + 0 + ], + [ + 9, + 125, + 0 + ], + [ + 8, + 125, + 0 + ], + [ + 7, + 125, + 0 + ], + [ + 7, + 250, + 0 + ] + ], + "sx1301_conf": [ + { + "radio_0": { + "enable": true, + "freq": 915600000 + }, + "radio_1": { + "enable": true, + "freq": 916300000 + }, + "chan_FSK": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_Lora_std": { + "enable": true, + "radio": 1, + "if": -200000, + "bandwidth": 250000, + "spread_factor": 7 + }, + "chan_multiSF_0": { + "enable": true, + "radio": 1, + "if": -300000 + }, + "chan_multiSF_1": { + "enable": true, + "radio": 1, + "if": -100000 + }, + "chan_multiSF_2": { + "enable": true, + "radio": 1, + "if": 100000 + }, + "chan_multiSF_3": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_multiSF_4": { + "enable": true, + "radio": 0, + "if": -300000 + }, + "chan_multiSF_5": { + "enable": true, + "radio": 0, + "if": -100000 + }, + "chan_multiSF_6": { + "enable": true, + "radio": 0, + "if": 100000 + }, + "chan_multiSF_7": { + "enable": true, + "radio": 0, + "if": 300000 + } + } + ], + "nocca": true, + "nodc": true, + "nodwell": true, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } + }, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } +} diff --git a/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_2.json b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_2.json new file mode 100644 index 000000000..c0daca6a1 --- /dev/null +++ b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_2.json @@ -0,0 +1,128 @@ +{ + "routerConfig": { + "NetID": [ + 1 + ], + "JoinEui": [], + "region": "AS923", + "hwspec": "sx1301/1", + "freq_range": [ + 915000000, + 928000000 + ], + "DRs": [ + [ + 12, + 125, + 0 + ], + [ + 11, + 125, + 0 + ], + [ + 10, + 125, + 0 + ], + [ + 9, + 125, + 0 + ], + [ + 8, + 125, + 0 + ], + [ + 7, + 125, + 0 + ], + [ + 7, + 250, + 0 + ] + ], + "sx1301_conf": [ + { + "radio_0": { + "enable": true, + "freq": 917200000 + }, + "radio_1": { + "enable": true, + "freq": 917900000 + }, + "chan_FSK": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_Lora_std": { + "enable": true, + "radio": 1, + "if": -200000, + "bandwidth": 250000, + "spread_factor": 7 + }, + "chan_multiSF_0": { + "enable": true, + "radio": 1, + "if": -300000 + }, + "chan_multiSF_1": { + "enable": true, + "radio": 1, + "if": -100000 + }, + "chan_multiSF_2": { + "enable": true, + "radio": 1, + "if": 100000 + }, + "chan_multiSF_3": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_multiSF_4": { + "enable": true, + "radio": 0, + "if": -300000 + }, + "chan_multiSF_5": { + "enable": true, + "radio": 0, + "if": -100000 + }, + "chan_multiSF_6": { + "enable": true, + "radio": 0, + "if": 100000 + }, + "chan_multiSF_7": { + "enable": true, + "radio": 0, + "if": 300000 + } + } + ], + "nocca": true, + "nodc": true, + "nodwell": true, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } + }, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } +} diff --git a/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_3.json b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_3.json new file mode 100644 index 000000000..3167e0b3b --- /dev/null +++ b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_3.json @@ -0,0 +1,128 @@ +{ + "routerConfig": { + "NetID": [ + 1 + ], + "JoinEui": [], + "region": "AS923", + "hwspec": "sx1301/1", + "freq_range": [ + 915000000, + 928000000 + ], + "DRs": [ + [ + 12, + 125, + 0 + ], + [ + 11, + 125, + 0 + ], + [ + 10, + 125, + 0 + ], + [ + 9, + 125, + 0 + ], + [ + 8, + 125, + 0 + ], + [ + 7, + 125, + 0 + ], + [ + 7, + 250, + 0 + ] + ], + "sx1301_conf": [ + { + "radio_0": { + "enable": true, + "freq": 918800000 + }, + "radio_1": { + "enable": true, + "freq": 919500000 + }, + "chan_FSK": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_Lora_std": { + "enable": true, + "radio": 1, + "if": -200000, + "bandwidth": 250000, + "spread_factor": 7 + }, + "chan_multiSF_0": { + "enable": true, + "radio": 1, + "if": -300000 + }, + "chan_multiSF_1": { + "enable": true, + "radio": 1, + "if": -100000 + }, + "chan_multiSF_2": { + "enable": true, + "radio": 1, + "if": 100000 + }, + "chan_multiSF_3": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_multiSF_4": { + "enable": true, + "radio": 0, + "if": -300000 + }, + "chan_multiSF_5": { + "enable": true, + "radio": 0, + "if": -100000 + }, + "chan_multiSF_6": { + "enable": true, + "radio": 0, + "if": 100000 + }, + "chan_multiSF_7": { + "enable": true, + "radio": 0, + "if": 300000 + } + } + ], + "nocca": true, + "nodc": true, + "nodwell": true, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } + }, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } +} diff --git a/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_4.json b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_4.json new file mode 100644 index 000000000..c4eb9924f --- /dev/null +++ b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_4.json @@ -0,0 +1,128 @@ +{ + "routerConfig": { + "NetID": [ + 1 + ], + "JoinEui": [], + "region": "AS923", + "hwspec": "sx1301/1", + "freq_range": [ + 915000000, + 928000000 + ], + "DRs": [ + [ + 12, + 125, + 0 + ], + [ + 11, + 125, + 0 + ], + [ + 10, + 125, + 0 + ], + [ + 9, + 125, + 0 + ], + [ + 8, + 125, + 0 + ], + [ + 7, + 125, + 0 + ], + [ + 7, + 250, + 0 + ] + ], + "sx1301_conf": [ + { + "radio_0": { + "enable": true, + "freq": 922000000 + }, + "radio_1": { + "enable": true, + "freq": 922700000 + }, + "chan_FSK": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_Lora_std": { + "enable": true, + "radio": 1, + "if": -200000, + "bandwidth": 250000, + "spread_factor": 7 + }, + "chan_multiSF_0": { + "enable": true, + "radio": 1, + "if": -300000 + }, + "chan_multiSF_1": { + "enable": true, + "radio": 1, + "if": -100000 + }, + "chan_multiSF_2": { + "enable": true, + "radio": 1, + "if": 100000 + }, + "chan_multiSF_3": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_multiSF_4": { + "enable": true, + "radio": 0, + "if": -300000 + }, + "chan_multiSF_5": { + "enable": true, + "radio": 0, + "if": -100000 + }, + "chan_multiSF_6": { + "enable": true, + "radio": 0, + "if": 100000 + }, + "chan_multiSF_7": { + "enable": true, + "radio": 0, + "if": 300000 + } + } + ], + "nocca": true, + "nodc": true, + "nodwell": true, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } + }, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } +} diff --git a/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_5.json b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_5.json new file mode 100644 index 000000000..c4eb9924f --- /dev/null +++ b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_5.json @@ -0,0 +1,128 @@ +{ + "routerConfig": { + "NetID": [ + 1 + ], + "JoinEui": [], + "region": "AS923", + "hwspec": "sx1301/1", + "freq_range": [ + 915000000, + 928000000 + ], + "DRs": [ + [ + 12, + 125, + 0 + ], + [ + 11, + 125, + 0 + ], + [ + 10, + 125, + 0 + ], + [ + 9, + 125, + 0 + ], + [ + 8, + 125, + 0 + ], + [ + 7, + 125, + 0 + ], + [ + 7, + 250, + 0 + ] + ], + "sx1301_conf": [ + { + "radio_0": { + "enable": true, + "freq": 922000000 + }, + "radio_1": { + "enable": true, + "freq": 922700000 + }, + "chan_FSK": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_Lora_std": { + "enable": true, + "radio": 1, + "if": -200000, + "bandwidth": 250000, + "spread_factor": 7 + }, + "chan_multiSF_0": { + "enable": true, + "radio": 1, + "if": -300000 + }, + "chan_multiSF_1": { + "enable": true, + "radio": 1, + "if": -100000 + }, + "chan_multiSF_2": { + "enable": true, + "radio": 1, + "if": 100000 + }, + "chan_multiSF_3": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_multiSF_4": { + "enable": true, + "radio": 0, + "if": -300000 + }, + "chan_multiSF_5": { + "enable": true, + "radio": 0, + "if": -100000 + }, + "chan_multiSF_6": { + "enable": true, + "radio": 0, + "if": 100000 + }, + "chan_multiSF_7": { + "enable": true, + "radio": 0, + "if": 300000 + } + } + ], + "nocca": true, + "nodc": true, + "nodwell": true, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } + }, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } +} diff --git a/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_6.json b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_6.json new file mode 100644 index 000000000..d658cd529 --- /dev/null +++ b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_6.json @@ -0,0 +1,128 @@ +{ + "routerConfig": { + "NetID": [ + 1 + ], + "JoinEui": [], + "region": "AS923", + "hwspec": "sx1301/1", + "freq_range": [ + 915000000, + 928000000 + ], + "DRs": [ + [ + 12, + 125, + 0 + ], + [ + 11, + 125, + 0 + ], + [ + 10, + 125, + 0 + ], + [ + 9, + 125, + 0 + ], + [ + 8, + 125, + 0 + ], + [ + 7, + 125, + 0 + ], + [ + 7, + 250, + 0 + ] + ], + "sx1301_conf": [ + { + "radio_0": { + "enable": true, + "freq": 923600000 + }, + "radio_1": { + "enable": true, + "freq": 924300000 + }, + "chan_FSK": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_Lora_std": { + "enable": true, + "radio": 1, + "if": -200000, + "bandwidth": 250000, + "spread_factor": 7 + }, + "chan_multiSF_0": { + "enable": true, + "radio": 1, + "if": -300000 + }, + "chan_multiSF_1": { + "enable": true, + "radio": 1, + "if": -100000 + }, + "chan_multiSF_2": { + "enable": true, + "radio": 1, + "if": 100000 + }, + "chan_multiSF_3": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_multiSF_4": { + "enable": true, + "radio": 0, + "if": -300000 + }, + "chan_multiSF_5": { + "enable": true, + "radio": 0, + "if": -100000 + }, + "chan_multiSF_6": { + "enable": true, + "radio": 0, + "if": 100000 + }, + "chan_multiSF_7": { + "enable": true, + "radio": 0, + "if": 300000 + } + } + ], + "nocca": true, + "nodc": true, + "nodwell": true, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } + }, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } +} diff --git a/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_7.json b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_7.json new file mode 100644 index 000000000..395a9afcf --- /dev/null +++ b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_7.json @@ -0,0 +1,128 @@ +{ + "routerConfig": { + "NetID": [ + 1 + ], + "JoinEui": [], + "region": "AS923", + "hwspec": "sx1301/1", + "freq_range": [ + 915000000, + 928000000 + ], + "DRs": [ + [ + 12, + 125, + 0 + ], + [ + 11, + 125, + 0 + ], + [ + 10, + 125, + 0 + ], + [ + 9, + 125, + 0 + ], + [ + 8, + 125, + 0 + ], + [ + 7, + 125, + 0 + ], + [ + 7, + 250, + 0 + ] + ], + "sx1301_conf": [ + { + "radio_0": { + "enable": true, + "freq": 925200000 + }, + "radio_1": { + "enable": true, + "freq": 925900000 + }, + "chan_FSK": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_Lora_std": { + "enable": true, + "radio": 1, + "if": -200000, + "bandwidth": 250000, + "spread_factor": 7 + }, + "chan_multiSF_0": { + "enable": true, + "radio": 1, + "if": -300000 + }, + "chan_multiSF_1": { + "enable": true, + "radio": 1, + "if": -100000 + }, + "chan_multiSF_2": { + "enable": true, + "radio": 1, + "if": 100000 + }, + "chan_multiSF_3": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_multiSF_4": { + "enable": true, + "radio": 0, + "if": -300000 + }, + "chan_multiSF_5": { + "enable": true, + "radio": 0, + "if": -100000 + }, + "chan_multiSF_6": { + "enable": true, + "radio": 0, + "if": 100000 + }, + "chan_multiSF_7": { + "enable": true, + "radio": 0, + "if": 300000 + } + } + ], + "nocca": true, + "nodc": true, + "nodwell": true, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } + }, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } +} diff --git a/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_8.json b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_8.json new file mode 100644 index 000000000..4c097b65f --- /dev/null +++ b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AU_915_928_FSB_8.json @@ -0,0 +1,128 @@ +{ + "routerConfig": { + "NetID": [ + 1 + ], + "JoinEui": [], + "region": "AS923", + "hwspec": "sx1301/1", + "freq_range": [ + 915000000, + 928000000 + ], + "DRs": [ + [ + 12, + 125, + 0 + ], + [ + 11, + 125, + 0 + ], + [ + 10, + 125, + 0 + ], + [ + 9, + 125, + 0 + ], + [ + 8, + 125, + 0 + ], + [ + 7, + 125, + 0 + ], + [ + 7, + 250, + 0 + ] + ], + "sx1301_conf": [ + { + "radio_0": { + "enable": true, + "freq": 926800000 + }, + "radio_1": { + "enable": true, + "freq": 927500000 + }, + "chan_FSK": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_Lora_std": { + "enable": true, + "radio": 1, + "if": -200000, + "bandwidth": 250000, + "spread_factor": 7 + }, + "chan_multiSF_0": { + "enable": true, + "radio": 1, + "if": -300000 + }, + "chan_multiSF_1": { + "enable": true, + "radio": 1, + "if": -100000 + }, + "chan_multiSF_2": { + "enable": true, + "radio": 1, + "if": 100000 + }, + "chan_multiSF_3": { + "enable": true, + "radio": 1, + "if": 300000 + }, + "chan_multiSF_4": { + "enable": true, + "radio": 0, + "if": -300000 + }, + "chan_multiSF_5": { + "enable": true, + "radio": 0, + "if": -100000 + }, + "chan_multiSF_6": { + "enable": true, + "radio": 0, + "if": 100000 + }, + "chan_multiSF_7": { + "enable": true, + "radio": 0, + "if": 300000 + } + } + ], + "nocca": true, + "nodc": true, + "nodwell": true, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } + }, + "desiredTxParams": { + "downlinkDwellLimit": true, + "uplinkDwellLimit": true, + "eirp": 5 + } +}