Merge branch 'develop'

Author: MoshiMoshi0

Assets/logo-512.png

@@ -1,3 +1,4 @@
+using System;
 using System.Collections.Generic;
 using System.Diagnostics;
 using System.IO;
@@ -38,6 +39,24 @@ class Build : NukeBuild
 
     AbsolutePath ServiceBinPath => SourceDirectory / "TTController.Service" / "bin" / Configuration;
 
+    protected override void OnBuildFinished()
+    {
+        if (string.Compare(InvokedTargets.Last().Name, "Run", true) != 0)
+            return;
+
+        Console.Out.Flush();
+        Console.Clear();
+
+        var process = Process.Start(new ProcessStartInfo()
+        {
+            FileName = ServiceBinPath / "TTController.Service.exe",
+            WorkingDirectory = ServiceBinPath,
+            UseShellExecute = false
+        });
+
+        process.WaitForExit();
+    }
+
     Target Clean => _ => _
         .Before(Restore)
         .Executes(() =>
@@ -93,15 +112,7 @@ class Build : NukeBuild
         });
 
     Target Run => _ => _
-        .DependsOn(Compile)
-        .Executes(() =>
-        {
-            Process.Start(new ProcessStartInfo()
-            {
-                FileName = ServiceBinPath / "TTController.Service.exe",
-                UseShellExecute = true
-            });
-        });
+        .DependsOn(Compile);
 
     Target Pack => _ => _
         .DependsOn(Clean)

Assets/logo.ico

@@ -49,7 +49,7 @@ public override IDictionary<PortIdentifier, List<LedColor>> GenerateColors(List<
                 for (var i = 0; i < length; i++)
                 {
                     var idx = Wrap(_rotation - i, config.LedCount);
-                    colors[idx] = LedColor.FromHsv(hue, saturation, value - (double)i / length);
+                    colors[idx] = LedColor.FromHsv(hue, saturation, value * (length - i) / length);
                 }
 
                 result.Add(port, colors);

Build/Build.cs

@@ -8,7 +8,7 @@
     <AppendRuntimeIdentifierToOutputPath>false</AppendRuntimeIdentifierToOutputPath>
   </PropertyGroup>
   <ItemGroup>
-    <PackageReference Include="Newtonsoft.Json" Version="12.0.1" />
+    <PackageReference Include="Newtonsoft.Json" Version="12.0.2" />
   </ItemGroup>
   <ItemGroup>
     <ProjectReference Include="..\..\..\Source\TTController.Common\TTController.Common.csproj" />

Plugins/Effects/TTController.Plugin.RippleEffect/RippleEffect.cs

@@ -6,7 +6,7 @@ namespace TTController.Service.Controller.Definition
 {
     public class DpsgControllerDefinition : IControllerDefinition
     {
-        public string Name => "Dpsg Controller";
+        public string Name => "Dpsg";
         public int VendorId => 0x264a;
         public IEnumerable<int> ProductIds { get { yield return 0x2329; } }
         public int PortCount => 0;

Plugins/SpeedControllers/TTController.Plugin.PwmSpeedController/TTController.Plugin.PwmSpeedController.csproj

@@ -7,7 +7,7 @@ namespace TTController.Service.Controller.Definition
 {
     public class RiingControllerDefinition : IControllerDefinition
     {
-        public string Name => "Riing Controller";
+        public string Name => "Riing";
         public int VendorId => 0x264a;
         public IEnumerable<int> ProductIds => Enumerable.Range(0, 16).Select(x => 0x1f41 + x);
         public int PortCount => 5;

Source/TTController.Service/Controller/Definition/DpsgControllerDefinition.cs

@@ -7,7 +7,7 @@ namespace TTController.Service.Controller.Definition
 {
     public class RiingPlusControllerDefinition : IControllerDefinition
     {
-        public string Name => "Riing Plus Controller";
+        public string Name => "Riing Plus";
         public int VendorId => 0x264a;
         public IEnumerable<int> ProductIds => Enumerable.Range(0, 16).Select(x => 0x1fa5 + x);
         public int PortCount => 5;

Source/TTController.Service/Controller/Definition/RiingControllerDefinition.cs

@@ -7,7 +7,7 @@ namespace TTController.Service.Controller.Definition
 {
     public class RiingTrioControllerDefinition : IControllerDefinition
     {
-        public string Name => "Riing Trio Controller";
+        public string Name => "Riing Trio";
         public int VendorId => 0x264a;
         public IEnumerable<int> ProductIds => Enumerable.Range(0, 16).Select(x => 0x2135 + x);
         public int PortCount => 5;

Source/TTController.Service/Controller/Definition/RiingPlusControllerDefinition.cs

@@ -30,17 +30,19 @@ public bool WriteBytes(params byte[] bytes)
 
             Logger.Trace("W[{vid}, {pid}] {data}", _device.Attributes.VendorId, _device.Attributes.ProductId, data);
 
-            return _device.Write(data);
+            return _device.Write(data, 1000);
         }
 
         public bool WriteBytes(IEnumerable<byte> bytes) =>
             WriteBytes(bytes.ToArray());
 
         public byte[] ReadBytes()
         {
-            var data = _device.Read();
-            if (data.Status != HidDeviceData.ReadStatus.Success)
+            var data = _device.Read(1000);
+            if (data.Status != HidDeviceData.ReadStatus.Success) {
+                Logger.Warn("Read from [{0}, {1}] failed with status \"{2}\"!", _device.Attributes.VendorId, _device.Attributes.ProductId, data.Status);
                 return null;
+            }
 
             Logger.Trace("R[{vid}, {pid}] {data}", _device.Attributes.VendorId, _device.Attributes.ProductId, data.Data);