Squashed 'dependencies/buttplug-device-config/' changes from 6740a4a..86db8d1

86db8d1 chore: Regenerate JSON file with new yaml data
ea791cd feat: Adding the ingo for the LiBo Sexy Fox
5e31030 feat: Adding TwerkingButt info
d975993 feat: Adding 3 new MagicMotion identifiers
b023699 feat: Adding Lovehoney Desire info
f465667 feat: Adding info for Aneros Vivi
1303ec6 feat: Adding minimum required Lelo F1s info
3e168cb feat: Adding LiBo ELLE2 BLE name
54c53fa feat: Adding UUIDs for more devices
9b9e50d feat: Adding missing We-Vibe BLE names

git-subtree-dir: dependencies/buttplug-device-config
git-subtree-split: 86db8d1bd5c946e61b7fb102cd2004ad2ce3cdd2

Author: qdot

dependencies/buttplug-device-config/buttplug-device-config.json

@@ -69,7 +69,10 @@
           "ShaYu",
           "Yuyi",
           "LuWuShuang",
-          "LiBo"
+          "LiBo",
+          "QingTing",
+          "Shuidi",
+          "Huohu"
         ],
         "services": {
           "00006000-0000-1000-8000-00805f9b34fb": {
@@ -89,7 +92,10 @@
           "Magic Cell",
           "Magic Wand",
           "Fugu",
-          "Krush"
+          "Krush",
+          "Lipstick",
+          "Sword",
+          "Curve"
         ],
         "services": {
           "78667579-7b48-43db-b8c5-7928a6b0a335": {
@@ -152,17 +158,26 @@
         "names": [
           "Cougar",
           "4 Plus",
+          "4_Plus",
           "4plus",
           "Bloom",
           "classic",
           "Classic",
           "Ditto",
           "Gala",
           "Jive",
+          "Melt",
+          "Moxie",
           "Nova",
           "NOVAV2",
           "Pivot",
+          "Rey",
+          "We-Vibe Rocketman",
           "Rave",
+          "Reina",
+          "imassager",
+          "Interactive Massager",
+          3,
           "Sync",
           "Vector",
           "Verge",
@@ -382,6 +397,95 @@
           }
         }
       }
+    },
+    "zalo": {
+      "btle": {
+        "names": [
+          "ZALO-Queen"
+        ],
+        "services": {
+          "0000fff0-0000-1000-8000-00805f9b34fb": {
+            "tx": "0000fff1-0000-1000-8000-00805f9b34fb"
+          }
+        }
+      }
+    },
+    "sayberx": {
+      "btle": {
+        "names": [
+          "SayberX"
+        ],
+        "services": {
+          "0000fff0-0000-1000-8000-00805f9b34fb": {
+            "tx": "0000fff6-0000-1000-8000-00805f9b34fb"
+          }
+        }
+      }
+    },
+    "muse": {
+      "btle": {
+        "names": [
+          "WB-ZDB-WST",
+          "WB-TDD"
+        ],
+        "services": {
+          "0000aaa0-0000-1000-8000-00805f9b34fb": {
+            "tx": "0000aaa1-0000-1000-8000-00805f9b34fb"
+          }
+        }
+      }
+    },
+    "lelo-f1s": {
+      "btle": {
+        "names": [
+          "F1s"
+        ],
+        "services": {
+          "0000fff0-0000-1000-8000-00805f9b34fb": {
+            "tx": "0000fff1-0000-1000-8000-00805f9b34fb"
+          }
+        }
+      }
+    },
+    "aneros": {
+      "btle": {
+        "names": [
+          "Massage Demo"
+        ],
+        "services": {
+          "0000ff00-0000-1000-8000-00805f9b34fb": {
+            "tx": "0000ff01-0000-1000-8000-00805f9b34fb"
+          }
+        }
+      }
+    },
+    "lovehoney-desire": {
+      "btle": {
+        "names": [
+          "PROSTATE VIBE",
+          "KNICKER VIBE"
+        ],
+        "services": {
+          "0000ff00-0000-1000-8000-00805f9b34fb": {
+            "tx": "0000ff01-0000-1000-8000-00805f9b34fb"
+          }
+        }
+      }
+    },
+    "twerkingbutt": {
+      "btle": {
+        "names": [
+          "BODIKANG",
+          "Twerking Butt",
+          "TwerkingButt"
+        ],
+        "services": {
+          "00000a60-0000-1000-8000-00805f9b34fb": {
+            "tx": "00000a66-0000-1000-8000-00805f9b34fb",
+            "rx": "00000a67-0000-1000-8000-00805f9b34fb"
+          }
+        }
+      }
     }
   }
 }

