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

Mapping for Numark iDJ Live II #2818

Merged
merged 1 commit into from Jun 19, 2020
Merged

Mapping for Numark iDJ Live II #2818

merged 1 commit into from Jun 19, 2020

Conversation

nkorth
Copy link
Contributor

@nkorth nkorth commented May 24, 2020

I wrote up a wiki page too: https://mixxx.org/wiki/doku.php/numark_idj_live_ii

Since I've never actually used another DJ controller, I'm not super confident about the scratch parameters. It feels reasonable to me, and I'm pretty sure I at least got the resolution right.

@nkorth nkorth force-pushed the master branch 2 times, most recently from 42c7cbf to 4f484fd Compare May 24, 2020 21:33
Copy link
Member

@Swiftb0y Swiftb0y left a comment

Choose a reason for hiding this comment

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

Looks good so far, though I don't think the search accumulator behavior is a good feature. You could simplify the code drastically, if you instead you just speed up the jogwheel while in search mode instead of beatjumping.

res/controllers/Numark iDJ Live II.midi.xml Show resolved Hide resolved
res/controllers/Numark iDJ Live II.midi.xml Outdated Show resolved Hide resolved
@Swiftb0y
Copy link
Member

For future reference, you should not develop in the master branch but instead create a feature branch for your mapping and then develop within that.
Also make sure you linted the js:
https://www.mixxx.org/wiki/doku.php/contributing_mappings#automated_code_checking_linting

@nkorth
Copy link
Contributor Author

nkorth commented May 25, 2020

I don't think the search accumulator behavior is a good feature.

Fair enough, it's just something I personally like. Do you have an example of a mapping I could imitate for a search mode? (I was looking at the Ion Discover DJ mapping, but I don't think it's a very good one. It just pitch bends when scratch mode is off, even when paused.)

@Be-ing
Copy link
Contributor

Be-ing commented May 25, 2020

It is common for controller mappings to use shift + jog wheel turn to seek quickly.

@Be-ing
Copy link
Contributor

Be-ing commented May 25, 2020

Could you map the sync button LED to sync_enabled?

@nkorth
Copy link
Contributor Author

nkorth commented May 25, 2020

Updated with more normal search mode

Could you map the sync button LED to sync_enabled?

fixed

@Holzhaus
Copy link
Member

Holzhaus commented Jun 5, 2020

@nkorth Can you update the text about the sync LEDs on the wiki page?

Also, please rebase this PR on 2.2 or 2.3: https://mixxx.org/wiki/doku.php/using_git#targeting_another_base_branch
Otherwise it will only be included in the 2.4 release, so you'd have to wait at least until end of this year...

@nkorth nkorth changed the base branch from master to 2.3 June 7, 2020 06:45
@nkorth nkorth changed the base branch from 2.3 to master June 7, 2020 06:45
@nkorth
Copy link
Contributor Author

nkorth commented Jun 7, 2020

Github pull requests confuse me. I rebased it in a new branch here, do I have to create a whole new pull request in order to use that branch? Do I have to clobber nkorth:master with the contents of mixxx:2.3?

@Holzhaus
Copy link
Member

Holzhaus commented Jun 7, 2020

Github pull requests confuse me. I rebased it in a new branch here, do I have to create a whole new pull request in order to use that branch? Do I have to clobber nkorth:master with the contents of mixxx:2.3?

Generally, you should work in feature branches and never commit to master. Now that you already opened this PR and used your master branch for it, let's just continue using it and not open a new PR:

# Switch to the source branch for this PR
git checkout master
# Create a copy of the current branch for backup purposes
git branch -c idjl2-master-backup
# Set the state of the current branch to the rebased version
git reset --hard idjl2_controller
# Push the changes to this PR
git push -f origin master

@nkorth nkorth changed the base branch from master to 2.3 June 13, 2020 00:27
@nkorth
Copy link
Contributor Author

nkorth commented Jun 13, 2020

Done.

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.

LGTM.

@Holzhaus
Copy link
Member

Before we merge your code into Mixxx, please sign the contributor agreement. In a nutshell, this gives us permission to distribute your code under the GPL as well as in the Mac App Store which has some terms incompatible with the GPL.

@Holzhaus
Copy link
Member

Also, can you add an entry to CHANGELOG.md?

@nkorth
Copy link
Contributor Author

nkorth commented Jun 14, 2020

qt.qpa.screen: QXcbConnection: Could not connect to display :99.0
Could not connect to any X display.

I assume this is a flaky test and not the result of my change?

@Holzhaus
Copy link
Member

LGTM, thank you!

@Holzhaus Holzhaus merged commit 1b6a0c2 into mixxxdj:2.3 Jun 19, 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

4 participants