Skip to content

Pioneer DDJ-400#2385

Closed
nschloe wants to merge 320 commits intomixxxdj:masterfrom
nschloe:pioneer-ddj400
Closed

Pioneer DDJ-400#2385
nschloe wants to merge 320 commits intomixxxdj:masterfrom
nschloe:pioneer-ddj400

Conversation

@nschloe
Copy link
Copy Markdown
Contributor

@nschloe nschloe commented Dec 7, 2019

After #2143 and #2312, this is another take on the Pioneer DDJ-400.

This PR implements most of the basic functionality of the controller:

  • Mixer Section (Faders, EQ, Filter, Gain, Cue)
  • Browsing and loading
  • Jogwheels, Scratching, Bending
  • Beat Sync
  • Beatjump mode
  • Hot cue Mode
  • Beat Loop Mode

I've successfully used this on two occasions and only found minor glitches. For example, when a hot cue point is set it lights up (this is good), but when shift is pressed, the lights go out. The functionality is still there though.

There are still a bunch of advanced controls missing, for example the entire effects section. This can be added in second PR though.

The visual XML composer was of great help creating this PR as was @WarkerAnhaltRanger first pass.

I'd suggest we keep it simple here and try to add more functionality in follow-up PRs. I'd be happy about some feedback of course.

ronso0 and others added 30 commits November 18, 2019 08:12
… / hotcue, use 'cue_default' for mini decks' Play right-click
AppVeyor build on Windows with VS 2017 failed.
@Be-ing
Copy link
Copy Markdown
Contributor

Be-ing commented Dec 15, 2019

This PR contains a lot of unrelated commits now. It looks like you rebased onto master instead of 2.2. Do an interactive rebase git rebase -i mixxxdj/2.2 to rebase on 2.2 and remove all commits that are not related to this mapping.

@nschloe
Copy link
Copy Markdown
Contributor Author

nschloe commented Dec 16, 2019

It looks like you rebased onto master instead of 2.2.

I did indeed. I don't know how to undo either. git rebase -i mixxxdj/2.2 just gives fatal: invalid upstream 'mixxxdj/2.2'. The easiest thing is probably simply to start a new PR.

@Be-ing
Copy link
Copy Markdown
Contributor

Be-ing commented Dec 16, 2019

Have you set up the mixxxdj repository as a remote? The wiki has instructions to set it up as a remote called "upstream", so the command would be git rebase -i upstream/2.2

@nschloe
Copy link
Copy Markdown
Contributor Author

nschloe commented Dec 16, 2019

Yeah I always do that, but then I've never done an "interactive" rebase. I don't know what do to with the interface git gives me there. It just presents me with a million commits which I have to manually pick?

@Be-ing
Copy link
Copy Markdown
Contributor

Be-ing commented Dec 16, 2019

Delete the lines for every commit that doesn't have to do with your mapping, leaving only the commits for your mapping.

@nschloe
Copy link
Copy Markdown
Contributor Author

nschloe commented Dec 16, 2019

Delete the lines for every commit that doesn't have to do with your mapping, leaving only the commits for your mapping.

There are hundreds of commits, and I only see the title, not the author. It's too much work. I'll simply start a new PR.

@nschloe nschloe closed this Dec 16, 2019
@nschloe
Copy link
Copy Markdown
Contributor Author

nschloe commented Dec 16, 2019

See #2403.

@nschloe nschloe mentioned this pull request Dec 16, 2019
@Be-ing
Copy link
Copy Markdown
Contributor

Be-ing commented Dec 17, 2019

All of your commits are at the end. It should be easy to delete the commits before that.

@nschloe
Copy link
Copy Markdown
Contributor Author

nschloe commented Dec 24, 2019

I've played around with it for half an hour now but I can't seem to get the rebase to work. I did

$ git remote add upstream https://github.com/mixxxdj/mixxx.git
$ git fetch upstream
$ git rebase -i upstream/2.2
$ git push -f origin pioneer-ddj400

but I still have all those commits here. Gah.

Edit: It did work over at #2403 so let's just take it from there.

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.

8 participants