Support for more KrakenX effects, fix DCB param eval

- Add Wings, CoveringMarquee, SpectrumWave effect support.
akmadian · Feb 27, 2019 · b9d66f9 · b9d66f9
1 parent 0e24d2a
commit b9d66f9
Show file tree

Hide file tree

Showing 10 changed files with 62 additions and 38 deletions.
diff --git a/.gitignore b/.gitignore
@@ -334,4 +334,6 @@ ASALocalRun/
 .localhistory/
 
 TestApp/
-NZXTSharpTesterApp/
+NZXTSharpTesterApp/
+Scripts/
+.vscode/
diff --git a/NZXTSharp/COM/USB/USBController.cs b/NZXTSharp/COM/USB/USBController.cs
@@ -20,7 +20,6 @@ internal class USBController
         private NZXTDeviceType _Type;
         private HIDDeviceID _ID;
         private int CurrProductID;
-        private INZXTDevice _Parent;
         private readonly HIDDeviceID _VendorID = HIDDeviceID.VendorID;
         private HidReport _LastReport;
         private bool _IsAttached = false;

diff --git a/NZXTSharp/Core/Common/Effects/CoveringMarquee.cs b/NZXTSharp/Core/Common/Effects/CoveringMarquee.cs
@@ -4,6 +4,7 @@
 
 using NZXTSharp;
 using NZXTSharp.HuePlus;
+using NZXTSharp.KrakenX;
 using NZXTSharp.Exceptions;
 
 namespace NZXTSharp
@@ -96,7 +97,15 @@ public List<byte[]> BuildBytes(NZXTDeviceType Type, IChannel Channel) {
 
                     return outList;
                 case NZXTDeviceType.KrakenX:
-                    // TODO
+                    List<byte[]> KrakenOutList = new List<byte[]>();
+                    DCB param = new DCB(Channel.ChannelByte, Param1.IsForward);
+                    for (int colorIndex = 0; colorIndex < _Colors.Length; colorIndex++) 
+                    {
+                        byte[] KrakenSettingsBytes = new byte[] {0x2, 0x4c, (byte)param.GetValue(), 0x04, new CISS(colorIndex, _Speed)};
+                        byte[] KrakenFinal = KrakenSettingsBytes.ConcatenateByteArr(Channel.BuildColorBytes(_Colors[colorIndex]));
+                        KrakenOutList.Add(KrakenFinal);
+                    }
+                    return KrakenOutList;
                 default:
                     return null;
             }

