Pioneer DDJ 200 support #2377

dan-giddins · 2019-12-02T16:32:41Z

Adding support for the Pioneer DDJ 200

res/controllers/Pioneer DDJ-200.midi.xml

Holzhaus

Thanks for contibuting!

The code is rather short and I don't think there are any obvious issues.
However, I didn't find a wiki page for this mapping, which makes it hard to see if there are any problem with the way buttons are mapped.

If you didn't create a wiki page yet, please go ahead and document your mapping here: https://mixxx.org/wiki/doku.php/pioneer_ddj-200?do=edit
For the Pioneer DDJ-400, there's a wiki page here: https://mixxx.org/wiki/doku.php/pioneer_ddj-400
You could use that as a template and delete/change all buttons that do not exist or are mapped differently on the DDJ-200.

res/controllers/Pioneer DDJ-200.midi.xml

res/controllers/Pioneer-DDJ-200-scripts.js

res/controllers/Pioneer DDJ-200.midi.xml

Holzhaus · 2020-01-14T15:31:33Z

@dan-giddins Pinging you in case you didn't see the review comments. ;-)

dan-giddins · 2020-01-15T20:12:37Z

@dan-giddins Pinging you in case you didn't see the review comments. ;-)
I did see, but I've been very busy recently! I will get around to getting this done at some point!

Holzhaus · 2020-01-19T22:28:28Z

Another thing: Controller mappings are usually added to the current stable branch (2.2), not the development branch (master). Hence, you need to rebase your changes onto the 2.2 branch. I added some instructions to to the wiki in case you don't know how.

dan-giddins · 2020-03-29T17:06:18Z

Another thing: Controller mappings are usually added to the current stable branch (2.2), not the development branch (master). Hence, you need to rebase your changes onto the 2.2 branch. I added some instructions to to the wiki in case you don't know how.

@Holzhaus This should be done now? I haven't done a rebase before, so just let me know if anything is wrong

Holzhaus · 2020-03-29T17:19:37Z

Another thing: Controller mappings are usually added to the current stable branch (2.2), not the development branch (master). Hence, you need to rebase your changes onto the 2.2 branch. I added some instructions to to the wiki in case you don't know how.

@Holzhaus This should be done now? I haven't done a rebase before, so just let me know if anything is wrong

The rebase worked fine. If it didn't, you'd see all commits from the master branch that are not present in 2.2 in addition to you changes listed here. Thanks.

dan-giddins · 2020-04-04T13:33:29Z

@Holzhaus I've tried making an account on the forums to create the wiki page, but I'm not getting any email with my password in, and therefor I can't log in!

Account name = dan-giddins

dan-giddins · 2020-04-04T14:21:25Z

@Holzhaus I have managed to get scratching and jogging working, but do you know how I could add this functionality to the jog wheel

For reference: https://www.recordcase.de/media/pdf/cd/8f/4a/Pioneer-DDJ-200-User-Manual.pdf

Holzhaus · 2020-04-04T16:52:39Z

@Holzhaus I've tried making an account on the forums to create the wiki page, but I'm not getting any email with my password in, and therefor I can't log in!

Account name = dan-giddins

Sorry, we sometimes have problems with forum emails not getting sent. I think the Wiki account and the forum account are not linked, so you can try to create a wiki account here: https://mixxx.org/wiki/doku.php/start?do=register

@rryan Can you activate the forum account manually?

Holzhaus · 2020-04-04T16:54:22Z

@Holzhaus I have managed to get scratching and jogging working, but do you know how I could add this functionality to the jog wheel

For reference: https://www.recordcase.de/media/pdf/cd/8f/4a/Pioneer-DDJ-200-User-Manual.pdf

Have a look at: https://github.com/mixxxdj/mixxx/blob/master/res/controllers/Roland_DJ-505-scripts.js#L429-L435

dan-giddins · 2020-04-04T17:04:18Z

@Holzhaus sorry I mean a wiki account.

dan-giddins · 2020-04-05T11:17:22Z

@Holzhaus great, just waiting on the wiki account now :)
Still haven't got any password email so I can't log in

