Getting rid of loRaSyncWord and gFSKSyncWord from Region implementati…

…on (Azure#604) * Getting rid of loRaSyncWord and gFSKSyncWord from Region implementation * Adapting CN470 to get rid of sync words * Formatting
Mandur · Oct 21, 2021 · 0bac12b · 0bac12b
1 parent a67f973
commit 0bac12b
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 23 deletions.
diff --git a/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/Regions/Region.cs b/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/Regions/Region.cs
@@ -16,10 +16,6 @@ public abstract class Region
 
         public LoRaRegionType LoRaRegion { get; set; }
 
-        public byte LoRaSyncWord { get; private set; }
-
-        public IReadOnlyList<byte> GFSKSyncWord { get; private set; }
-
         /// <summary>
         /// Gets or sets datarate to configuration and max payload size (M)
         /// max application payload size N should be N= M-8 bytes.
@@ -98,14 +94,11 @@ public abstract class Region
         /// </summary>
         public int MaxADRDataRate { get; set; }
 
-        protected Region(LoRaRegionType regionEnum, byte loRaSyncWord, byte[] gFSKSyncWord, (double frequency, ushort datr) rx2DefaultReceiveWindows)
+        protected Region(LoRaRegionType regionEnum, (double frequency, ushort datr) rx2DefaultReceiveWindows)
         {
             LoRaRegion = regionEnum;
             RetransmitTimeout = (min: 1, max: 3);
 
-            LoRaSyncWord = loRaSyncWord;
-            GFSKSyncWord = gFSKSyncWord;
-
             RX2DefaultReceiveWindows = rx2DefaultReceiveWindows;
             ReceiveDelay1 = 1;
             ReceiveDelay2 = 2;

diff --git a/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/Regions/RegionCN470.cs b/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/Regions/RegionCN470.cs
@@ -17,10 +17,7 @@ public class RegionCN470 : Region
         private readonly List<List<double>> DownstreamFrequenciesByPlanType;
 
         public RegionCN470()
-            : base(
-                  LoRaRegionType.CN470,
-                  0x34,
-                  null,
+            : base(LoRaRegionType.CN470,
                   (frequency: 485.3, datr: 1)) // TODO: support multiple RX2 receive windows, see #561
         {
             // Values assuming FOpts param is not used

diff --git a/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/Regions/RegionEU868.cs b/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/Regions/RegionEU868.cs
@@ -4,17 +4,13 @@
 namespace LoRaTools.Regions
 {
     using LoRaTools.LoRaPhysical;
-    using LoRaTools.Utils;
     using System;
 
     public class RegionEU868 : Region
     {
         public RegionEU868()
-            : base(
-                  LoRaRegionType.EU868,
-                  0x34,
-                  ConversionHelper.StringToByteArray("C194C1"),
-                  (frequency: 869.525, datr: 0))
+            : base(LoRaRegionType.EU868,
+                   (frequency: 869.525, datr: 0))
         {
         }
 

diff --git a/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/Regions/RegionUS915.cs b/LoRaEngine/modules/LoRaWanNetworkSrvModule/LoraTools/Regions/RegionUS915.cs
@@ -14,11 +14,8 @@ public class RegionUS915 : Region
         private static readonly double[] DownstreamChannelFrequencies = new double[] { 923.3, 923.9, 924.5, 925.1, 925.7, 926.3, 926.9, 927.5 };
 
         public RegionUS915()
-            : base(
-                  LoRaRegionType.US915,
-                  0x34,
-                  null, // no GFSK in US Band
-                  (frequency: 923.3, datr: 8))
+            : base(LoRaRegionType.US915,
+                   (frequency: 923.3, datr: 8))
         {
         }