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

Soundless joyMIDI: Mapping for joyMIDI #2425

Merged
merged 7 commits into from Jan 20, 2020
Merged

Soundless joyMIDI: Mapping for joyMIDI #2425

merged 7 commits into from Jan 20, 2020

Conversation

bcc6
Copy link
Contributor

@bcc6 bcc6 commented Jan 6, 2020

Hi, this mapping support portable MIDI controller joyMIDI. Thanks
Mixxx wiki (joyMIDI page)

@Holzhaus
Copy link
Member

Holzhaus commented Jan 14, 2020

Hi, is this mapping using new features that are not present in the 2.2 release? If not, can you rebase on 2.2?

@bcc6
Copy link
Contributor Author

bcc6 commented Jan 15, 2020

OK, already merge v2.2

@uklotzde
Copy link
Contributor

Merging 2.2 is the wrong direction. Please rebase your commits onto 2.2 instead.

@bcc6
Copy link
Contributor Author

bcc6 commented Jan 15, 2020

Sorry, can tell me how to do.

@Holzhaus
Copy link
Member

Just run this command:

$ git rebase -i 2.2

This will then open a text editor. Delete all lines except the one that says:

pick <commitid> Soundless joyMIDI: Mapping for joyMIDI

Then save and close the file.

@uklotzde
Copy link
Contributor

Or use git rebase -onto. The result must only contain your own commits, not anything else.

@Holzhaus Holzhaus added this to the 2.2.4 milestone Jan 15, 2020
@bcc6 bcc6 changed the base branch from master to 2.2 January 15, 2020 13:29
@bcc6
Copy link
Contributor Author

bcc6 commented Jan 15, 2020

Finally, done.

@uklotzde
Copy link
Contributor

But now the CI builds seem to be out of sync, even though the corresponding configuration files have not been modified in any of the commits. Not sure if we need to close this PR and open a new one?

@bcc6
Copy link
Contributor Author

bcc6 commented Jan 16, 2020

Any suggestion ?

@Holzhaus
Copy link
Member

I don't think a new PR is necessary. The only relevant "CI" for controller mappings is the CodeFactor linter, and I can just run eslint locally instead.

I'll review this mapping tomorrow.

Copy link
Member

@Holzhaus Holzhaus left a comment

Choose a reason for hiding this comment

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

Thanks for contributing a mapping for this unusual little controller! I had a look at the Wiki page and the mapping looks well thought out and should make good use of the buttons available.

As I don't have the controller myself, I can't test it, but I trust that you tested the mapping thorougly. I found few minor issues, but apart from that the mapping looks good to me.

@Be-ing Do you also want to take a look?

res/controllers/Soundless_joyMIDI.midi.xml Outdated Show resolved Hide resolved
res/controllers/Soundless_joyMIDI_scripts.js Outdated Show resolved Hide resolved
res/controllers/Soundless_joyMIDI_scripts.js Outdated Show resolved Hide resolved
res/controllers/Soundless_joyMIDI_scripts.js Outdated Show resolved Hide resolved
res/controllers/Soundless_joyMIDI_scripts.js Outdated Show resolved Hide resolved
res/controllers/Soundless_joyMIDI_scripts.js Outdated Show resolved Hide resolved
res/controllers/Soundless_joyMIDI_scripts.js Show resolved Hide resolved
res/controllers/Soundless_joyMIDI_scripts.js Outdated Show resolved Hide resolved
res/controllers/Soundless_joyMIDI_scripts.js Show resolved Hide resolved
res/controllers/Soundless_joyMIDI_scripts.js Outdated Show resolved Hide resolved
Copy link
Member

@Holzhaus Holzhaus left a comment

Choose a reason for hiding this comment

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

Thanks! We're almost there. There are still some eslint issues that are fixed by bcc6#1. Please merge the PR and fix the description in the XML, then we can merge IMO.

res/controllers/Soundless_joyMIDI.midi.xml Outdated Show resolved Hide resolved
@Holzhaus
Copy link
Member

@bcc6 Thanks!

@Holzhaus Holzhaus merged commit c485466 into mixxxdj:2.2 Jan 20, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants