Skip to content

Commit 91c8ec0

Browse files
blackspherefollowerqdot
authored andcommitted
feat: Adding more JoyHub devices
* J-Pinhead * J-Victor * J-Mirage3 * J-Maelstrom
1 parent f4b0660 commit 91c8ec0

File tree

3 files changed

+235
-19
lines changed

3 files changed

+235
-19
lines changed

crates/buttplug_server_device_config/build-config/buttplug-device-config-v4.json

Lines changed: 138 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
{
22
"version": {
33
"major": 4,
4-
"minor": 121
4+
"minor": 125
55
},
66
"protocols": {
77
"activejoy": {
@@ -4944,7 +4944,11 @@
49444944
"J-Vellum",
49454945
"J-Torque",
49464946
"J-Mighty",
4947-
"J-MowgliII"
4947+
"J-MowgliII",
4948+
"J-Pinhead",
4949+
"J-Victor",
4950+
"J-Mirage3",
4951+
"J-Maelstrom"
49484952
],
49494953
"services": {
49504954
"0000ffa0-0000-1000-8000-00805f9b34fb": {
@@ -8263,6 +8267,138 @@
82638267
"J-Melody"
82648268
],
82658269
"name": "JoyHub Melody"
8270+
},
8271+
{
8272+
"features": [
8273+
{
8274+
"id": "04f025cd-0181-4c64-bd02-4dd4ea5b6194",
8275+
"index": 0,
8276+
"output": {
8277+
"oscillate": {
8278+
"value": [
8279+
0,
8280+
255
8281+
]
8282+
}
8283+
}
8284+
},
8285+
{
8286+
"id": "84aa2133-189c-42bb-8e88-3e418e22e51c",
8287+
"index": 2,
8288+
"output": {
8289+
"vibrate": {
8290+
"value": [
8291+
0,
8292+
255
8293+
]
8294+
}
8295+
}
8296+
}
8297+
],
8298+
"id": "60582f6f-0017-4d08-98f9-2f6a3ff6b6fd",
8299+
"identifier": [
8300+
"J-Pinhead"
8301+
],
8302+
"name": "JoyHub Pinhead"
8303+
},
8304+
{
8305+
"features": [
8306+
{
8307+
"id": "c44d3eca-eed7-4e9e-8752-43d9fbd370eb",
8308+
"index": 0,
8309+
"output": {
8310+
"vibrate": {
8311+
"value": [
8312+
0,
8313+
255
8314+
]
8315+
}
8316+
}
8317+
},
8318+
{
8319+
"id": "49456548-0a3b-4f0a-8aab-1b892f198d1d",
8320+
"index": 1,
8321+
"output": {
8322+
"rotate": {
8323+
"value": [
8324+
0,
8325+
255
8326+
]
8327+
}
8328+
}
8329+
}
8330+
],
8331+
"id": "9c3a767a-b227-4993-a56d-e7aa2efdba35",
8332+
"identifier": [
8333+
"J-Victor"
8334+
],
8335+
"name": "JoyHub Victor"
8336+
},
8337+
{
8338+
"features": [
8339+
{
8340+
"id": "3401ff95-984d-4661-be3c-e473efe92f01",
8341+
"index": 0,
8342+
"output": {
8343+
"oscillate": {
8344+
"value": [
8345+
0,
8346+
255
8347+
]
8348+
}
8349+
}
8350+
}
8351+
],
8352+
"id": "7b440f5f-3d18-49a4-a1da-1d0a164d0d7a",
8353+
"identifier": [
8354+
"J-Maelstrom"
8355+
],
8356+
"name": "JoyHub Thermos"
8357+
},
8358+
{
8359+
"features": [
8360+
{
8361+
"id": "a0d03e23-8751-4851-862c-ab292a6452d5",
8362+
"index": 0,
8363+
"output": {
8364+
"rotate": {
8365+
"value": [
8366+
0,
8367+
255
8368+
]
8369+
}
8370+
}
8371+
},
8372+
{
8373+
"id": "1a2a3afe-ba4f-400b-aa3b-50c1e284f069",
8374+
"index": 3,
8375+
"output": {
8376+
"vibrate": {
8377+
"value": [
8378+
0,
8379+
255
8380+
]
8381+
}
8382+
}
8383+
},
8384+
{
8385+
"id": "511da9f2-b954-484e-bf98-44c9d1be15da",
8386+
"index": 5,
8387+
"output": {
8388+
"constrict": {
8389+
"value": [
8390+
0,
8391+
7
8392+
]
8393+
}
8394+
}
8395+
}
8396+
],
8397+
"id": "c3efbec1-44f4-49de-88a1-f232873215a3",
8398+
"identifier": [
8399+
"J-Mirage3"
8400+
],
8401+
"name": "JoyHub Mirage 3"
82668402
}
82678403
],
82688404
"defaults": {

crates/buttplug_server_device_config/device-config-v4/protocols/joyhub.yml

Lines changed: 96 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1912,25 +1912,101 @@ configurations:
19121912
index: 1
19131913
id: c31f74b8-c859-47ab-8b1c-66745cb11355
19141914
- identifier:
1915-
- J-Melody
1915+
- J-Melody
19161916
name: JoyHub Melody
19171917
features:
1918-
- id: 9fbf30f4-3f0d-4377-a232-55132d023d11
1919-
output:
1920-
vibrate:
1921-
value:
1922-
- 0
1923-
- 255
1924-
index: 1
1925-
- description: Suction
1926-
id: a38653c9-c245-4c98-86c9-3c0da68d646c
1927-
output:
1928-
constrict:
1929-
value:
1930-
- 0
1931-
- 9
1932-
index: 4
1918+
- id: 9fbf30f4-3f0d-4377-a232-55132d023d11
1919+
output:
1920+
vibrate:
1921+
value:
1922+
- 0
1923+
- 255
1924+
index: 1
1925+
- description: Suction
1926+
id: a38653c9-c245-4c98-86c9-3c0da68d646c
1927+
output:
1928+
constrict:
1929+
value:
1930+
- 0
1931+
- 9
1932+
index: 4
19331933
id: 2c33b13e-9d00-4823-bc5b-fda18dbd3691
1934+
- identifier:
1935+
- J-Pinhead
1936+
name: JoyHub Pinhead
1937+
features:
1938+
- id: 04f025cd-0181-4c64-bd02-4dd4ea5b6194
1939+
output:
1940+
oscillate:
1941+
value:
1942+
- 0
1943+
- 255
1944+
index: 0
1945+
- id: 84aa2133-189c-42bb-8e88-3e418e22e51c
1946+
output:
1947+
vibrate:
1948+
value:
1949+
- 0
1950+
- 255
1951+
index: 2
1952+
id: 60582f6f-0017-4d08-98f9-2f6a3ff6b6fd
1953+
- identifier:
1954+
- J-Victor
1955+
name: JoyHub Victor
1956+
features:
1957+
- id: c44d3eca-eed7-4e9e-8752-43d9fbd370eb
1958+
output:
1959+
vibrate:
1960+
value:
1961+
- 0
1962+
- 255
1963+
index: 0
1964+
- id: 49456548-0a3b-4f0a-8aab-1b892f198d1d
1965+
output:
1966+
rotate:
1967+
value:
1968+
- 0
1969+
- 255
1970+
index: 1
1971+
id: 9c3a767a-b227-4993-a56d-e7aa2efdba35
1972+
- identifier:
1973+
- J-Maelstrom
1974+
name: JoyHub Thermos
1975+
features:
1976+
- id: 3401ff95-984d-4661-be3c-e473efe92f01
1977+
output:
1978+
oscillate:
1979+
value:
1980+
- 0
1981+
- 255
1982+
index: 0
1983+
id: 7b440f5f-3d18-49a4-a1da-1d0a164d0d7a
1984+
- identifier:
1985+
- J-Mirage3
1986+
name: JoyHub Mirage 3
1987+
features:
1988+
- id: a0d03e23-8751-4851-862c-ab292a6452d5
1989+
output:
1990+
rotate:
1991+
value:
1992+
- 0
1993+
- 255
1994+
index: 0
1995+
- id: 1a2a3afe-ba4f-400b-aa3b-50c1e284f069
1996+
output:
1997+
vibrate:
1998+
value:
1999+
- 0
2000+
- 255
2001+
index: 3
2002+
- id: 511da9f2-b954-484e-bf98-44c9d1be15da
2003+
output:
2004+
constrict:
2005+
value:
2006+
- 0
2007+
- 7
2008+
index: 5
2009+
id: c3efbec1-44f4-49de-88a1-f232873215a3
19342010
communication:
19352011
- btle:
19362012
names:
@@ -2053,6 +2129,10 @@ communication:
20532129
- J-Torque
20542130
- J-Mighty
20552131
- J-MowgliII
2132+
- J-Pinhead
2133+
- J-Victor
2134+
- J-Mirage3
2135+
- J-Maelstrom
20562136
services:
20572137
0000ffa0-0000-1000-8000-00805f9b34fb:
20582138
tx: 0000ffa1-0000-1000-8000-00805f9b34fb
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,3 @@
11
version:
22
major: 4
3-
minor: 121
3+
minor: 125

0 commit comments

Comments
 (0)