Skip to content

Commit 0445f24

Browse files
committed
Add more sistalk monsterpub devices and sensors for them
1 parent d4be80a commit 0445f24

File tree

4 files changed

+312
-6
lines changed

4 files changed

+312
-6
lines changed

buttplug/buttplug-device-config/build-config/buttplug-device-config-v2.json

Lines changed: 24 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8947,7 +8947,30 @@
89478947
]
89488948
}
89498949
},
8950-
"configurations": [
8950+
"configurations": [{
8951+
"identifier": [
8952+
"MP2_JK_N0_P1"
8953+
],
8954+
"name": "Sistalk MonsterPub 2 Doctor Whale 2",
8955+
"messages": {
8956+
"ScalarCmd": [
8957+
{
8958+
"StepRange": [
8959+
0,
8960+
100
8961+
],
8962+
"ActuatorType": "Vibrate"
8963+
},
8964+
{
8965+
"StepRange": [
8966+
0,
8967+
100
8968+
],
8969+
"ActuatorType": "Vibrate"
8970+
}
8971+
]
8972+
}
8973+
},
89518974
{
89528975
"identifier": [
89538976
"MP2_JK_N_P1"

buttplug/buttplug-device-config/build-config/buttplug-device-config-v3.json

Lines changed: 145 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11222,6 +11222,68 @@
1122211222
]
1122311223
},
1122411224
"configurations": [
11225+
{
11226+
"identifier": [
11227+
"MP2_JK_N0_P1"
11228+
],
11229+
"name": "Sistalk MonsterPub 2 Doctor Whale Premium",
11230+
"features": [
11231+
{
11232+
"feature-type": "Vibrate",
11233+
"actuator": {
11234+
"step-range": [
11235+
0,
11236+
100
11237+
],
11238+
"messages": [
11239+
"ScalarCmd"
11240+
]
11241+
}
11242+
},
11243+
{
11244+
"feature-type": "Vibrate",
11245+
"actuator": {
11246+
"step-range": [
11247+
0,
11248+
100
11249+
],
11250+
"messages": [
11251+
"ScalarCmd"
11252+
]
11253+
}
11254+
},
11255+
{
11256+
"feature-type": "Battery",
11257+
"description": "Battery Level",
11258+
"sensor": {
11259+
"value-range": [
11260+
[
11261+
0,
11262+
100
11263+
]
11264+
],
11265+
"messages": [
11266+
"SensorReadCmd"
11267+
]
11268+
}
11269+
},
11270+
{
11271+
"feature-type": "Pressure",
11272+
"description": "Pressure sensor",
11273+
"sensor": {
11274+
"value-range": [
11275+
[
11276+
0,
11277+
2047
11278+
]
11279+
],
11280+
"messages": [
11281+
"SensorReadCmd"
11282+
]
11283+
}
11284+
}
11285+
]
11286+
},
1122511287
{
1122611288
"identifier": [
1122711289
"MP2_JK_N_P1"
@@ -11318,6 +11380,53 @@
1131811380
}
1131911381
]
1132011382
},
11383+
{
11384+
"identifier": [
11385+
"MP2_QC_N_P1"
11386+
],
11387+
"name": "Sistalk MonsterPub 2 Master Godkilla",
11388+
"features": [
11389+
{
11390+
"feature-type": "Vibrate",
11391+
"actuator": {
11392+
"step-range": [
11393+
0,
11394+
100
11395+
],
11396+
"messages": [
11397+
"ScalarCmd"
11398+
]
11399+
}
11400+
},
11401+
{
11402+
"feature-type": "Vibrate",
11403+
"actuator": {
11404+
"step-range": [
11405+
0,
11406+
100
11407+
],
11408+
"messages": [
11409+
"ScalarCmd"
11410+
]
11411+
}
11412+
},
11413+
{
11414+
"feature-type": "Battery",
11415+
"description": "Battery Level",
11416+
"sensor": {
11417+
"value-range": [
11418+
[
11419+
0,
11420+
100
11421+
]
11422+
],
11423+
"messages": [
11424+
"SensorReadCmd"
11425+
]
11426+
}
11427+
}
11428+
]
11429+
},
1132111430
{
1132211431
"identifier": [
1132311432
"MP_BABY_QC_N_P4"
@@ -11360,7 +11469,36 @@
1136011469
"identifier": [
1136111470
"MP1N_QC_TL_P2"
1136211471
],
11363-
"name": "Sistalk MonsterPub BeatHeart"
11472+
"name": "Sistalk MonsterPub BeatHeart",
11473+
"features": [
11474+
{
11475+
"feature-type": "Vibrate",
11476+
"actuator": {
11477+
"step-range": [
11478+
0,
11479+
100
11480+
],
11481+
"messages": [
11482+
"ScalarCmd"
11483+
]
11484+
}
11485+
},
11486+
{
11487+
"feature-type": "Battery",
11488+
"description": "Battery Level",
11489+
"sensor": {
11490+
"value-range": [
11491+
[
11492+
0,
11493+
100
11494+
]
11495+
],
11496+
"messages": [
11497+
"SensorReadCmd"
11498+
]
11499+
}
11500+
}
11501+
]
1136411502
}
1136511503
],
1136611504
"communication": [
@@ -11380,6 +11518,12 @@
1138011518
},
1138111519
"00008000-0000-1000-8000-00805f9b34fb": {
1138211520
"rx": "00008001-0000-1000-8000-00805f9b34fb"
11521+
},
11522+
"00006050-0000-1000-8000-00805f9b34fb": {
11523+
"rxblebattery": "00006051-0000-1000-8000-00805f9b34fb"
11524+
},
11525+
"00006030-0000-1000-8000-00805f9b34fb": {
11526+
"rxpressure": "00006031-0000-1000-8000-00805f9b34fb"
1138311527
}
1138411528
}
1138511529
}

