From c156edbaf18fc24473b5647ca25c3a4c40364a67 Mon Sep 17 00:00:00 2001 From: blackspherefollower Date: Fri, 29 Mar 2019 18:20:35 +0000 Subject: [PATCH 1/3] feat: Adding more LiBo devices This change adds support for the LiBo LaLa, LuLu, Karen and Lottie, as well as mapping the product name of the ELLE (aka Whale). The Karen is mapped and registers with only the StopDeviceCommand since it doesn't have a vibe. The LaLa has a suction tip which is mapped as the second vibrator: this controls the 3 suction patterns, which would appear to only differ in on/off frequency, somewhat emulating intensity for a actuator that has no other clear means of providing intensity. The ELLE is actually mapped to Elle since the all-caps looks like a mistake. The vibe, which has 3 levels of intensity, is mapped to index 0 and the estim output is mapped to index 1. This may be controversial, but the device is not prickly at all, and does give vibe like feels. --- buttplug-device-config.yml | 15 ++++++++++++--- 1 file changed, 12 insertions(+), 3 deletions(-) diff --git a/buttplug-device-config.yml b/buttplug-device-config.yml index 62330c8..17b8565 100644 --- a/buttplug-device-config.yml +++ b/buttplug-device-config.yml @@ -167,15 +167,24 @@ protocols: libo: btle: names: - - PiPiJing + - PiPiJing # Whale/ELLE - Shock Egg + - XiaoLu # Lottie - Rabbit + - LuXiaoHan # LuLu - Egg + - SuoYinQiu # Karen - Kegel + - BaiHu # LaLa - Suction Rabbit services: # Write Service 00006000-0000-1000-8000-00805f9b34fb: - txshock: 00006001-0000-1000-8000-00805f9b34fb - txvibrate: 00006002-0000-1000-8000-00805f9b34fb + tx: 00006001-0000-1000-8000-00805f9b34fb + txmode: 00006002-0000-1000-8000-00805f9b34fb # Read Service (battery) # 00006050-0000-1000-8000-00805f9b34fb: # battery: 00006051-0000-1000-8000-00805f9b34fb + # 00006070-0000-1000-8000-00805f9b34fb: + # battery: 00006071-0000-1000-8000-00805f9b34fb + # Read Service (pressue) + # 00006050-0000-1000-8000-00805f9b34fb: + # battery: 00006051-0000-1000-8000-00805f9b34fb magic-motion: btle: names: From d0e669c94707b41e75430c11a1703828201a20f7 Mon Sep 17 00:00:00 2001 From: Kyle Machulis Date: Sun, 28 Apr 2019 15:59:14 -0700 Subject: [PATCH 2/3] chore: Fill in lovense characteristic values We used to be able to discover these, but if we want to work on iOS, we require the characteristics to be explicitly defined due to missing polyfill. Sadness. --- buttplug-device-config.yml | 36 +++++++++++++++++++++++++++--------- 1 file changed, 27 insertions(+), 9 deletions(-) diff --git a/buttplug-device-config.yml b/buttplug-device-config.yml index 17b8565..8394c17 100644 --- a/buttplug-device-config.yml +++ b/buttplug-device-config.yml @@ -147,15 +147,33 @@ protocols: names: - LVS-* services: - 0000fff0-0000-1000-8000-00805f9b34fb: null - 6e400001-b5a3-f393-e0a9-e50e24dcca9e: null - 50300001-0024-4bd4-bbd5-a6920e4c5653: null - 57300001-0023-4bd4-bbd5-a6920e4c5653: null - 5a300001-0024-4bd4-bbd5-a6920e4c5653: null - 50300001-0023-4bd4-bbd5-a6920e4c5653: null - 53300001-0023-4bd4-bbd5-a6920e4c5653: null - 5a300001-0023-4bd4-bbd5-a6920e4c5653: null - 4f300001-0023-4bd4-bbd5-a6920e4c5653: null + 0000fff0-0000-1000-8000-00805f9b34fb: + tx: 0000fff2-0000-1000-8000-00805f9b34fb + rx: 0000fff1-0000-1000-8000-00805f9b34fb + 6e400001-b5a3-f393-e0a9-e50e24dcca9e: + tx: 6e400002-b5a3-f393-e0a9-e50e24dcca9e + rx: 6e400003-b5a3-f393-e0a9-e50e24dcca9e + 50300001-0024-4bd4-bbd5-a6920e4c5653: + tx: 50300002-0024-4bd4-bbd5-a6920e4c5653 + rx: 50300003-0024-4bd4-bbd5-a6920e4c5653 + 57300001-0023-4bd4-bbd5-a6920e4c5653: + tx: 57300002-0023-4bd4-bbd5-a6920e4c5653 + rx: 57300003-0023-4bd4-bbd5-a6920e4c5653 + 5a300001-0024-4bd4-bbd5-a6920e4c5653: + tx: 5a300002-0024-4bd4-bbd5-a6920e4c5653 + rx: 5a300003-0024-4bd4-bbd5-a6920e4c5653 + 50300001-0023-4bd4-bbd5-a6920e4c5653: + tx: 50300002-0023-4bd4-bbd5-a6920e4c5653 + rx: 50300003-0023-4bd4-bbd5-a6920e4c5653 + 53300001-0023-4bd4-bbd5-a6920e4c5653: + tx: 53300002-0023-4bd4-bbd5-a6920e4c5653 + rx: 53300003-0023-4bd4-bbd5-a6920e4c5653 + 5a300001-0023-4bd4-bbd5-a6920e4c5653: + tx: 5a300002-0023-4bd4-bbd5-a6920e4c5653 + rx: 5a300003-0023-4bd4-bbd5-a6920e4c5653 + 4f300001-0023-4bd4-bbd5-a6920e4c5653: + tx: 4f300002-0023-4bd4-bbd5-a6920e4c5653 + rx: 4f300003-0023-4bd4-bbd5-a6920e4c5653 xinput: # This will actually be ANY gamepad that supports XInput. XInput # is its own connector type, so we don't have any special From a7ac30f3c7a07b27c301b4ed22f626d9a13a9f84 Mon Sep 17 00:00:00 2001 From: Kyle Machulis Date: Wed, 15 May 2019 20:15:03 -0700 Subject: [PATCH 3/3] Add MV Tenuto name Has same service/characteristics as Crescendo, but name contains trailing spaces, so it requires a wildcard --- buttplug-device-config.yml | 3 +++ 1 file changed, 3 insertions(+) diff --git a/buttplug-device-config.yml b/buttplug-device-config.yml index 8394c17..d73d41b 100644 --- a/buttplug-device-config.yml +++ b/buttplug-device-config.yml @@ -220,6 +220,9 @@ protocols: btle: names: - MV Crescendo + # Tenuto contains trailing spaces, so just deal with that + # using a wildcard. + - MV Tenuto* services: f0006900-110c-478B-B74B-6F403B364A9C: txmode: f0006901-110c-478B-B74B-6F403B364A9C