fix: Fix Lovense motor addressing

Vibrate:X drives all motors, VibrateN:X (where 0 <= N < number of vibrators) drives specific motors.
buttplugio · Jun 26, 2018 · 86cad2f · 86cad2f
1 parent cfafc33
commit 86cad2f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/src/server/bluetooth/devices/Lovense.ts b/src/server/bluetooth/devices/Lovense.ts
@@ -136,7 +136,7 @@ export class Lovense extends ButtplugBluetoothDevice {
                                 aMsg.Id);
     }
     for (const cmd of aMsg.Speeds) {
-      const index = cmd.Index > 0 ? (cmd.Index + 1).toString(10) : "";
+      const index = this._specs.VibrateCmd.FeatureCount > 1 ? (cmd.Index + 1).toString(10) : "";
       const speed = Math.floor(20 * cmd.Speed);
       await this._deviceImpl.WriteString("tx", `Vibrate${index}:${speed};`);
     }

diff --git a/tests/test-bluetoothdevices.ts b/tests/test-bluetoothdevices.ts
@@ -69,13 +69,13 @@ describe("WebBluetooth library tests", () => {
       .rejects
       .toHaveProperty("ErrorCode", ErrorClass.ERROR_DEVICE);
     await bp.SendDeviceMessage(bp.Devices[0], new VibrateCmd([new SpeedSubcommand(0, 1), new SpeedSubcommand(1, .5)]));
-    expect(mockBT.txChar.writeValue).toBeCalledWith(Buffer.from("Vibrate:20;"));
+    expect(mockBT.txChar.writeValue).toBeCalledWith(Buffer.from("Vibrate1:20;"));
     expect(mockBT.txChar.writeValue).toBeCalledWith(Buffer.from("Vibrate2:10;"));
     await bp.SendDeviceMessage(bp.Devices[0], new SingleMotorVibrateCmd(.5));
-    expect(mockBT.txChar.writeValue).toBeCalledWith(Buffer.from("Vibrate:10;"));
+    expect(mockBT.txChar.writeValue).toBeCalledWith(Buffer.from("Vibrate1:10;"));
     expect(mockBT.txChar.writeValue).toBeCalledWith(Buffer.from("Vibrate2:10;"));
     await bp.StopAllDevices();
-    expect(mockBT.txChar.writeValue).toBeCalledWith(Buffer.from("Vibrate:0;"));
+    expect(mockBT.txChar.writeValue).toBeCalledWith(Buffer.from("Vibrate1:0;"));
     expect(mockBT.txChar.writeValue).toBeCalledWith(Buffer.from("Vibrate2:0;"));
   });