buttplug/buttplug-device-config/device-config-v3/buttplug-device-config-v3.yml

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6420,6 +6420,40 @@ protocols:
64206420
messages:
64216421
- ScalarCmd
64226422
configurations:
6423+
- identifier:
6424+
- MP2_JK_N0_P1
6425+
name: Sistalk MonsterPub 2 Doctor Whale Premium
6426+
features:
6427+
- feature-type: Vibrate
6428+
actuator:
6429+
step-range:
6430+
- 0
6431+
- 100
6432+
messages:
6433+
- ScalarCmd
6434+
- feature-type: Vibrate
6435+
actuator:
6436+
step-range:
6437+
- 0
6438+
- 100
6439+
messages:
6440+
- ScalarCmd
6441+
- feature-type: Battery
6442+
description: Battery Level
6443+
sensor:
6444+
value-range:
6445+
- - 0
6446+
- 100
6447+
messages:
6448+
- SensorReadCmd
6449+
- feature-type: Pressure
6450+
description: Pressure sensor
6451+
sensor:
6452+
value-range:
6453+
- - 0
6454+
- 2047
6455+
messages:
6456+
- SensorReadCmd
64236457
- identifier:
64246458
- MP2_JK_N_P1
64256459
name: Sistalk MonsterPub 2 Doctor Whale
@@ -6474,6 +6508,32 @@ protocols:
64746508
- 100
64756509
messages:
64766510
- ScalarCmd
6511+
- identifier:
6512+
- MP2_QC_N_P1
6513+
name: Sistalk MonsterPub 2 Master Godkilla
6514+
features:
6515+
- feature-type: Vibrate
6516+
actuator:
6517+
step-range:
6518+
- 0
6519+
- 100
6520+
messages:
6521+
- ScalarCmd
6522+
- feature-type: Vibrate
6523+
actuator:
6524+
step-range:
6525+
- 0
6526+
- 100
6527+
messages:
6528+
- ScalarCmd
6529+
- feature-type: Battery
6530+
description: Battery Level
6531+
sensor:
6532+
value-range:
6533+
- - 0
6534+
- 100
6535+
messages:
6536+
- SensorReadCmd
64776537
- identifier:
64786538
- MP_BABY_QC_N_P4
64796539
name: Sistalk MonsterPub Baby Youth Health
@@ -6498,6 +6558,22 @@ protocols:
64986558
- identifier:
64996559
- MP1N_QC_TL_P2
65006560
name: Sistalk MonsterPub BeatHeart
6561+
features:
6562+
- feature-type: Vibrate
6563+
actuator:
6564+
step-range:
6565+
- 0
6566+
- 100
6567+
messages:
6568+
- ScalarCmd
6569+
- feature-type: Battery
6570+
description: Battery Level
6571+
sensor:
6572+
value-range:
6573+
- - 0
6574+
- 100
6575+
messages:
6576+
- SensorReadCmd
65016577
communication:
65026578
- btle:
65036579
names:
@@ -6511,6 +6587,10 @@ protocols:
65116587
rxblemodel: 00006014-0000-1000-8000-00805f9b34fb
65126588
00008000-0000-1000-8000-00805f9b34fb:
65136589
rx: 00008001-0000-1000-8000-00805f9b34fb
6590+
00006050-0000-1000-8000-00805f9b34fb:
6591+
rxblebattery: 00006051-0000-1000-8000-00805f9b34fb
6592+
00006030-0000-1000-8000-00805f9b34fb:
6593+
rxpressure: 00006031-0000-1000-8000-00805f9b34fb
65146594
joyhub:
65156595
defaults:
65166596
name: JoyHub Device

0 commit comments

Comments
 (0)