feat: Add support for 3 more JoyHub devices

buttplugio · Mar 9, 2024 · 5fdd95d · 5fdd95d
1 parent 4657282
commit 5fdd95d
Show file tree

Hide file tree

Showing 2 changed files with 113 additions and 2 deletions.
diff --git a/buttplug/buttplug-device-config/buttplug-device-config.json b/buttplug/buttplug-device-config/buttplug-device-config.json
@@ -8967,7 +8967,10 @@
           "J-Pearlconch",
           "J-PetiteRose",
           "J-MoonHorn",
-          "J-VibTrefoil"
+          "J-VibTrefoil",
+          "J-Panther",
+          "J-Mecha",
+          "J-Lagoon"
         ],
         "services": {
           "0000ffa0-0000-1000-8000-00805f9b34fb": {
@@ -9002,14 +9005,38 @@
                   0,
                   255
                 ],
-                "ActuatorType": "Rotate"
+                "ActuatorType": "Vibrate"
               },
+              {
+                "StepRange": [
+                  0,
+                  255
+                ],
+                "ActuatorType": "Rotate"
+              }
+            ]
+          }
+        },
+        {
+          "identifier": [
+            "J-Panther"
+          ],
+          "name": "JoyHub Panther",
+          "messages": {
+            "ScalarCmd": [
               {
                 "StepRange": [
                   0,
                   255
                 ],
                 "ActuatorType": "Vibrate"
+              },
+              {
+                "StepRange": [
+                  0,
+                  255
+                ],
+                "ActuatorType": "Rotate"
               }
             ]
           }
@@ -9063,6 +9090,56 @@
             ]
           }
         },
+        {
+          "identifier": [
+            "J-Mecha"
+          ],
+          "name": "JoyHub Mecha",
+          "messages": {
+            "ScalarCmd": [
+              {
+                "StepRange": [
+                  0,
+                  255
+                ],
+                "ActuatorType": "Vibrate"
+              },
+              {
+                "StepRange": [
+                  0,
+                  7
+                ],
+                "FeatureDescriptor": "Suction",
+                "ActuatorType": "Constrict"
+              }
+            ]
+          }
+        },
+        {
+          "identifier": [
+            "J-Lagoon"
+          ],
+          "name": "JoyHub Lagoon",
+          "messages": {
+            "ScalarCmd": [
+              {
+                "StepRange": [
+                  0,
+                  255
+                ],
+                "ActuatorType": "Vibrate"
+              },
+              {
+                "StepRange": [
+                  0,
+                  5
+                ],
+                "FeatureDescriptor": "Suction",
+                "ActuatorType": "Constrict"
+              }
+            ]
+          }
+        },
         {
           "identifier": [
             "J-VibTrefoil"

diff --git a/buttplug/buttplug-device-config/buttplug-device-config.yml b/buttplug/buttplug-device-config/buttplug-device-config.yml
@@ -4430,6 +4430,9 @@ protocols:
         - J-PetiteRose
         - J-MoonHorn
         - J-VibTrefoil
+        - J-Panther
+        - J-Mecha
+        - J-Lagoon
       services:
         0000ffa0-0000-1000-8000-00805f9b34fb:
           tx: 0000ffa1-0000-1000-8000-00805f9b34fb
@@ -4445,10 +4448,19 @@ protocols:
         name: JoyHub Pearlconch
         messages:
           ScalarCmd:
+            - StepRange: [ 0, 255 ]
+              ActuatorType: Vibrate
             - StepRange: [ 0, 255 ]
               ActuatorType: Rotate
+      - identifier:
+          - J-Panther
+        name: JoyHub Panther
+        messages:
+          ScalarCmd:
             - StepRange: [ 0, 255 ]
               ActuatorType: Vibrate
+            - StepRange: [ 0, 255 ]
+              ActuatorType: Rotate
       - identifier:
           - J-PetiteRose
         name: JoyHub Petite Rose
@@ -4470,6 +4482,28 @@ protocols:
               ActuatorType: Constrict
           # - StepRange: [0, 1]
           #   ActuatorType: Heater
+      - identifier:
+          - J-Mecha
+        name: JoyHub Mecha
+        messages:
+          ScalarCmd:
+            - StepRange: [ 0, 255 ]
+              ActuatorType: Vibrate
+            - StepRange: [ 0, 7 ]
+              FeatureDescriptor: Suction
+              ActuatorType: Constrict
+          # - StepRange: [0, 1]
+          #   ActuatorType: Heater
+      - identifier:
+          - J-Lagoon
+        name: JoyHub Lagoon
+        messages:
+          ScalarCmd:
+            - StepRange: [ 0, 255 ]
+              ActuatorType: Vibrate
+            - StepRange: [ 0, 5 ]
+              FeatureDescriptor: Suction
+              ActuatorType: Constrict
       - identifier:
           - J-VibTrefoil
         name: JoyHub VibTrefoil