- implemented manual mode

- code cleanup
RonSijm · Jan 7, 2023 · 49bf769 · 49bf769
1 parent 5ecde19
commit 49bf769
Show file tree

Hide file tree

Showing 31 changed files with 350 additions and 265 deletions.
diff --git a/RonSijm.ButtFish.Tests/FENToAsciiTest.cs b/RonSijm.ButtFish.Tests/FENToAsciiTest.cs
@@ -1,6 +1,5 @@
-using FluentAssertions;
-using RonSijm.ButtFish.Ascii;
-
+
+// ReSharper disable StringLiteralTypo
 namespace RonSijm.ButtFish.Tests;
 
 public class FENToAsciiTest

diff --git a/RonSijm.ButtFish.Tests/Properties/GlobalUsings.cs b/RonSijm.ButtFish.Tests/Properties/GlobalUsings.cs
@@ -1 +1,3 @@
-global using Xunit;
+global using Xunit;
+global using FluentAssertions;
+global using RonSijm.ButtFish.Ascii;
diff --git a/RonSijm.ButtFish.Tests/RonSijm.ButtFish.Tests.csproj b/RonSijm.ButtFish.Tests/RonSijm.ButtFish.Tests.csproj
@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
   <PropertyGroup>
     <TargetFramework>net7.0</TargetFramework>
@@ -10,7 +10,7 @@
 
   <ItemGroup>
     <PackageReference Include="FluentAssertions" Version="6.8.0" />
-    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.0" />
+    <PackageReference Include="Microsoft.NET.Test.Sdk" Version="17.4.1" />
     <PackageReference Include="xunit" Version="2.4.2" />
     <PackageReference Include="xunit.runner.visualstudio" Version="2.4.5">
       <IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>

diff --git a/RonSijm.ButtFish/Ascii/AsciiToColerfulOutput.cs b/RonSijm.ButtFish/Ascii/AsciiToColerfulOutput.cs
@@ -1,6 +1,4 @@
-using System.Drawing;
-
-namespace RonSijm.ButtFish.Ascii;
+namespace RonSijm.ButtFish.Ascii;
 
 public static class AsciiToColorfulOutput
 {
@@ -10,16 +8,16 @@ public static void AsciiToConsole(string ascii)
         {
             if (char.IsUpper(character))
             {
-                Colorful.Console.Write(character, Color.DarkSeaGreen);
+                Console.Write(character, Color.DarkSeaGreen);
             }
             else if (char.IsLower(character))
             {
-                Colorful.Console.Write(character, Color.CornflowerBlue);
+                Console.Write(character, Color.CornflowerBlue);
             }
             else
             {
 
-                Colorful.Console.Write(character, Color.SaddleBrown);
+                Console.Write(character, Color.SaddleBrown);
             }
         }
     }

diff --git a/RonSijm.ButtFish/Ascii/FENToOutputFacade.cs b/RonSijm.ButtFish/Ascii/FENToOutputFacade.cs
@@ -1,6 +1,4 @@
-using System.Drawing;
-
-namespace RonSijm.ButtFish.Ascii;
+namespace RonSijm.ButtFish.Ascii;
 
 public static class FENToOutputFacade
 {
@@ -23,7 +21,7 @@ public static bool PaintBoard(string fenPosition)
         }
         catch (Exception e)
         {
-            Colorful.Console.WriteLine($"Error: {e}", Color.Red);
+            Console.WriteLine($"Error: {e}", Color.Red);
             return false;
         }
     }

