Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix #812 Add support for AS923 #1036

Merged
merged 1 commit into from
Aug 5, 2022
Merged

Fix #812 Add support for AS923 #1036

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 5 additions & 2 deletions src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,16 +75,19 @@
</MudItem>
<MudItem xs="12" md="6">
<MudSelect T="string" Label="Region" Variant="Variant.Outlined" @bind-Value="@concentrator.LoraRegion" Required="true">
<MudSelectItem Value="@("AS_923_925_1")">Asia 923-925 MHz, Group 1</MudSelectItem>
<MudSelectItem Value="@("AS_923_925_2")">Asia 923-925 MHz, Group 2</MudSelectItem>
<MudSelectItem Value="@("AS_923_925_3")">Asia 923-925 MHz, Group 3</MudSelectItem>
<MudSelectItem Value="@("EU_863_870")">Europe 863-870 MHz</MudSelectItem>
<MudSelectItem Value="@("CN_470_510_RP1")">China 470-510 MHz, RP 1</MudSelectItem>
<MudSelectItem Value="@("CN_470_510_RP2")">China 470-510 MHz, RP 2</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_1")">United States 902-928 MHz, FSB 1</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_2")">United States 902-928 MHz, FSB 2</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_3")">United States 902-928 MHz, FSB 3</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_4")">United States 902-928 MHz, FSB 4</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_5")">United States 902-928 MHz, FSB 5</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_6")">United States 902-928 MHz, FSB 6</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_7")">United States 902-928 MHz, FSB 7</MudSelectItem>
<MudSelectItem Value="@("CN_470_510_RP1")">China 470-510 MHz, RP 1</MudSelectItem>
<MudSelectItem Value="@("CN_470_510_RP2")">China 470-510 MHz, RP 2</MudSelectItem>
</MudSelect>
</MudItem>
<MudItem xs="12">
Expand Down
7 changes: 5 additions & 2 deletions src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -57,16 +57,19 @@
</MudItem>
<MudItem xs="12" md="6">
<MudSelect T="string" For="@(()=> concentrator.LoraRegion)" Label="Region" Variant="Variant.Outlined" @bind-Value="@concentrator.LoraRegion" Required="true" id="@nameof(Concentrator.LoraRegion)">
<MudSelectItem Value="@("AS_923_925_1")">Asia 923-925 MHz, Group 1</MudSelectItem>
<MudSelectItem Value="@("AS_923_925_2")">Asia 923-925 MHz, Group 2</MudSelectItem>
<MudSelectItem Value="@("AS_923_925_3")">Asia 923-925 MHz, Group 3</MudSelectItem>
<MudSelectItem Value="@("EU_863_870")">Europe 863-870 MHz</MudSelectItem>
<MudSelectItem Value="@("CN_470_510_RP1")">China 470-510 MHz, RP 1</MudSelectItem>
<MudSelectItem Value="@("CN_470_510_RP2")">China 470-510 MHz, RP 2</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_1")">United States 902-928 MHz, FSB 1</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_2")">United States 902-928 MHz, FSB 2</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_3")">United States 902-928 MHz, FSB 3</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_4")">United States 902-928 MHz, FSB 4</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_5")">United States 902-928 MHz, FSB 5</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_6")">United States 902-928 MHz, FSB 6</MudSelectItem>
<MudSelectItem Value="@("US_902_928_FSB_7")">United States 902-928 MHz, FSB 7</MudSelectItem>
<MudSelectItem Value="@("CN_470_510_RP1")">China 470-510 MHz, RP 1</MudSelectItem>
<MudSelectItem Value="@("CN_470_510_RP2")">China 470-510 MHz, RP 2</MudSelectItem>
</MudSelect>
</MudItem>
<MudItem xs="12">
Expand Down
128 changes: 128 additions & 0 deletions src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_1.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": 923500000
},
"radio_1": {
"enable": true,
"freq": 924300000
},
"chan_FSK": {
"enable": true,
"radio": 1,
"if": 500000
},
"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
}
}
128 changes: 128 additions & 0 deletions src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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": 921700000
},
"radio_1": {
"enable": true,
"freq": 922500000
},
"chan_FSK": {
"enable": true,
"radio": 0,
"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
}
}
Loading