Holzhaus · 2020-06-30T22:21:53Z

@dan-giddins

@Holzhaus great, just waiting on the wiki account now :)
Still haven't got any password email so I can't log in

I'm sorry for the massive delay. Unfortunately, we were unable to fix the issues with our Wiki mail. We finally moved to GitHub wiki instead, and since you already have a GitHub account you should now be able to create a Wiki page for this controller: https://github.com/mixxxdj/mixxx/wiki

Holzhaus · 2020-10-18T11:43:44Z

I installed the config file according to the installation link like this:
pre-commit sample-config >.pre-commit-config.yaml
Or where can I find this file?

Ok, you overwrote our config file with the sample configuration. Please undo that.

Just install pre-commit either via pip or your package manager, then run pre-commit install: https://pre-commit.com/#3-install-the-git-hook-scripts
You need to skip the "Add a pre-commit configuration" step because we already have a configuration and you're not setting up pre-commit support for a new repository.

fkbreitl · 2020-10-18T13:01:15Z

I have updated the code accordingly at
dan-giddins/mixxx-ddj-200-mapping@master...fkbreitl:master
However, now Code Factor complains about 'engine' and 'script' is not defined.
It didn't do this before.
Why? Is this a problem? Of course its know by Mixxx.

Holzhaus · 2020-10-18T13:02:23Z

Ignore codefactor. If precommit agrees, all is fine.

fkbreitl · 2020-10-18T13:13:56Z

Ok, I think my PR dan-giddins/mixxx-ddj-200-mapping#11 is still valid and has my updates.
Then do we have to wait for Dan to pull it or can you pull it directly?

We also have a new 4 deck mapping. Can we have two mappings (a 2D and 4D version) for the same controller in Mixxx.

Holzhaus · 2020-10-18T13:22:26Z

Ok, I think my PR dan-giddins/mixxx-ddj-200-mapping#11 is still valid and has my updates.
Then do we have to wait for Dan to pull it or can you pull it directly?

You can also open a new pull request directly from your repo to this one, then I can close this PR.

We also need documentation for the user manual (starting with Mixxx 2.3, documentation for built-in mappings will be part of the normal manual, not the wiki). I migrated the Wiki page to the RST format using pandoc and added some graphics. Please fork this branch and open a PR for the manual-2.3.x branch on the manual repo: https://github.com/Holzhaus/manual/tree/pioneer-ddj-200

This needs to be taken care of before we can merge.

fkbreitl · 2020-10-18T13:48:25Z

Ok, I have created the PR for the manual. You did a lot of work. Looks very good. Thank you!
Holzhaus/manual#2

How can I created a PR from my repo to this one?

Holzhaus · 2020-10-18T13:53:01Z

How can I created a PR from my repo to this one?

Oh, I just realized you created a new repo for the mapping.

You need to fork the mixxx repository (click the little fork button at the top right corner, clone it, run git checkout -b ddj-200 origin/2.2, add your mapping files to res/controllers and open a PR). See https://github.com/mixxxdj/mixxx/wiki/Contributing%20mappings#using-git-with-your-mapping for details.

EDIT: in this case it would be nice to keep @dan-giddins in the commit history. So I suggest to fork/clone the Mixxx repo, then run:

$ git remote add dan-giddins https://github.com/dan-giddins/mixxx.git
$ git fetch dan-giddins
$ git checkout ddj-200-support

Then overwrite the files with your fixed versions, make a new commit, push and open a PR against the 2.2 branch.

fkbreitl · 2020-10-18T13:59:13Z

Just a side question: Do we really have to use camel case for all JS variables?
Because for variables of Mixxx controls I would prefer to use the same name for clarity, i.e. "sync_enabled" instead of "syncEnabled".

Holzhaus · 2020-10-18T14:01:01Z

Just a side question: Do we really have to use camel case for all JS variables?
Because for variables of Mixxx controls I would prefer to use the same name for clarity, i.e. "sync_enabled" instead of "syncEnabled".

Yes, please use camelCase for all variables. That also makes it easier to distinguish variables from the actual control.