diff --git a/RonSijm.ButtFish/Ascii/LoopHelper.cs b/RonSijm.ButtFish/Ascii/LoopHelper.cs
@@ -1,22 +1,21 @@
-namespace RonSijm.ButtFish.Ascii
+namespace RonSijm.ButtFish.Ascii;
+
+internal static class Loop
 {
-    internal static class Loop
+    internal static IEnumerable<int> Between(int minValue, int maxValue, bool inverted)
     {
-        internal static IEnumerable<int> Between(int minValue, int maxValue, bool inverted)
+        if (!inverted)
         {
-            if (!inverted)
+            for (var i = minValue; i < maxValue; i++)
             {
-                for (var i = minValue; i < maxValue; i++)
-                {
-                    yield return i;
-                }
+                yield return i;
             }
-            else
+        }
+        else
+        {
+            for (var i = maxValue - 1; i >= minValue; i--)
             {
-                for (var i = maxValue - 1; i >= minValue; i--)
-                {
-                    yield return i;
-                }
+                yield return i;
             }
         }
     }

diff --git a/RonSijm.ButtFish/ButtFishCore.cs b/RonSijm.ButtFish/ButtFishCore.cs
diff --git a/RonSijm.ButtFish/Connectors/ButtplugConnector.cs b/RonSijm.ButtFish/Connectors/ButtplugConnector.cs
@@ -1,6 +1,4 @@
-using System.Drawing;
-using Buttplug;
-using RonSijm.ButtFish.Models;
+using Buttplug;
 
 namespace RonSijm.ButtFish.Connectors;
 
@@ -12,7 +10,7 @@ public async Task<List<IDeviceAbstraction>> GetDiscoveredDevices(string discover
     {
         Console.WriteLine(discoverAddress == null ? "Starting to scan for ButtPlug Devices..." : $"Attempting to connect to {discoverAddress}...");
 
-        Colorful.Console.WriteLine("Will return results after 5 seconds.", Color.Green);
+        Console.WriteLine("Will return results after 5 seconds.", Color.Green);
 
         if (discoverAddress == null)
         {

diff --git a/RonSijm.ButtFish/Connectors/DeviceConnector.cs b/RonSijm.ButtFish/Connectors/DeviceConnector.cs
@@ -1,6 +1,4 @@
-using RonSijm.ButtFish.Models;
-
-namespace RonSijm.ButtFish.Connectors;
+namespace RonSijm.ButtFish.Connectors;
 
 public class DeviceConnector
 {

diff --git a/RonSijm.ButtFish/Connectors/YeelightConnector.cs b/RonSijm.ButtFish/Connectors/YeelightConnector.cs
@@ -1,5 +1,4 @@
-using RonSijm.ButtFish.Models;
-using YeelightAPI;
+using YeelightAPI;
 
 namespace RonSijm.ButtFish.Connectors;
 

diff --git a/RonSijm.ButtFish/DeviceBroadcaster.cs b/RonSijm.ButtFish/DeviceBroadcaster.cs
@@ -0,0 +1,43 @@
+namespace RonSijm.ButtFish;
+
+public class DeviceBroadcaster
+{
+    private readonly ICharacterEncoder _characterEncoder;
+
+    public DeviceBroadcaster(ICharacterEncoder characterEncoder)
+    {
+        _characterEncoder = characterEncoder;
+    }
+
+    public async Task SendNextMoveToDevice(string nextPosition, IList<IDeviceAbstraction> devices)
+    {
+        Console.WriteLine(nextPosition);
+
+        foreach (var nextPositionChar in nextPosition)
+        {
+            var morseCodeForChar = _characterEncoder.EncodeCharacter(nextPositionChar);
+
+            if (morseCodeForChar == null)
+            {
+                continue;
+            }
+
+            Console.Write($"({nextPositionChar})");
+
+            foreach (var durationToSend in morseCodeForChar.Select(morseCodeChar => morseCodeChar == '.' ? TimeUnitConfig.DotTime : TimeUnitConfig.DashTime))
+            {
+                Task.WaitAll(devices.Select(device => device.SendDuration(durationToSend)).ToArray());
+
+                // Wait 1 time unit
+                Console.Write(" ");
+                await Task.Delay(TimeUnitConfig.SpaceBetweenSymbols);
+            }
+
+            // wait 3 time units
+            await Task.Delay(TimeUnitConfig.SpaceBetweenLetters);
+        }
+
+        Console.WriteLine();
+        Console.WriteLine("Finished sending command to device.", Color.Green);
+    }
+}