diff --git a/NZXTSharp/Core/Common/Effects/SpectrumWave.cs b/NZXTSharp/Core/Common/Effects/SpectrumWave.cs
@@ -63,7 +63,7 @@ public List<byte[]> BuildBytes(NZXTDeviceType Type, IChannel Channel) {
                     return new List<byte[]>() { final };
                 case NZXTDeviceType.KrakenX:
                     DCB param = new DCB(Channel.ChannelByte, Param1.IsForward);
-                    byte[] KrakenSettingsBytes = new byte[] { 0x42, 0x4c, (byte)param.GetValue(), 0x02, (byte)speed };
+                    byte[] KrakenSettingsBytes = new byte[] { 0x2, 0x4c, (byte)param.GetValue(), 0x02, (byte)speed };
                     byte[] KrakenFinal = KrakenSettingsBytes.ConcatenateByteArr(Channel.BuildColorBytes(new Color(0, 0, 255)));
                     return new List<byte[]>() { KrakenFinal };
                 default:

diff --git a/NZXTSharp/Core/Common/Effects/Wings.cs b/NZXTSharp/Core/Common/Effects/Wings.cs
@@ -24,7 +24,7 @@ public class Wings : IEffect {
         /// <summary>
         /// The array of colors used by the effect.
         /// </summary>
-        public Color[] Colors;
+        public Color Color;
         private IChannel _Channel;
         private CISS _Param2;
         private int speed = 2;
@@ -41,42 +41,46 @@ public class Wings : IEffect {
         /// <summary>
         /// Constructs a <see cref="Wings"/> effect with the given <see cref="Color"/> array and speed.
         /// </summary>
-        /// <param name="Colors"></param>
+        /// <param name="Color"></param>
         /// <param name="Speed">Speed values must be 0-4 (inclusive). 0 being slowest, 2 being normal, and 4 being fastest. Defaults to 2.</param>
-        public Wings(Color[] Colors, int Speed = 2) {
-            this.Colors = Colors;
+        public Wings(Color Color, int Speed = 2) {
+            this.Color = Color;
             this.speed = Speed;
             ValidateParams();
         }
 
-        private void ValidateParams() {
-            if (this.Colors.Length > 15) {
-                throw new TooManyColorsProvidedException();
-            }
-
-            if (speed > 4 || speed < 0) {
+        private void ValidateParams() 
+        {
+            if (speed > 4 || speed < 0) 
+            {
                 throw new InvalidEffectSpeedException();
             }
         }
 
         /// <inheritdoc/>
-        public bool IsCompatibleWith(NZXTDeviceType Type) {
+        public bool IsCompatibleWith(NZXTDeviceType Type) 
+        {
             return CompatibleWith.Contains(Type) ? true : false;
         }
 
         /// <inheritdoc/>
-        public List<byte[]> BuildBytes(NZXTDeviceType Type, IChannel Channel) {
+        public List<byte[]> BuildBytes(NZXTDeviceType Type, IChannel Channel) 
+        {
             switch (Type) {
                 case NZXTDeviceType.HuePlus:
                     List<byte[]> outList = new List<byte[]>();
-                    for (int colorIndex = 0; colorIndex < Colors.Length; colorIndex++) {
-                        byte[] SettingsBytes = new byte[] { 0x4b, (byte)Channel.ChannelByte, 0x0c, 0x03, new CISS(colorIndex, this.speed) };
-                        byte[] final = SettingsBytes.ConcatenateByteArr(Channel.BuildColorBytes(Colors[colorIndex]));
-                        outList.Add(final);
-                    }
+                    byte[] SettingsBytes = new byte[] { 0x4b, (byte)Channel.ChannelByte, 0x0c, 0x03, new CISS(0, this.speed) };
+                    byte[] final = SettingsBytes.ConcatenateByteArr(Channel.BuildColorBytes(Color));
+                    outList.Add(final);
+
                     return outList;
                 case NZXTDeviceType.KrakenX:
-                    // TODO
+                    List<byte[]> KrakenXOutBytes = new List<byte[]>();
+                    byte[] KrakenXSettingsBytes = new byte[] { 0x02, 0x4c, (byte)Channel.ChannelByte, 0x0c, (byte)speed };
+                    byte[] KrakenXFinal = KrakenXSettingsBytes.ConcatenateByteArr(Channel.BuildColorBytes(Color));
+                    KrakenXOutBytes.Add(KrakenXFinal);
+
+                    return KrakenXOutBytes;
                 default:
                     return null;
             }

diff --git a/NZXTSharp/Core/Extensions.cs b/NZXTSharp/Core/Extensions.cs
@@ -98,14 +98,20 @@ public static byte[] PadColorArr(this byte[] thisone)
         }
 
         // TOFIX
-        public static string ColorArrToString(this byte[] thisone)
+        public static string ColorArrToString(this byte[] thisone, bool asHex = true)
         {
             StringBuilder sb = new StringBuilder();
             for (int i = 0; i < thisone.Length; i++)
             {
                 if (!(i % 12 == 0) || i == 0)
                 {
-                    sb.Append(thisone[i] + " ");
+                    if (asHex) 
+                    {
+                        sb.Append(thisone[i].ToString("X2") + " ");
+                    } else 
+                    {
+                        sb.Append(thisone[i].ToString("X2") + " ");
+                    }
                 } else
                 {
                     sb.Append("\n");

diff --git a/NZXTSharp/HuePlus/HuePlus.cs b/NZXTSharp/HuePlus/HuePlus.cs
@@ -362,7 +362,7 @@ private void SendLogEvent(string Message)
         private void SendDataRecvd(string Message)
         {
             var baseString = "NZXTSharp HuePlus " + (this.CustomName ?? "") + " - ";
-            OnDataReceived?.Invoke(baseString + Message);
+            //OnDataReceived?.Invoke(baseString + Message);
         }
 
         /// <summary>

diff --git a/NZXTSharp/KrakenX/KrakenX.cs b/NZXTSharp/KrakenX/KrakenX.cs
@@ -129,7 +129,6 @@ private void InitializeChannels()
             _Both = new KrakenXChannel(0x00, this);
             _Logo = new KrakenXChannel(0x01, this);
             _Ring = new KrakenXChannel(0x02, this);
-            Console.WriteLine("Channels Initialized");
         }
 
         private void InitializeDeviceInfo()
@@ -180,6 +179,7 @@ public void StopOverrideThread(OverrideThread Thread, ThreadStopType StopType =
         /// <param name="Effect">An <see cref="IEffect"/>.</param>
         public void ApplyEffect(IEffect Effect)
         {
+            System.Console.WriteLine("Type - " + Effect.GetType());
             ApplyEffect(this.Both, Effect);
         }
 
@@ -195,6 +195,7 @@ public void ApplyEffect(KrakenXChannel Channel, IEffect Effect, bool ApplyToChan
         {
 
             Console.WriteLine("Applying Effect");
+            System.Console.WriteLine("Type - " + Effect.GetType());
             Console.WriteLine(Channel.ChannelByte);
             if (!Effect.IsCompatibleWith(Type))
                 throw new IncompatibleEffectException("KrakenX", Effect.EffectName);
@@ -218,9 +219,17 @@ public void ApplyEffect(KrakenXChannel Channel, IEffect Effect, bool ApplyToChan
             }
 
             List<byte[]> CommandQueue = Effect.BuildBytes(Type, Channel);
-            //_COMController.SimulWrite(CommandQueue.ToArray());
-            foreach (byte[] Command in CommandQueue)
+            if (CommandQueue == null)
+                throw new NullReferenceException("CommandQueue for ApplyEffect returned null.");
+
+            Console.WriteLine("CQ Len - " + CommandQueue.Count);
+            foreach (byte[] Command in CommandQueue) 
+            {
+                System.Console.WriteLine("    Command Len - " + Command.Length.ToString("X2"));
+                System.Console.WriteLine(Command.ColorArrToString());
+                System.Console.WriteLine("\n");
                 _COMController.Write(Command);
+            }
         }
 
         /// <summary>

diff --git a/NZXTSharp/KrakenX/Params/DCB.cs b/NZXTSharp/KrakenX/Params/DCB.cs
@@ -71,7 +71,7 @@ public int GetValue()
         {
             string Dir = _IsForward ? "0" : "1";
             string CB = Channel != null ? Channel.ChannelByte.ToString() : ChannelByte.ToString();
-            return Convert.ToInt32(Dir + CB);
+            return int.Parse(Dir + CB, System.Globalization.NumberStyles.HexNumber);
         }
 
         /// <summary>

diff --git a/NZXTSharp/NZXTSharp.xml b/NZXTSharp/NZXTSharp.xml