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.

Sign up for GitHub

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

Jump to bottom

Slip button, tap tempo, strip search, FX button extras #1

Merged
merged 11 commits into from
Apr 12, 2018
Merged

Slip button, tap tempo, strip search, FX button extras #1

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
7f43a2a
Roland DJ-202: Map slip button
eigengrau Apr 9, 2018
62044ae
Roland DJ-202: Map tap tempo button
eigengrau Apr 9, 2018
6d07b1e
Roland DJ-202: Support strip search
eigengrau Apr 9, 2018
aae792e
Roland DJ-202: Map shifted FX inputs
eigengrau Apr 10, 2018
9b14c84
Roland DJ-202: Map FX-rack headphones cue
eigengrau Apr 10, 2018
0bd482c
Roland DJ-202: Map beat grid functions
eigengrau Apr 10, 2018
067e97f
Roland DJ-202: Map key shift functions
eigengrau Apr 10, 2018
1f111be
Roland DJ-202: Replace deprecated control
eigengrau Apr 11, 2018
8ce5fd1
Roland DJ-202: Map shifted rotary encoder
eigengrau Apr 11, 2018
69ea8d8
Roland DJ-202: Map rotary encoder button push
eigengrau Apr 11, 2018
3b2e934
Roland DJ-202: Map BPM reset
eigengrau Apr 11, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion res/controllers/Roland_DJ-202-scripts.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -198,9 +198,14 @@ DJ202.Deck = function (deckNumbers, offset) {
type: components.Button.prototype.types.toggle,
inKey: 'pfl',
outKey: 'pfl',
// missing: shift -> TAP
});

this.tapBPM = function (channel, control, value, status, group) {
if (value == 127) {
bpm.tapButton(script.deckFromGroup(this.currentDeck));
Copy link
Owner

Choose a reason for hiding this comment

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

You're right. I got some unexpected results, too. Let's improve this later on.

}
};

this.volume = new components.Pot({
midi: [0xB0 + offset, 0x1C],
inKey: 'volume',
Expand Down
18 changes: 18 additions & 0 deletions res/controllers/Roland_DJ-202.midi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -547,6 +547,15 @@
<script-binding/>
</options>
</control>
<control>
<group>[Channel1]</group>
<key>slip_enabled</key>
Copy link
Owner

Choose a reason for hiding this comment

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

For our aim to stay as close as possible to the labeling, I would like to map this inside the script so we can have both vinyl/slip. We could add a variable like "invertVinylSlipButton" for the user to configure the default (unshifted) behaviour.

<status>0x90</status>
<midino>0x07</midino>
<options>
<switch/>
</options>
</control>
<!-- mixer -->
<control>
<group>[Channel1]</group>
Expand Down Expand Up @@ -602,6 +611,15 @@
<script-binding/>
</options>
</control>
<control>
<group>[Channel1]</group>
<key>DJ202.leftDeck.tapBPM</key>
<status>0x90</status>
<midino>0x12</midino>
<options>
<script-binding/>
</options>
</control>
<control>
<group>[Channel1]</group>
<key>DJ202.leftDeck.volume.input</key>
Expand Down