From 2ea66a8213155388df6f6dfdd676b1ada9c11f17 Mon Sep 17 00:00:00 2001
From: Kevin BEAUGRAND <9513635+kbeaugrand@users.noreply.github.com>
Date: Fri, 5 Aug 2022 16:58:47 +0200
Subject: [PATCH] Fix #812 Add support for AS923

---
 .../Concentrator/ConcentratorDetailPage.razor |   7 +-
 .../Concentrator/CreateConcentratorPage.razor |   7 +-
 .../RouterConfigFiles/AS_923_925_1.json       | 128 ++++++++++++++++++
 .../RouterConfigFiles/AS_923_925_2.json       | 128 ++++++++++++++++++
 .../RouterConfigFiles/AS_923_925_3.json       | 128 ++++++++++++++++++
 5 files changed, 394 insertions(+), 4 deletions(-)
 create mode 100644 src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_1.json
 create mode 100644 src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_2.json
 create mode 100644 src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_3.json

diff --git a/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor b/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor
index d01ba2daa..a24a1e959 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/ConcentratorDetailPage.razor
@@ -75,7 +75,12 @@
                                             </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>
@@ -83,8 +88,6 @@
                                                     <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">
diff --git a/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor b/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor
index d58594291..0e3008b12 100644
--- a/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor
+++ b/src/AzureIoTHub.Portal/Client/Pages/LoRaWAN/Concentrator/CreateConcentratorPage.razor
@@ -57,7 +57,12 @@
                                             </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>
@@ -65,8 +70,6 @@
                                                     <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">
diff --git a/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_1.json b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_1.json
new file mode 100644
index 000000000..53e07d389
--- /dev/null
+++ b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_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": 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
+  }
+}
diff --git a/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_2.json b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_2.json
new file mode 100644
index 000000000..cdda0f493
--- /dev/null
+++ b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_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": 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
+  }
+}
diff --git a/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_3.json b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_3.json
new file mode 100644
index 000000000..a139dd419
--- /dev/null
+++ b/src/AzureIoTHub.Portal/Server/RouterConfigFiles/AS_923_925_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": 916900000
+        },
+        "radio_1": {
+          "enable": true,
+          "freq": 917700000
+        },
+        "chan_FSK": {
+          "enable": false,
+          "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
+  }
+}