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.

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

Plumaudio #90

Merged
merged 27 commits into from Aug 13, 2019
Merged

Plumaudio #90

merged 27 commits into from Aug 13, 2019

Conversation

Chysn
Copy link
Contributor

@Chysn Chysn commented Aug 10, 2019

Update interface for Plum Audio projects. Also some minor refactoring for option names, to reflect feature descriptions instead of product names.

@patrickdowling
Copy link
Collaborator

Ok, thanks.
As mentioned, this requires a larger merge effort with some changes I have pending, at least if the goal is to get this into master. So it can live on the dedicated branch for now but - despite generally preferring unified source - I'm wondering if it's just more transparent to move to a hardware-specific repo? Some things (like calibration) are becoming a bit unwieldy with the proliferation of #ifdefs anyway.

Would it be possible to rebase away the superfluous commits before 4257f6a?

@Chysn
Copy link
Contributor Author

Chysn commented Aug 11, 2019

I'm wondering if it's just more transparent to move to a hardware-specific repo? Some things (like calibration) are becoming a bit unwieldy with the proliferation of #ifdefs anyway.

This was my suggestion to Shay, that he distributes his own version of the firmware in another repo. This way, he can write his own documentation, or offer his own hexfiles for release. And then can decide whether to integrate future changes. Personally, I can't think of a good reason to bring the oc_p brach into origin/master.

Would it be possible to rebase away the superfluous commits before 4257f6a?

I don't know. I thought I had removed things like .cproject, and it doesn't appear in my branch, and it wasn't one of the 18 changed files in the pull request, so I'm not sure what's going on with that.

Co-Authored-By: Patrick Dowling <pld@gurkenkiste.com>
@mxmxmx mxmxmx merged commit 67729b6 into mxmxmx:oc_p Aug 13, 2019
@mxmxmx
Copy link
Owner

mxmxmx commented Aug 13, 2019

thanks. so let's pull this into the oc_p branch for now. i suppose eventually it might be easier to manually reinsert into whatever @patrickdowling has been cooking up. it'll mostly just be tedious, i suppose ... the #ifdefs have been getting a bit out of control, true (cOC, 4U, oc_plus, ....). my understanding is jim/neutron7/jakplugg wanted to come up with a uOC "VOR" variant, too, (?) so perhaps keeping everything in one repo is preferable ...

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants