Merge commit '2826469b551d2b04537b5ddc4dd031e7bd69a701' into dev

buttplugio · Jun 17, 2020 · 431db3f · 431db3f
2 parents 035d08a + 2826469
commit 431db3f
Show file tree

Hide file tree

Showing 2 changed files with 46 additions and 4 deletions.
diff --git a/dependencies/buttplug-device-config/buttplug-device-config.json b/dependencies/buttplug-device-config/buttplug-device-config.json
@@ -51,6 +51,10 @@
           "42300001-0023-4bd4-bbd5-a6920e4c5653": {
             "tx": "42300002-0023-4bd4-bbd5-a6920e4c5653",
             "rx": "42300003-0023-4bd4-bbd5-a6920e4c5653"
+          },
+          "43300001-0023-4bd4-bbd5-a6920e4c5653": {
+            "tx": "43300002-0023-4bd4-bbd5-a6920e4c5653",
+            "rx": "43300003-0023-4bd4-bbd5-a6920e4c5653"
           }
         }
       }
@@ -163,6 +167,7 @@
           "Bloom",
           "classic",
           "Classic",
+          "Chorus",
           "Ditto",
           "Gala",
           "Jive",
@@ -178,9 +183,11 @@
           "imassager",
           "Interactive Massager",
           "03",
+          "Skeena",
           "Sync",
           "Vector",
           "Verge",
+          "Wand",
           "Wish"
         ],
         "services": {
@@ -221,7 +228,8 @@
           "Pearl2",
           "Fuse",
           "Virtual Blowbot",
-          "Titan"
+          "Titan",
+          "Virtual Rabbit"
         ],
         "services": {
           "88f82580-0000-01e6-aace-0002a5d5c51b": {
@@ -236,7 +244,8 @@
       "btle": {
         "names": [
           "Onyx2.1",
-          "Titan1.1"
+          "Titan1.1",
+          "Onyx+"
         ],
         "services": {
           "00001900-0000-1000-8000-00805f9b34fb": {
@@ -328,7 +337,8 @@
         "names": [
           "CycSA",
           "Bach smart",
-          "UFOSA"
+          "UFOSA",
+          "VorzePiston"
         ],
         "services": {
           "40ee1111-63ec-4b7f-8ce7-712efd55b90e": {
@@ -396,7 +406,8 @@
     "motorbunny": {
       "btle": {
         "names": [
-          "MB Controller"
+          "MB Controller",
+          "MB LINK 201"
         ],
         "services": {
           "0000fff0-0000-1000-8000-00805f9b34fb": {
@@ -493,6 +504,19 @@
           }
         }
       }
+    },
+    "lovenuts": {
+      "btle": {
+        "names": [
+          "Love_Nuts"
+        ],
+        "services": {
+          "0000fff0-0000-1000-8000-00805f9b34fb": {
+            "tx": "0000fff1-0000-1000-8000-00805f9b34fb",
+            "rx": "0000fff1-0000-1000-8000-00805f9b34fb"
+          }
+        }
+      }
     }
   }
 }
diff --git a/dependencies/buttplug-device-config/buttplug-device-config.yml b/dependencies/buttplug-device-config/buttplug-device-config.yml
@@ -177,6 +177,9 @@ protocols:
         42300001-0023-4bd4-bbd5-a6920e4c5653: # Max 2
           tx: 42300002-0023-4bd4-bbd5-a6920e4c5653
           rx: 42300003-0023-4bd4-bbd5-a6920e4c5653
+        43300001-0023-4bd4-bbd5-a6920e4c5653:
+          tx: 43300002-0023-4bd4-bbd5-a6920e4c5653
+          rx: 43300003-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
@@ -278,6 +281,7 @@ protocols:
         - Bloom
         - classic
         - Classic
+        - Chorus
         - Ditto
         - Gala
         - Jive
@@ -293,9 +297,11 @@ protocols:
         - imassager # Reina alias
         - Interactive Massager # Reina alias
         - "03" # Reina alias
+        - Skeena # WeVibe 6? Possible alias for Chrous
         - Sync
         - Vector
         - Verge
+        - Wand
         - Wish
       services:
         f000bb03-0451-4000-b000-000000000000:
@@ -324,6 +330,7 @@ protocols:
         - Fuse
         - Virtual Blowbot
         - Titan
+        - Virtual Rabbit
       services:
         88f82580-0000-01e6-aace-0002a5d5c51b:
           tx: 88f82581-0000-01e6-aace-0002a5d5c51b
@@ -334,6 +341,7 @@ protocols:
       names:
         - Onyx2.1
         - Titan1.1
+        - Onyx+
       services:
         00001900-0000-1000-8000-00805f9b34fb:
           # Used to clear the whitelist
@@ -405,6 +413,7 @@ protocols:
         - CycSA
         - Bach smart
         - UFOSA
+        - VorzePiston
       services:
         40ee1111-63ec-4b7f-8ce7-712efd55b90e:
           tx: 40ee2222-63ec-4b7f-8ce7-712efd55b90e
@@ -446,6 +455,7 @@ protocols:
     btle:
       names:
         - MB Controller
+        - MB LINK 201
       services:
         0000fff0-0000-1000-8000-00805f9b34fb:
           tx: 0000fff6-0000-1000-8000-00805f9b34fb
@@ -514,6 +524,14 @@ protocols:
         00000a60-0000-1000-8000-00805f9b34fb:
           tx: 00000a66-0000-1000-8000-00805f9b34fb
           rx: 00000a67-0000-1000-8000-00805f9b34fb
+  lovenuts:
+    btle:
+      names:
+        - Love_Nuts
+      services:
+        0000fff0-0000-1000-8000-00805f9b34fb:
+          tx: 0000fff1-0000-1000-8000-00805f9b34fb
+          rx: 0000fff1-0000-1000-8000-00805f9b34fb
   # nintendo-joycon:
   #   hid:
   #     vendor-id: 0x057e