fix: Revert characteristics on WeVibe and Youcups

Changed WeVibe and Youcups to use characteristic generation. This breaks WeVibe, and I don't have a Youcups to test this on, so it's best to just revert things to how they were. Fixes#423

Author: qdot

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

@@ -42,15 +42,15 @@ public void TestStopDeviceCmd()
 varexpected=
 newList<(byte[],uint)>()
 {
-(newbyte[]{0x0f,0x03,0x00,0x88,0x00,0x03,0x00,0x00},testUtil.NoCharacteristic),
+(newbyte[]{0x0f,0x03,0x00,0x88,0x00,0x03,0x00,0x00},(uint)WeVibeBluetoothInfo.Chrs.Tx),
 };
 
 testUtil.TestDeviceMessage(newSingleMotorVibrateCmd(4,0.5),expected,false);
 
 expected=
 newList<(byte[],uint)>()
 {
-(newbyte[]{0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00},testUtil.NoCharacteristic),
+(newbyte[]{0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00},(uint)WeVibeBluetoothInfo.Chrs.Tx),
 };
 
 testUtil.TestDeviceMessage(newStopDeviceCmd(4),expected,false);
@@ -62,7 +62,7 @@ public void TestSingleMotorVibrateCmd()
 varexpected=
 newList<(byte[],uint)>()
 {
-(newbyte[]{0x0f,0x03,0x00,0x88,0x00,0x03,0x00,0x00},testUtil.NoCharacteristic),
+(newbyte[]{0x0f,0x03,0x00,0x88,0x00,0x03,0x00,0x00},(uint)WeVibeBluetoothInfo.Chrs.Tx),
 };
 
 testUtil.TestDeviceMessage(newSingleMotorVibrateCmd(4,0.5),expected,false);
@@ -74,7 +74,7 @@ public void TestVibrateCmd()
 varexpected=
 newList<(byte[],uint)>()
 {
-(newbyte[]{0x0f,0x03,0x00,0x88,0x00,0x03,0x00,0x00},testUtil.NoCharacteristic),
+(newbyte[]{0x0f,0x03,0x00,0x88,0x00,0x03,0x00,0x00},(uint)WeVibeBluetoothInfo.Chrs.Tx),
 };
 
 testUtil.TestDeviceMessage(VibrateCmd.Create(4,1,0.5,1),expected,false);
@@ -119,15 +119,15 @@ public void TestStopDeviceCmd()
 varexpected=
 newList<(byte[],uint)>()
 {
-(newbyte[]{0x0f,0x03,0x00,0x88,0x00,0x03,0x00,0x00},testUtil.NoCharacteristic),
+(newbyte[]{0x0f,0x03,0x00,0x88,0x00,0x03,0x00,0x00},(uint)WeVibeBluetoothInfo.Chrs.Tx),
 };
 
 testUtil.TestDeviceMessage(newSingleMotorVibrateCmd(4,0.5),expected,false);
 
 expected=
 newList<(byte[],uint)>()
 {
-(newbyte[]{0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00},testUtil.NoCharacteristic),
+(newbyte[]{0x0f,0x00,0x00,0x00,0x00,0x00,0x00,0x00},(uint)WeVibeBluetoothInfo.Chrs.Tx),
 };
 
 testUtil.TestDeviceMessage(newStopDeviceCmd(4),expected,false);
@@ -139,7 +139,7 @@ public void TestSingleMotorVibrateCmd()
 varexpected=
 newList<(byte[],uint)>()
 {
-(newbyte[]{0x0f,0x03,0x00,0x88,0x00,0x03,0x00,0x00},testUtil.NoCharacteristic),
+(newbyte[]{0x0f,0x03,0x00,0x88,0x00,0x03,0x00,0x00},(uint)WeVibeBluetoothInfo.Chrs.Tx),
 };
 
 testUtil.TestDeviceMessage(newSingleMotorVibrateCmd(4,0.5),expected,false);
@@ -151,10 +151,10 @@ public void TestVibrateCmd()
 varexpected=
 newList<(byte[],uint)>()
 {
-(newbyte[]{0x0f,0x03,0x00,0x4B,0x00,0x03,0x00,0x00},testUtil.NoCharacteristic),
+(newbyte[]{0x0f,0x03,0x00,0x4B,0x00,0x03,0x00,0x00},(uint)WeVibeBluetoothInfo.Chrs.Tx),
 };
 
-testUtil.TestDeviceMessage(VibrateCmd.Create(4,1,newdouble[]{0.25,0.75},2),expected,false);
+testUtil.TestDeviceMessage(VibrateCmd.Create(4,1,new[]{0.25,0.75},2),expected,false);
 }
 
 [Test]

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

