Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Add more sistalk monsterpub devices and sensors for them #651

Open
wants to merge 2 commits into
base: dev
Choose a base branch
from
Open

Add more sistalk monsterpub devices and sensors for them #651

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
be225f8
Add more sistalk monsterpub devices and sensors for them
anon1im Jul 27, 2024
563c9bd
Config changes
anon1im Jul 27, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 39 additions & 1 deletion buttplug/buttplug-device-config/build-config/buttplug-device-config-v2.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8948,6 +8948,9 @@
},
"00008000-0000-1000-8000-00805f9b34fb": {
"rx": "00008001-0000-1000-8000-00805f9b34fb"
},
"00006050-0000-1000-8000-00805f9b34fb": {
"rxblebattery": "00006051-0000-1000-8000-00805f9b34fb"
}
}
},
Expand Down Expand Up @@ -8987,6 +8990,18 @@
],
"ActuatorType": "Vibrate"
}
],
"SensorReadCmd": [
{
"FeatureDescriptor": "Battery Level",
"SensorType": "Battery",
"SensorRange": [
[
0,
100
]
]
}
]
}
},
Expand Down Expand Up @@ -9072,7 +9087,30 @@
"identifier": [
"MP1N_QC_TL_P2"
],
"name": "Sistalk MonsterPub BeatHeart"
"name": "Sistalk MonsterPub BeatHeart",
"messages": {
"ScalarCmd": [
{
"StepRange": [
0,
100
],
"ActuatorType": "Vibrate"
}
],
"SensorReadCmd": [
{
"FeatureDescriptor": "Battery Level",
"SensorType": "Battery",
"SensorRange": [
[
0,
100
]
]
}
]
}
}
]
},
Expand Down
117 changes: 115 additions & 2 deletions buttplug/buttplug-device-config/build-config/buttplug-device-config-v3.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13463,7 +13463,8 @@
"configurations": [
{
"identifier": [
"MP2_JK_N_P1"
"MP2_JK_N_P1",
"MP2_JK_N0_P1"
],
"name": "Sistalk MonsterPub 2 Doctor Whale",
"features": [
Expand All @@ -13490,6 +13491,36 @@
"ScalarCmd"
]
}
},
{
"feature-type": "Battery",
"description": "Battery Level",
"sensor": {
"value-range": [
[
0,
100
]
],
"messages": [
"SensorReadCmd"
]
}
},
{
"feature-type": "Pressure",
"description": "Pressure sensor",
"sensor": {
"value-range": [
[
0,
2047
]
],
"messages": [
"SensorReadCmd"
]
}
}
]
},
Expand Down Expand Up @@ -13557,6 +13588,53 @@
}
]
},
{
"identifier": [
"MP2_QC_N_P1"
],
"name": "Sistalk MonsterPub 2 Master Godzilla",
"features": [
{
"feature-type": "Vibrate",
"actuator": {
"step-range": [
0,
100
],
"messages": [
"ScalarCmd"
]
}
},
{
"feature-type": "Vibrate",
"actuator": {
"step-range": [
0,
100
],
"messages": [
"ScalarCmd"
]
}
},
{
"feature-type": "Battery",
"description": "Battery Level",
"sensor": {
"value-range": [
[
0,
100
]
],
"messages": [
"SensorReadCmd"
]
}
}
]
},
{
"identifier": [
"MP_BABY_QC_N_P4"
Expand Down Expand Up @@ -13599,7 +13677,36 @@
"identifier": [
"MP1N_QC_TL_P2"
],
"name": "Sistalk MonsterPub BeatHeart"
"name": "Sistalk MonsterPub BeatHeart",
"features": [
{
"feature-type": "Vibrate",
"actuator": {
"step-range": [
0,
100
],
"messages": [
"ScalarCmd"
]
}
},
{
"feature-type": "Battery",
"description": "Battery Level",
"sensor": {
"value-range": [
[
0,
100
]
],
"messages": [
"SensorReadCmd"
]
}
}
]
}
],
"communication": [
Expand All @@ -13619,6 +13726,12 @@
},
"00008000-0000-1000-8000-00805f9b34fb": {
"rx": "00008001-0000-1000-8000-00805f9b34fb"
},
"00006050-0000-1000-8000-00805f9b34fb": {
"rxblebattery": "00006051-0000-1000-8000-00805f9b34fb"
},
"00006030-0000-1000-8000-00805f9b34fb": {
"rxpressure": "00006031-0000-1000-8000-00805f9b34fb"
}
}
}
Expand Down
15 changes: 15 additions & 0 deletions buttplug/buttplug-device-config/device-config-v2/buttplug-device-config-v2.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4459,6 +4459,8 @@ protocols:
rxblemodel: 00006014-0000-1000-8000-00805f9b34fb
00008000-0000-1000-8000-00805f9b34fb:
rx: 00008001-0000-1000-8000-00805f9b34fb
00006050-0000-1000-8000-00805f9b34fb:
rxblebattery: 00006051-0000-1000-8000-00805f9b34fb
defaults:
name: Sistalk MonsterPub Device
messages:
Expand All @@ -4468,13 +4470,18 @@ protocols:
configurations:
- identifier:
- MP2_JK_N_P1
- MP2_JK_N0_P1
name: Sistalk MonsterPub 2 Doctor Whale
messages:
ScalarCmd:
- StepRange: [0, 100]
ActuatorType: Vibrate
- StepRange: [0, 100]
ActuatorType: Vibrate
SensorReadCmd:
- FeatureDescriptor: Battery Level
SensorType: Battery
SensorRange: [ [ 0, 100 ] ]
- identifier:
- MP_MW_TL_P2
name: Sistalk MonsterPub Magic Kiss
Expand Down Expand Up @@ -4508,6 +4515,14 @@ protocols:
- identifier:
- MP1N_QC_TL_P2
name: Sistalk MonsterPub BeatHeart
messages:
ScalarCmd:
- StepRange: [ 0, 100 ]
ActuatorType: Vibrate
SensorReadCmd:
- FeatureDescriptor: Battery Level
SensorType: Battery
SensorRange: [ [ 0, 100 ] ]
joyhub:
btle:
names:
Expand Down
63 changes: 63 additions & 0 deletions buttplug/buttplug-device-config/device-config-v3/buttplug-device-config-v3.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7700,6 +7700,7 @@ protocols:
configurations:
- identifier:
- MP2_JK_N_P1
- MP2_JK_N0_P1
name: Sistalk MonsterPub 2 Doctor Whale
features:
- feature-type: Vibrate
Expand All @@ -7716,6 +7717,22 @@ protocols:
- 100
messages:
- ScalarCmd
- feature-type: Battery
description: Battery Level
sensor:
value-range:
- - 0
- 100
messages:
- SensorReadCmd
- feature-type: Pressure
description: Pressure sensor
sensor:
value-range:
- - 0
- 2047
messages:
- SensorReadCmd
- identifier:
- MP_MW_TL_P2
name: Sistalk MonsterPub Magic Kiss
Expand Down Expand Up @@ -7752,6 +7769,32 @@ protocols:
- 100
messages:
- ScalarCmd
- identifier:
- MP2_QC_N_P1
name: Sistalk MonsterPub 2 Master Godzilla
features:
- feature-type: Vibrate
actuator:
step-range:
- 0
- 100
messages:
- ScalarCmd
- feature-type: Vibrate
actuator:
step-range:
- 0
- 100
messages:
- ScalarCmd
- feature-type: Battery
description: Battery Level
sensor:
value-range:
- - 0
- 100
messages:
- SensorReadCmd
- identifier:
- MP_BABY_QC_N_P4
name: Sistalk MonsterPub Baby Youth Health
Expand All @@ -7776,6 +7819,22 @@ protocols:
- identifier:
- MP1N_QC_TL_P2
name: Sistalk MonsterPub BeatHeart
features:
- feature-type: Vibrate
actuator:
step-range:
- 0
- 100
messages:
- ScalarCmd
- feature-type: Battery
description: Battery Level
sensor:
value-range:
- - 0
- 100
messages:
- SensorReadCmd
communication:
- btle:
names:
Expand All @@ -7789,6 +7848,10 @@ protocols:
rxblemodel: 00006014-0000-1000-8000-00805f9b34fb
00008000-0000-1000-8000-00805f9b34fb:
rx: 00008001-0000-1000-8000-00805f9b34fb
00006050-0000-1000-8000-00805f9b34fb:
rxblebattery: 00006051-0000-1000-8000-00805f9b34fb
00006030-0000-1000-8000-00805f9b34fb:
rxpressure: 00006031-0000-1000-8000-00805f9b34fb
joyhub:
defaults:
name: JoyHub Device
Expand Down
Loading