fkbreitl · 2020-10-18T15:35:16Z

And what is the git push command I have to use?
git push origin 2.2?
Or is git push just fine?

Holzhaus · 2020-10-18T15:47:47Z

Use the name of your current branch. If you followed by edited instructions above, use git push origin ddj-200-support.

fkbreitl · 2020-10-18T15:53:22Z

Great, that's what I guessed. The PR is here:
#3185
But I don't know how to revert the file renaming, which you mentioned.

Holzhaus · 2020-10-18T16:07:25Z

But I don't know how to revert the file renaming, which you mentioned.

Run git log -- path/to/file to find the latest commit that changed the file. Copy the commit ID and verify that it's indeed that commit:

  git show <commit>

If you found the commit, run this to undo the changes:

git reset --hard <commit>~1 -- path/to/file

This sets the file to the state it had 1 commit before that commit. Now run git commit -m foo to commit the changes.

Then do a rebase to remove the changes from that commit:

git rebase -i <commit>~1

Now copy the line with your latest commit (message "foo") right below the line that contains the commit you found via git log and change pick to fixup.

EDIT: I think commit 9a3742d is the perpetrator. You can simply remove that commit completely:

git rebase -i 9a3742d5e8c3cbb3d56bb8872e39b99275a6d437~1

Then remove the line with that commit id (or replace pick with drop).

Holzhaus · 2020-10-18T16:08:37Z

This has been superseeded by #3185, closing this.

fkbreitl · 2020-10-18T17:21:45Z

@Holzhaus I get this error:

$ git reset --hard 9a3742d~1 -- Pioneer\ DDJ-SB.midi.xml
fatal: Cannot do hard reset with paths.

Holzhaus · 2020-10-18T17:30:05Z

oh, then do it without --hard. I think it already stages the changes in that case, but the working tree remains unchanged.

dan-giddins · 2020-10-19T10:29:07Z

@fkbreitl As you seem much more active with this work, I'm going to leave it up to you to merge this feature into MIXXX. Message me if you want any help, and I am happy to do PRs for you :)

fkbreitl · 2020-10-19T11:26:06Z

Thanks @dan-giddins, we are close. Have a look at #3185.

fkbreitl · 2020-10-20T22:12:54Z

@dan-giddins The DDJ-200 mapping is in v2.2 now! Also the 4-deck version is on its way! See #3193.

Marees213 · 2021-03-23T06:29:52Z

After updating my cross fader when moved fast to left or right selects automaticly a new song on decks accordingly.... can i still pull a request since its closed?

fkbreitl · 2021-03-23T09:45:14Z

Which version are you using?

Marees213 · 2021-03-26T19:28:35Z

2.3.0-beta x64 Sorry for late reaction

…

On Tue, 23 Mar 2021, 10:45 Frank Breitling, ***@***.***> wrote: Which version are you using? — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#2377 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AGAEFII4NXRYTZJLW3HNBWTTFBPLXANCNFSM4JTYQLGQ> .

Holzhaus · 2021-03-26T19:46:34Z

If you have a fix for this, please open a new pull request.

Marees213 · 2021-03-26T20:05:19Z

i wish, i dont code. this is my fav lead for the ddj and this is what i experience. dont even know how to pul a request. sorry for that...

…

On Fri, 26 Mar 2021 at 20:46, Jan Holthuis ***@***.***> wrote: If you have a fix for this, please open a new pull request. — You are receiving this because you commented. Reply to this email directly, view it on GitHub <#2377 (comment)>, or unsubscribe <https://github.com/notifications/unsubscribe-auth/AGAEFIMDHPPYKVOPMWI7J5LTFTQCVANCNFSM4JTYQLGQ> .

dan-giddins · 2021-03-27T12:41:41Z

@Marees213 are you sure you don't have Auto-DJ on? This is a deliberate function of Auto DJ I believe.

uklotzde reviewed Dec 2, 2019

View reviewed changes

res/controllers/Pioneer DDJ-200.midi.xml Outdated Show resolved Hide resolved

Holzhaus requested changes Dec 2, 2019

View reviewed changes

