chore: Change LinearCmd.VectorSubcommands to LinearCmd.VectorSubcommand

To match other generic message subcommand names.

Author: qdot

Buttplug.Apps.ExampleClientGUI/ExampleClientPanel.xaml.cs

@@ -221,9 +221,9 @@ private void SendLinear2_Click(object sender, RoutedEventArgs e)
                 if (dev.AllowedMessages.ContainsKey("FleshlightLaunchFW12Cmd"))
                 {
                     _client.SendDeviceMessage(dev,
-                        new LinearCmd(dev.Index, new List<LinearCmd.VectorSubcommands>()
+                        new LinearCmd(dev.Index, new List<LinearCmd.VectorSubcommand>()
                         {
-                            new LinearCmd.VectorSubcommands(0,
+                            new LinearCmd.VectorSubcommand(0,
                                 Convert.ToUInt32(LinearDuration.Text),
                                 Linear2Position.Value),
                         }, _client.NextMsgId));

Buttplug.Core/Messages/Messages.cs

@@ -1078,7 +1078,7 @@ public class LinearCmd : ButtplugDeviceMessage
         /// Container object for representing a single linear motion command on a device that may
         /// have multiple independent linear actuated features.
         /// </summary>
-        public class VectorSubcommands
+        public class VectorSubcommand
         {
             private double _positionImpl;
 
@@ -1119,12 +1119,12 @@ public double Position
             }
 
             /// <summary>
-            /// Initializes a new instance of the <see cref="VectorSubcommands"/> class.
+            /// Initializes a new instance of the <see cref="VectorSubcommand"/> class.
             /// </summary>
             /// <param name="aIndex">Linear actuator index</param>
             /// <param name="aDuration">Duration of movement</param>
             /// <param name="aPosition">Goal position</param>
-            public VectorSubcommands(uint aIndex, uint aDuration, double aPosition)
+            public VectorSubcommand(uint aIndex, uint aDuration, double aPosition)
             {
                 Index = aIndex;
                 Duration = aDuration;
@@ -1136,15 +1136,15 @@ public VectorSubcommands(uint aIndex, uint aDuration, double aPosition)
         /// List of linear movement vectors.
         /// </summary>
         [JsonProperty(Required = Required.Always)]
-        public List<VectorSubcommands> Vectors;
+        public List<VectorSubcommand> Vectors;
 
         /// <summary>
         /// Initializes a new instance of the <see cref="LinearCmd"/> class.
         /// </summary>
         /// <param name="aDeviceIndex">Device index</param>
         /// <param name="aVectors">Movement vector list</param>
         /// <param name="aId">Message ID</param>
-        public LinearCmd(uint aDeviceIndex, List<VectorSubcommands> aVectors, uint aId = ButtplugConsts.DefaultMsgId)
+        public LinearCmd(uint aDeviceIndex, List<VectorSubcommand> aVectors, uint aId = ButtplugConsts.DefaultMsgId)
             : base(aId, aDeviceIndex, 1)
         {
             Vectors = aVectors;

Buttplug.Server.Test/Bluetooth/Devices/FleshlightLaunchTests.cs

@@ -70,9 +70,9 @@ public void TestRepeatedFleshlightLaunchFW12Cmd()
         [Test]
         public void TestVectorCmd()
         {
-            var msg = new LinearCmd(4, new List<LinearCmd.VectorSubcommands>
+            var msg = new LinearCmd(4, new List<LinearCmd.VectorSubcommand>
             {
-                new LinearCmd.VectorSubcommands(0, 500, 0.5),
+                new LinearCmd.VectorSubcommand(0, 500, 0.5),
             });
             testUtil.TestDeviceMessage(msg,
                 new List<(byte[], uint)>()
@@ -85,10 +85,10 @@ public void TestVectorCmd()
         public void TestInvalidVectorCmdTooManyFeatures()
         {
             var msg = new LinearCmd(4,
-                new List<LinearCmd.VectorSubcommands>
+                new List<LinearCmd.VectorSubcommand>
                 {
-                    new LinearCmd.VectorSubcommands(0, 500, 0.75),
-                    new LinearCmd.VectorSubcommands(1, 500, 0.75),
+                    new LinearCmd.VectorSubcommand(0, 500, 0.75),
+                    new LinearCmd.VectorSubcommand(1, 500, 0.75),
                 });
             testUtil.TestInvalidDeviceMessage(msg);
         }
@@ -97,9 +97,9 @@ public void TestInvalidVectorCmdTooManyFeatures()
         public void TestInvalidVectorCmdWrongFeatures()
         {
             var msg = new LinearCmd(4,
-                new List<LinearCmd.VectorSubcommands>
+                new List<LinearCmd.VectorSubcommand>
                 {
-                    new LinearCmd.VectorSubcommands(0xffffffff, 500, 0.75),
+                    new LinearCmd.VectorSubcommand(0xffffffff, 500, 0.75),
                 });
             testUtil.TestInvalidDeviceMessage(msg);
         }
@@ -108,7 +108,7 @@ public void TestInvalidVectorCmdWrongFeatures()
         public void TestInvalidVectorNotEnoughFeatures()
         {
             var msg = new LinearCmd(4,
-                new List<LinearCmd.VectorSubcommands>
+                new List<LinearCmd.VectorSubcommand>
                 {
                 });
             testUtil.TestInvalidDeviceMessage(msg);