Merge pull request #8 from oldrev/dev

Code Cleaning
oldrev · Dec 12, 2020 · 7870f34 · 7870f34
2 parents 683c772 + 1a4b9aa
commit 7870f34
Show file tree

Hide file tree

Showing 4 changed files with 13 additions and 21 deletions.
diff --git a/src/Sandwych.SmartConfig/Airkiss/AirkissSmartConfigProvider.cs b/src/Sandwych.SmartConfig/Airkiss/AirkissSmartConfigProvider.cs
@@ -1,4 +1,4 @@
-using Sandwych.SmartConfig.Airkiss.Protocol;
+using Sandwych.SmartConfig.Airkiss.Protocol;
 using Sandwych.SmartConfig.Protocol;
 using System;
 using System.Collections.Generic;
@@ -15,7 +15,7 @@ public class AirkissSmartConfigProvider : AbstractSmartConfigProvider
         {
             yield return (StandardOptionNames.BroadcastingTargetPort, 10001); // The port to broadcast doesn't matter
             yield return (StandardOptionNames.ListeningPort, 10000);
-            yield return (StandardOptionNames.FrameInterval, TimeSpan.FromMilliseconds(0));
+            yield return (StandardOptionNames.FrameInterval, TimeSpan.Zero);
             yield return (StandardOptionNames.SegmentInterval, TimeSpan.FromMilliseconds(5));
             yield return (StandardOptionNames.GuideCodeTimeout, TimeSpan.FromSeconds(2));
 

diff --git a/src/Sandwych.SmartConfig/Esptouch/EspSmartConfigProvider.cs b/src/Sandwych.SmartConfig/Esptouch/EspSmartConfigProvider.cs
@@ -1,4 +1,4 @@
-using Sandwych.SmartConfig.Esptouch.Protocol;
+using Sandwych.SmartConfig.Esptouch.Protocol;
 using Sandwych.SmartConfig.Protocol;
 using System;
 using System.Collections.Generic;
@@ -16,7 +16,7 @@ public override IDevicePacketInterpreter CreateDevicePacketInterpreter()
         {
             yield return (StandardOptionNames.BroadcastingTargetPort, 7001);
             yield return (StandardOptionNames.ListeningPort, 18266);
-            yield return (StandardOptionNames.FrameInterval, TimeSpan.FromMilliseconds(8));
+            yield return (StandardOptionNames.FrameInterval, TimeSpan.Zero);
             yield return (StandardOptionNames.SegmentInterval, TimeSpan.FromMilliseconds(8));
             yield return (StandardOptionNames.GuideCodeTimeout, TimeSpan.FromSeconds(2));
             yield return (EspOptionNames.DatumPeriodTimeout, TimeSpan.FromSeconds(4));

diff --git a/src/Sandwych.SmartConfig/Networking/DatagramBroadcaster.cs b/src/Sandwych.SmartConfig/Networking/DatagramBroadcaster.cs
@@ -74,10 +74,16 @@ private async Task BroadcastProcedureAsync(
                         await this.BroadcastSegmentUntilAsync(
                             context, segment, broadcastBuffer, userCancelToken);
                     }
-                    await Task.Delay(segmentInterval, userCancelToken);
+                    if (segmentInterval > TimeSpan.Zero)
+                    {
+                        await Task.Delay(segmentInterval, userCancelToken);
+                    }
                 }
 
-                await Task.Delay(segmentInterval, userCancelToken);
+                if (segmentInterval > TimeSpan.Zero)
+                {
+                    await Task.Delay(segmentInterval, userCancelToken);
+                }
             }
         }
 
@@ -98,6 +104,7 @@ private async Task BroadcastSegmentByTimesAsync(
             var segmentInterval = context.GetOption<TimeSpan>(StandardOptionNames.FrameInterval);
             for (int i = 0; i < segment.BroadcastingMaxTimes; i++)
             {
+                token.ThrowIfCancellationRequested();
                 await this.BroadcastSingleSegmentAsync(segment, broadcastBuffer, segmentInterval, token);
             }
         }

diff --git a/src/Sandwych.SmartConfig/Networking/DefaultDatagramClient.cs b/src/Sandwych.SmartConfig/Networking/DefaultDatagramClient.cs
@@ -41,20 +41,5 @@ public void Dispose()
             _udp.Dispose();
         }
 
-        private static int GetFirstWifiInterfaceIndex()
-        {
-            var adapters = NetworkInterface.GetAllNetworkInterfaces();
-            var wifi = adapters.Where(
-                x => x.NetworkInterfaceType == NetworkInterfaceType.Wireless80211
-                && x.OperationalStatus == OperationalStatus.Up
-                && !x.IsReceiveOnly
-            ).FirstOrDefault();
-            if(wifi == null)
-            {
-                throw new IOException("Cannot find available WiFi interface");
-            }
-            return wifi.GetIPProperties().GetIPv4Properties().Index;
-        }
-
     }
 }