search

buttplugio / buttplug-device-config

YAML file that specifies device information and protocol bindings
3 stars 3 forks source link

feat: More device UUIDs #7

Closed blackspherefollower closed 5 years ago

qdot commented 5 years ago

Ok. So this is going to take some work to merge.

I have a version of this PR that I can merge, minus 3985d1f (my fault there, master was not sync'd with dev because I've been doing subtree merge pushes from C#/JS to here), this was already taken care of in master), and ec25b01 (similar issue, fixes something that was changed in master). That's on dev now, so I'm closing this and I'll push it to master.

I'm going to assume that these changes will then match what would be at the end of the C# repo if I merged all of the device PRs pushed over the past few days, but if I DID do that, then there's a chance that the repos might diverge on subtree push/pulls. So the C# PRs will need to be rebased to drop the device file changes.

In the future: Don't change both repos. Either put in stuff in C# and let me subtree merge it, or put stuff in here, build on top of that without merging in C#, then plan with me on the cross repo merges.

Also: If you're going to change the yaml, build and commit the json too. That's been happening for a while. I'll just do a patch commit at the end of this PR for now.

blackspherefollower commented 5 years ago

Damn, yeah I should have either closed the PR myself or at least put a comment in there to let you know that this change was effectively superceded/duplicated by the changes in C#. Sorry for my poor communication.