Skip to content

Commit

Permalink
Fix #2274
Browse files Browse the repository at this point in the history
  • Loading branch information
kbeaugrand committed Jun 29, 2023
1 parent 10b7617 commit 15196ec
Show file tree
Hide file tree
Showing 12 changed files with 1,210 additions and 1,389 deletions.
Original file line number Diff line number Diff line change
Expand Up @@ -32,66 +32,19 @@
<None Remove="RouterConfigFiles\US_902_928_FSB_8.json" />
</ItemGroup>

<ItemGroup>
<Content Include="RouterConfigFiles\AS_923_925_1.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="RouterConfigFiles\AS_923_925_2.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="RouterConfigFiles\AS_923_925_3.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="RouterConfigFiles\AU_915_928_FSB_1.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="RouterConfigFiles\AU_915_928_FSB_2.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="RouterConfigFiles\AU_915_928_FSB_3.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="RouterConfigFiles\AU_915_928_FSB_4.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="RouterConfigFiles\AU_915_928_FSB_5.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="RouterConfigFiles\AU_915_928_FSB_6.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="RouterConfigFiles\AU_915_928_FSB_7.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
<Content Include="RouterConfigFiles\AU_915_928_FSB_8.json">
<CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
<ExcludeFromSingleFile>true</ExcludeFromSingleFile>
<CopyToPublishDirectory>PreserveNewest</CopyToPublishDirectory>
</Content>
</ItemGroup>

<ItemGroup>
<EmbeddedResource Include="Resources\default-template-icon.png" />
<EmbeddedResource Include="RouterConfigFiles\AS_923_925_1.json" />
<EmbeddedResource Include="RouterConfigFiles\AS_923_925_2.json" />
<EmbeddedResource Include="RouterConfigFiles\AS_923_925_3.json" />
<EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_1.json" />
<EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_2.json" />
<EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_3.json" />
<EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_4.json" />
<EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_5.json" />
<EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_6.json" />
<EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_7.json" />
<EmbeddedResource Include="RouterConfigFiles\AU_915_928_FSB_8.json" />
<EmbeddedResource Include="RouterConfigFiles\CN_470_510_RP1.json" />
<EmbeddedResource Include="RouterConfigFiles\CN_470_510_RP2.json" />
<EmbeddedResource Include="RouterConfigFiles\EU_863_870.json" />
Expand Down
230 changes: 109 additions & 121 deletions src/AzureIoTHub.Portal.Infrastructure/RouterConfigFiles/AS_923_925_1.json
Original file line number Diff line number Diff line change
@@ -1,128 +1,116 @@
{
"routerConfig": {
"NetID": [
1
"NetID": [
1
],
"JoinEui": [],
"region": "AS923",
"hwspec": "sx1301/1",
"freq_range": [
915000000,
928000000
],
"DRs": [
[
12,
125,
0
],
"JoinEui": [],
"region": "AS923",
"hwspec": "sx1301/1",
"freq_range": [
915000000,
928000000
[
11,
125,
0
],
"DRs": [
[
12,
125,
0
],
[
11,
125,
0
],
[
10,
125,
0
],
[
9,
125,
0
],
[
8,
125,
0
],
[
7,
125,
0
],
[
7,
250,
0
]
[
10,
125,
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
}
}
[
9,
125,
0
],
[
8,
125,
0
],
"nocca": true,
"nodc": true,
"nodwell": true,
"desiredTxParams": {
"downlinkDwellLimit": true,
"uplinkDwellLimit": true,
"eirp": 5
[
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
}
}
},
"desiredTxParams": {
"downlinkDwellLimit": true,
"uplinkDwellLimit": true,
"eirp": 5
}
],
"nocca": true,
"nodc": true,
"nodwell": true
}
Loading

0 comments on commit 15196ec

Please sign in to comment.