Skip to content
This repository has been archived by the owner on Dec 27, 2020. It is now read-only.

feat: Adding a few new devices #11

Merged
merged 6 commits into from
May 6, 2020
Merged

feat: Adding a few new devices #11

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
80fe45b
Add motorbunny buck controller name
qdot Apr 13, 2020
9da3a7e
Add json for motorbunny name update
qdot Apr 13, 2020
0f20a2b
Add Onyx+ to kiiroo-v21
qdot May 5, 2020
dfbc5d2
feat: Adding PornHub Virtual Rabbit as a kiiroo-v2-vibrator
blackspherefollower Apr 30, 2020
4f0dd07
feat: Add the LoveNuts descriptor
blackspherefollower Apr 30, 2020
ad6edcd
feat: Adding the Vorze Piston SA BTLE name
blackspherefollower Apr 30, 2020
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
25 changes: 21 additions & 4 deletions buttplug-device-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -221,7 +221,8 @@
"Pearl2",
"Fuse",
"Virtual Blowbot",
"Titan"
"Titan",
"Virtual Rabbit"
],
"services": {
"88f82580-0000-01e6-aace-0002a5d5c51b": {
Expand All @@ -236,7 +237,8 @@
"btle": {
"names": [
"Onyx2.1",
"Titan1.1"
"Titan1.1",
"Oynx+"
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

How is this in the JSON but not the YAML!?

Copy link
Contributor Author

@blackspherefollower blackspherefollower May 6, 2020 •
edited
Loading

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Damn. I forget to rebuild the JSON during my rebase.

Prior to your update (with the correct spelling) I had a similar changes with a typo in it.
I rebased out your yaml change but somehow auto-merged the json and forgot to regen...

],
"services": {
"00001900-0000-1000-8000-00805f9b34fb": {
Expand Down Expand Up @@ -328,7 +330,8 @@
"names": [
"CycSA",
"Bach smart",
"UFOSA"
"UFOSA",
"VorzePiston"
],
"services": {
"40ee1111-63ec-4b7f-8ce7-712efd55b90e": {
Expand Down Expand Up @@ -396,7 +399,8 @@
"motorbunny": {
"btle": {
"names": [
"MB Controller"
"MB Controller",
"MB LINK 201"
],
"services": {
"0000fff0-0000-1000-8000-00805f9b34fb": {
Expand Down Expand Up @@ -493,6 +497,19 @@
}
}
}
},
"lovenuts": {
"btle": {
"names": [
"Love_Nuts"
],
"services": {
"0000fff0-0000-1000-8000-00805f9b34fb": {
"tx": "0000fff1-0000-1000-8000-00805f9b34fb",
"rx": "0000fff1-0000-1000-8000-00805f9b34fb"
}
}
}
}
}
}
12 changes: 12 additions & 0 deletions buttplug-device-config.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -324,6 +324,7 @@ protocols:
- Fuse
- Virtual Blowbot
- Titan
- Virtual Rabbit
services:
88f82580-0000-01e6-aace-0002a5d5c51b:
tx: 88f82581-0000-01e6-aace-0002a5d5c51b
Expand All @@ -334,6 +335,7 @@ protocols:
names:
- Onyx2.1
- Titan1.1
- Onyx+
services:
00001900-0000-1000-8000-00805f9b34fb:
# Used to clear the whitelist
Expand Down Expand Up @@ -405,6 +407,7 @@ protocols:
- CycSA
- Bach smart
- UFOSA
- VorzePiston
services:
40ee1111-63ec-4b7f-8ce7-712efd55b90e:
tx: 40ee2222-63ec-4b7f-8ce7-712efd55b90e
Expand Down Expand Up @@ -446,6 +449,7 @@ protocols:
btle:
names:
- MB Controller
- MB LINK 201
services:
0000fff0-0000-1000-8000-00805f9b34fb:
tx: 0000fff6-0000-1000-8000-00805f9b34fb
Expand Down Expand Up @@ -514,6 +518,14 @@ protocols:
00000a60-0000-1000-8000-00805f9b34fb:
tx: 00000a66-0000-1000-8000-00805f9b34fb
rx: 00000a67-0000-1000-8000-00805f9b34fb
lovenuts:
btle:
names:
- Love_Nuts
services:
0000fff0-0000-1000-8000-00805f9b34fb:
tx: 0000fff1-0000-1000-8000-00805f9b34fb
rx: 0000fff1-0000-1000-8000-00805f9b34fb
# nintendo-joycon:
# hid:
# vendor-id: 0x057e
Expand Down