res/controllers/Pioneer DDJ-200.midi.xml Show resolved Hide resolved

res/controllers/Pioneer-DDJ-200-scripts.js Outdated Show resolved Hide resolved

res/controllers/Pioneer-DDJ-200-scripts.js Outdated Show resolved Hide resolved

Holzhaus reviewed Dec 2, 2019

View reviewed changes

res/controllers/Pioneer DDJ-200.midi.xml Show resolved Hide resolved

Holzhaus added the controller mappings label Dec 5, 2019

Holzhaus added this to the 2.2.4 milestone Dec 14, 2019

dan-giddins changed the base branch from master to 2.2 March 29, 2020 16:59

Dan Giddins added 4 commits March 29, 2020 18:04

make existing Pioneer filenames consistent

9a3742d

add in xml and js file for ddj-200

ab7c159

remove unused parameters

8dddda4

remove noise descriptions

fa87468

dan-giddins force-pushed the ddj-200-support branch from e1443b6 to fa87468 Compare March 29, 2020 17:04

improve and optimise script logic

762c675

give good descriptions

257f0b9

add support for seeking

d23a5e7

uklotzde modified the milestones: 2.2.4, 2.2.5, 2.2.x Jun 12, 2020

Holzhaus closed this Oct 18, 2020

Holzhaus mentioned this pull request Oct 18, 2020

Ddj 200 support #3185

Merged

uklotzde modified the milestones: 2.2.5, 2.3.0 May 11, 2021

mixxxbot mentioned this pull request Aug 23, 2022

Jog wheel / playposition not aligning to beatgrid of another playing track #10155

Closed

Pioneer DDJ 200 support #2377

Pioneer DDJ 200 support #2377

Conversation

dan-giddins commented Dec 2, 2019

Holzhaus left a comment

Choose a reason for hiding this comment

Holzhaus commented Jan 14, 2020

dan-giddins commented Jan 15, 2020

Holzhaus commented Jan 19, 2020

dan-giddins commented Mar 29, 2020 • edited Loading

Holzhaus commented Mar 29, 2020

dan-giddins commented Apr 4, 2020

dan-giddins commented Apr 4, 2020

Holzhaus commented Apr 4, 2020

Holzhaus commented Apr 4, 2020

dan-giddins commented Apr 4, 2020

dan-giddins commented Apr 5, 2020

Holzhaus commented Jun 30, 2020 • edited Loading

Holzhaus commented Oct 18, 2020

fkbreitl commented Oct 18, 2020

Holzhaus commented Oct 18, 2020

fkbreitl commented Oct 18, 2020

Holzhaus commented Oct 18, 2020

fkbreitl commented Oct 18, 2020 • edited Loading

Holzhaus commented Oct 18, 2020 • edited Loading

fkbreitl commented Oct 18, 2020 • edited Loading

Holzhaus commented Oct 18, 2020

fkbreitl commented Oct 18, 2020

Holzhaus commented Oct 18, 2020

fkbreitl commented Oct 18, 2020

Holzhaus commented Oct 18, 2020 • edited Loading

Holzhaus commented Oct 18, 2020

fkbreitl commented Oct 18, 2020 • edited Loading

Holzhaus commented Oct 18, 2020

dan-giddins commented Oct 19, 2020

fkbreitl commented Oct 19, 2020

fkbreitl commented Oct 20, 2020

Marees213 commented Mar 23, 2021

fkbreitl commented Mar 23, 2021

Marees213 commented Mar 26, 2021 via email

Holzhaus commented Mar 26, 2021

Marees213 commented Mar 26, 2021 via email

dan-giddins commented Mar 27, 2021

dan-giddins commented Mar 29, 2020 •

edited

Loading

Holzhaus commented Jun 30, 2020 •

edited

Loading

fkbreitl commented Oct 18, 2020 •

edited

Loading

Holzhaus commented Oct 18, 2020 •

edited

Loading

fkbreitl commented Oct 18, 2020 •

edited

Loading

Holzhaus commented Oct 18, 2020 •

edited

Loading

fkbreitl commented Oct 18, 2020 •

edited

Loading