Merge branch 'develop'

Author: MoshiMoshi0

Build/Build.cs

@@ -49,8 +49,11 @@ class Build : NukeBuild
             ThirdPartyDirectory.GlobDirectories("**/bin", "**/obj").ForEach(DeleteDirectory);
 
             // Clean service bin path but leave 'config.json' file
-            ServiceBinPath.GlobDirectories("*").ForEach(DeleteDirectory);
-            ServiceBinPath.GlobFiles("*").Where(f => !f.ToString().EndsWith("config.json")).ForEach(DeleteFile);
+            if (Directory.Exists(ServiceBinPath))
+            {
+                ServiceBinPath.GlobDirectories("*").ForEach(DeleteDirectory);
+                ServiceBinPath.GlobFiles("*").Where(f => !f.ToString().EndsWith("config.json")).ForEach(DeleteFile);
+            }
 
             EnsureCleanDirectory(ArtifactsDirectory);
         });

Plugins/Devices/TTController.Plugin.DpsgController/DpsgControllerProxy.cs

@@ -60,8 +60,8 @@ public override PortData GetPortData(byte port)
             // WATTS = VVOut33 * VIOut33
             // EFF = (int)((VVOut12 * VIOut12 + VVOut5 * VIOut5 + VVOut33 * VIOut33) / 10.0)
 
-            byte[] GetData(byte b) => Device.WriteReadBytes(0x31, b).Take(2).ToArray();
-            string GetDataAsString(byte b) => $"{string.Concat(GetData(b).Select(x => x.ToString("X2")))}";
+            byte[] GetData(byte b) => Device.WriteReadBytes(0x31, b)?.Skip(3).Take(2).ToArray();
+            string GetDataAsString(byte b) => $"{string.Concat(GetData(b)?.Select(x => $"{x:X2}") ?? Enumerable.Empty<string>())}";
 
             var data = new PortData()
             {

Plugins/Devices/TTController.Plugin.RiingController/RiingControllerDefinition.cs

@@ -11,6 +11,6 @@ public class RiingControllerDefinition : IControllerDefinition
         public int VendorId => 0x264a;
         public IEnumerable<int> ProductIds => Enumerable.Range(0, 16).Select(x => 0x1f41 + x);
         public int PortCount => 5;
-        public Type ControllerProxyType => typeof(DefaultControllerProxy);
+        public Type ControllerProxyType => typeof(RiingControllerProxy);
     }
 }

Plugins/Devices/TTController.Plugin.RiingController/RiingControllerProxy.cs

@@ -0,0 +1,29 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+using TTController.Common;
+using TTController.Common.Plugin;
+
+namespace TTController.Plugin.RiingController
+{
+    public class RiingControllerProxy : DefaultControllerProxy
+    {
+        public RiingControllerProxy(IHidDeviceProxy device, IControllerDefinition definition)
+            : base(device, definition)
+        { }
+
+        public override bool SetSpeed(byte port, byte speed) =>
+            Device.WriteReadBytes(0x32, 0x51, port, 0x03, speed)?[3] == 0xfc;
+
+        protected override Dictionary<string, byte> GenerateAvailableEffects()
+        {
+            return new Dictionary<string, byte>()
+            {
+                ["Flow"] = 0x01,
+                ["Full"] = 0x00
+            };
+        }
+    }
+}

Plugins/Effects/TTController.Plugin.BlinkEffect/Properties/AssemblyInfo.cs

@@ -36,26 +36,56 @@ public override IDictionary<PortIdentifier, List<LedColor>> GenerateColors(List<
             {
                 _fill = 0;
                 _lastHue = _currentHue;
-                _currentHue = (_currentHue + Config.HueStep) % 360;
+                _currentHue = ((_currentHue + Config.HueStep) % 360 + 360) % 360;
             }
 
+            var lastColor = LedColor.FromHsv(_lastHue, Config.Saturation, Config.Brightness);
+            var currentColor = LedColor.FromHsv(_currentHue, Config.Saturation, Config.Brightness);
+
             var result = new Dictionary<PortIdentifier, List<LedColor>>();
-            foreach (var port in ports)
+            if(Config.ColorGenerationMethod == ColorGenerationMethod.PerPort)
             {
-                var config = cache.GetPortConfig(port);
-                if(config == null)
-                    continue;
+                foreach (var port in ports)
+                {
+                    var config = cache.GetPortConfig(port);
+                    if (config == null)
+                        continue;
 
-                var lastColor = LedColor.FromHsv(_lastHue, Config.Saturation, Config.Brightness);
-                var currentColor = LedColor.FromHsv(_currentHue, Config.Saturation, Config.Brightness);
+                    var colors = new List<LedColor>();
+                    for (var i = 0; i < config.LedCount; i++)
+                    {
+                        if (i < (int)Math.Round(config.LedCount * _fill))
+                            colors.Add(currentColor);
+                        else
+                            colors.Add(lastColor);
+                    }
 
-                var colors = Enumerable.Range(0, config.LedCount).Select(_ => lastColor).ToList();
-                for (var i = 0; i < (int) Math.Round(config.LedCount * _fill); i++)
+                    result.Add(port, colors);
+                }
+            }
+            else if(Config.ColorGenerationMethod == ColorGenerationMethod.SpanPorts)
+            {
+                var totalLength = ports.Select(p => cache.GetPortConfig(p)).Sum(c => c?.LedCount ?? 0);
+
+                var colors = new List<LedColor>();
+                for (var i = 0; i < totalLength; i++)
                 {
-                    colors[i] = currentColor;
+                    if (i < (int)Math.Round(totalLength * _fill))
+                        colors.Add(currentColor);
+                    else
+                        colors.Add(lastColor);
                 }
 
-                result.Add(port, colors);
+                var offset = 0;
+                foreach (var port in ports)
+                {
+                    var config = cache.GetPortConfig(port);
+                    if (config == null)
+                        continue;
+
+                    result.Add(port, colors.Skip(offset).Take(config.LedCount).ToList());
+                    offset += config.LedCount;
+                }
             }
 
             return result;