Network + Arturia combined #778
Conversation
|
Build for testing: |
|
Build for testing: |
|
Note to self: Does not seem to work yet when combined. I get network but nothing on the screen of my emulated MiniLab 3 controller. |
MiniLab 3 Keylab Essential KeyLab Essential mk3 KeyLab mkII based on https://github.com/PrzemekBarski/arturia-keylab-essential-mk3-programming-guide Tested on a Arturia MiniLab 3 and KeyLab mkII Keylab Essential and Keylab Essential mk3 is not tested
soyersoyer
force-pushed
the
dawdisplay
branch
from
cc419ce to
ea104ba
Compare
|
Build for testing: |
|
I seem to be unable to resolve the merge conflicts. Maybe a GitHub thing. |
|
I think the problem is that it wants to resolve the conflicts in soyersoyer/dawdisplay, but that's in another PR also. |
|
OK, so probably we just need to get things merged one after the other? |
|
What if you checkout soyersoyer:dawdisplay to probonopd:arturia and then modify this PR to use your branch? If the merge conflict is resolved in soyersoyer:dawdisplay, it will cause a lot of noise in the other PR. |
|
I don't have achieved that level of git wizardry quite yet ;-/ Nevermind, I'll probably just close this. Let's work on the PRs in isolation for now. |
|
IMHO maintainers should not change the code for the given branch for the PR, this creates a lot of conflicts. @probonopd if you want something to be changed or added/removed please kindly ask to the author, or of course you can always create a branch for the given PR. |
This combines #743, #747.
We will still merge those individually, but we need to be sure that they will work together eventually.