@@ -40,15 +40,15 @@ public void TestStopDeviceCmd()
 varexpected=
 newList<(byte[],uint)>()
 {
-(Encoding.ASCII.GetBytes("$SYS,4?"),testUtil.NoCharacteristic),
+(Encoding.ASCII.GetBytes("$SYS,4?"),(uint)YoucupsBluetoothInfo.Chrs.Tx),
 };
 
 testUtil.TestDeviceMessage(newSingleMotorVibrateCmd(4,0.5),expected,false);
 
 expected=
 newList<(byte[],uint)>()
 {
-(Encoding.ASCII.GetBytes("$SYS,0?"),testUtil.NoCharacteristic),
+(Encoding.ASCII.GetBytes("$SYS,0?"),(uint)YoucupsBluetoothInfo.Chrs.Tx),
 };
 
 testUtil.TestDeviceMessage(newStopDeviceCmd(4),expected,false);
@@ -60,7 +60,7 @@ public void TestSingleMotorVibrateCmd()
 varexpected=
 newList<(byte[],uint)>()
 {
-(Encoding.ASCII.GetBytes("$SYS,4?"),testUtil.NoCharacteristic),
+(Encoding.ASCII.GetBytes("$SYS,4?"),(uint)YoucupsBluetoothInfo.Chrs.Tx),
 };
 
 testUtil.TestDeviceMessage(newSingleMotorVibrateCmd(4,0.5),expected,false);
@@ -72,7 +72,7 @@ public void TestVibrateCmd()
 varexpected=
 newList<(byte[],uint)>()
 {
-(Encoding.ASCII.GetBytes("$SYS,4?"),testUtil.NoCharacteristic),
+(Encoding.ASCII.GetBytes("$SYS,4?"),(uint)YoucupsBluetoothInfo.Chrs.Tx),
 };
 
 testUtil.TestDeviceMessage(VibrateCmd.Create(4,1,0.5,1),expected,false);

Buttplug.Server/Bluetooth/Devices/WeVibe.cs

@@ -8,7 +8,13 @@
 namespaceButtplug.Server.Bluetooth.Devices
 {
 internalclassWeVibeBluetoothInfo:IBluetoothDeviceInfo
-{
+{
+publicenumChrs:uint
+{
+Tx=0,
+Rx,
+}
+
 publicGuid[]Services{get;}={newGuid("f000bb03-0451-4000-b000-000000000000")};
 
 publicstring[]NamePrefixes{get;}={};
@@ -32,7 +38,13 @@ internal class WeVibeBluetoothInfo : IBluetoothDeviceInfo
 "Wish",
 };
 
-publicDictionary<uint,Guid>Characteristics{get;}=newDictionary<uint,Guid>();
+// WeVibe causes the characteristic detector to misidentify characteristics. Do not remove these.
+publicDictionary<uint,Guid>Characteristics{get;}=newDictionary<uint,Guid>()
+{
+// tx characteristic
+{(uint)Chrs.Tx,newGuid("f000c000-0451-4000-b000-000000000000")},
+{(uint)Chrs.Rx,newGuid("f000b000-0451-4000-b000-000000000000")},
+};
 
 publicIButtplugDeviceCreateDevice(IButtplugLogManageraLogManager,
 IBluetoothDeviceInterfaceaInterface)
@@ -146,7 +158,7 @@ private async Task<ButtplugMessage> HandleVibrateCmd(ButtplugDeviceMessage aMsg)
 data[5]=0x00;
 }
 
-returnawaitInterface.WriteValue(aMsg.Id,data);
+returnawaitInterface.WriteValue(aMsg.Id,(uint)WeVibeBluetoothInfo.Chrs.Tx,data);
 }
 }
-}
+}

Buttplug.Server/Bluetooth/Devices/Youcups.cs

@@ -1,14 +1,19 @@
-usingSystem;
+usingButtplug.Core;
+usingButtplug.Core.Messages;
+usingSystem;
 usingSystem.Collections.Generic;
 usingSystem.Text;
 usingSystem.Threading.Tasks;
-usingButtplug.Core;
-usingButtplug.Core.Messages;
 
 namespaceButtplug.Server.Bluetooth.Devices
 {
 internalclassYoucupsBluetoothInfo:IBluetoothDeviceInfo
 {
+publicenumChrs:uint
+{
+Tx=0,
+}
+
 publicGuid[]Services{get;}={newGuid("0000fee9-0000-1000-8000-00805f9b34fb")};
 
 publicstring[]NamePrefixes{get;}={};
@@ -19,7 +24,10 @@ internal class YoucupsBluetoothInfo : IBluetoothDeviceInfo
 "Youcups",
 };
 
-publicDictionary<uint,Guid>Characteristics{get;}=newDictionary<uint,Guid>();
+publicDictionary<uint,Guid>Characteristics{get;}=newDictionary<uint,Guid>()
+{
+{(uint)Chrs.Tx,newGuid("d44bc439-abfd-45a2-b575-925416129600")},
+};
 
 publicIButtplugDeviceCreateDevice(IButtplugLogManageraLogManager,
 IBluetoothDeviceInterfaceaInterface)
@@ -107,4 +115,4 @@ private async Task<ButtplugMessage> HandleVibrateCmd(ButtplugDeviceMessage aMsg)
 Encoding.ASCII.GetBytes($"$SYS,{(int)(_vibratorSpeed*8),1}?"));
 }
 }
-}
+}