dependencies/buttplug-device-config/buttplug-device-config.yml

@@ -199,6 +199,9 @@ protocols:
           - Yuyi # Lina - Leaf
           - LuWuShuang # Adel - Curved Rabbit
           - LiBo # Lily - Double ended mini wand
+          - QingTing # Lucy - Dragonfly egg
+          - Shuidi # ELLE2 - Shock Egg
+          - Huohu # Sexy Fox - Rabbit
         services:
           # Write Service
           00006000-0000-1000-8000-00805f9b34fb:
@@ -218,11 +221,14 @@ protocols:
         - Smart Mini Vibe*
         - Flamingo
         - Eidolon
-        - Smart Bean
-        - Magic Cell
+        - Smart Bean # Magic Kegel Twins/Master/Master V2
+        - Magic Cell # Candy/Dante
         - Magic Wand
         - Fugu
-        - Krush
+        - Krush # Lovelife Krush
+        - Lipstick # Awaken
+        - Sword # Equinox
+        - Curve # Solstice
       services:
         78667579-7b48-43db-b8c5-7928a6b0a335:
           tx: 78667579-a914-49a4-8333-aa3c0cd8fedc
@@ -267,17 +273,26 @@ protocols:
       names:
         - Cougar
         - 4 Plus
+        - 4_Plus
         - 4plus
         - Bloom
         - classic
         - Classic
         - Ditto
         - Gala
         - Jive
+        - Melt
+        - Moxie
         - Nova
         - NOVAV2
         - Pivot
+        - Rey # Branded Realm
+        - We-Vibe Rocketman # Rey alias
         - Rave
+        - Reina # Branded Realm
+        - imassager # Reina alias
+        - Interactive Massager # Reina alias
+        - 03 # Reina alias
         - Sync
         - Vector
         - Verge
@@ -433,6 +448,66 @@ protocols:
           # since I don't think we get any data off notify for this anyways?
           #
           # rx: 0000fff6-0000-1000-8000-00805f9b34fb
+  zalo:
+    btle:
+      names:
+        - ZALO-Queen
+      services:
+        0000fff0-0000-1000-8000-00805f9b34fb:
+          tx: 0000fff1-0000-1000-8000-00805f9b34fb
+  sayberx:
+    btle:
+      names:
+        - SayberX
+        # - X-Ring *
+      services:
+        0000fff0-0000-1000-8000-00805f9b34fb:
+          tx: 0000fff6-0000-1000-8000-00805f9b34fb
+          # No current way of marking services as optional
+          # rx: 0000fff8-0000-1000-8000-00805f9b34fb
+  muse:
+    btle:
+      names:
+        - WB-ZDB-WST
+        - WB-TDD
+      services:
+        0000aaa0-0000-1000-8000-00805f9b34fb:
+          tx: 0000aaa1-0000-1000-8000-00805f9b34fb
+  lelo-f1s:
+    btle:
+      names:
+        - F1s
+      services:
+        0000fff0-0000-1000-8000-00805f9b34fb:
+          tx: 0000fff1-0000-1000-8000-00805f9b34fb
+          # There are a LOT of sensor characteristics
+          # I figure we'll add them as support for those sensor
+          # types is added to Buttplug
+  aneros:
+    btle:
+      names:
+        - Massage Demo
+      services:
+        0000ff00-0000-1000-8000-00805f9b34fb:
+          tx: 0000ff01-0000-1000-8000-00805f9b34fb
+  lovehoney-desire:
+    btle:
+      names:
+        - PROSTATE VIBE
+        - KNICKER VIBE
+      services:
+        0000ff00-0000-1000-8000-00805f9b34fb:
+          tx: 0000ff01-0000-1000-8000-00805f9b34fb
+  twerkingbutt:
+    btle:
+      names:
+        - BODIKANG
+        - Twerking Butt
+        - TwerkingButt
+      services:
+        00000a60-0000-1000-8000-00805f9b34fb:
+          tx: 00000a66-0000-1000-8000-00805f9b34fb
+          rx: 00000a67-0000-1000-8000-00805f9b34fb
   # nintendo-joycon:
   #   hid:
   #     vendor-id: 0x057e