Hercules Inpulse 200 (update March 2020) #2542

DJPhatso · 2020-03-10T13:31:41Z

Modified mapping files following the approval of the Inpulse 300

Initial release of MIDI configuration files for Hercules DJControl Inpulse 200

Deleted old file

Minor corrections that eslint didn't catch.

Holzhaus · 2020-03-10T20:47:15Z

Hey @DJPhatso, thanks for contributing yet another controller mapping. Can you please rebase on 2.2?

Holzhaus · 2020-03-10T22:54:44Z

https://mixxx.org/wiki/doku.php/using_git#targeting_another_base_branch

Holzhaus · 2020-03-12T10:04:49Z

Our pre-commit-pr job on Travis CI found some style issues:
https://travis-ci.org/github/mixxxdj/mixxx/jobs/660633844

Can copy and paste the diff from the build log into a new file names fix-issues.patch, the run git apply fix-issues.patch? That should resolve the issues.

Here's the diff:

diff --git a/res/controllers/Hercules-DJControl-Inpulse-200-script.js b/res/controllers/Hercules-DJControl-Inpulse-200-script.js
index fa12bac36..2b8a349d7 100644
--- a/res/controllers/Hercules-DJControl-Inpulse-200-script.js
+++ b/res/controllers/Hercules-DJControl-Inpulse-200-script.js
@@ -50,8 +50,8 @@ DJCi200.init = function() {
     DJCi200.scratchButtonState = true;
     // Scratch Action
     DJCi200.scratchAction = {
-    1: DJCi200.kScratchActionNone,
-    2: DJCi200.kScratchActionNone
+        1: DJCi200.kScratchActionNone,
+        2: DJCi200.kScratchActionNone
     };
 
     //Turn On Vinyl buttons LED(one for each deck).
@@ -61,11 +61,11 @@ DJCi200.init = function() {
     //Turn On Browser button LED
     midi.sendShortMsg(0x90, 0x04, 0x05);
 
-   //Softtakeover for Pitch fader
-   engine.softTakeover("[Channel1]", "rate", true);
-   engine.softTakeover("[Channel2]", "rate", true);
-   engine.softTakeoverIgnoreNextValue("[Channel1]", "rate");
-   engine.softTakeoverIgnoreNextValue("[Channel2]", "rate");
+    //Softtakeover for Pitch fader
+    engine.softTakeover("[Channel1]", "rate", true);
+    engine.softTakeover("[Channel2]", "rate", true);
+    engine.softTakeoverIgnoreNextValue("[Channel1]", "rate");
+    engine.softTakeoverIgnoreNextValue("[Channel2]", "rate");
 
     //Set effects Levels - Dry/Wet
     engine.setParameter("[EffectRack1_EffectUnit1_Effect1]", "meta", 0.6);
@@ -77,7 +77,7 @@ DJCi200.init = function() {
     engine.setParameter("[EffectRack1_EffectUnit1]", "mix", 1);
     engine.setParameter("[EffectRack1_EffectUnit2]", "mix", 1);
 
-	// Ask the controller to send all current knob/slider values over MIDI, which will update
+    // Ask the controller to send all current knob/slider values over MIDI, which will update
     // the corresponding GUI controls in MIXXX.
     midi.sendShortMsg(0xB0, 0x7F, 0x7F);
 };
diff --git a/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml b/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml
index 167611dd6..2c9b7634f 100644
--- a/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml
+++ b/res/controllers/Hercules_DJControl_Inpulse_200.midi.xml
@@ -790,7 +790,7 @@
                     <normal />
                 </options>
             </control>
-            
+
             <!--Continuous Controllers (CC) - Faders/knobs -->
             <!-- CC's MIDI Channel 1 (0xB0 Standard mode)-->
             <!--Crossfader-->
@@ -1645,4 +1645,4 @@
             </output>
         </outputs>
     </controller>
-</MixxxMIDIPreset>
\ No newline at end of file
+</MixxxMIDIPreset>

DJPhatso · 2020-03-12T12:29:41Z

Can copy and paste the diff from the build log into a new file names fix-issues.patch, the run git apply fix-issues.patch? That should resolve the issues.

Let's see if I understand correctly:

I should create a new text file called fix-issues.patch, paste the build log into it and save it (in the root of my Mixxx folder i would guess?);
Once done, run the command git apply fix-issues.patch.

So I tried that, and I got 'error: corrupt patch at line 61'

Holzhaus · 2020-03-12T13:17:47Z

Can copy and paste the diff from the build log into a new file names fix-issues.patch, the run git apply fix-issues.patch? That should resolve the issues.

Let's see if I understand correctly:

I should create a new text file called fix-issues.patch, paste the build log into it and save it (in the root of my Mixxx folder i would guess?);

Not the complete build log, just the diff that I copy-and-pasted from the build log to my comment above.

Once done, run the command git apply fix-issues.patch.

So I tried that, and I got 'error: corrupt patch at line 61'

You need to copy and paste the complete diff and not add, remove or modify any lines. It works fine for me.

After you've done that, you can delete the fix-issues.patch file and commit the changes.

DJPhatso · 2020-03-12T13:25:00Z

Exactly what I had done. Created a new one just in case, tried again, same error
fix-issues.zip

Holzhaus · 2020-03-12T13:48:40Z

Maybe your editor changed the formatting automatically or something like this. In that case download (not copy&paste) this one: https://gist.github.com/Holzhaus/d1c1c10f1b48c1b22961e420c568a67c

DJPhatso · 2020-03-12T13:51:52Z

No better

error: patch failed: res/controllers/Hercules-DJControl-Inpulse-200-script.js:61
error: res/controllers/Hercules-DJControl-Inpulse-200-script.js: patch does not apply

Holzhaus · 2020-03-12T13:56:08Z

This patch definitely works fine. Did you change your branch locally (i.e. made changed to the controller script files)? If you didn't commit them yet, you can check with git status.

DJPhatso · 2020-03-12T14:00:25Z

Haven't made any changes since it was committed and status tells me that it is indeed up to date.

Holzhaus · 2020-03-12T18:50:00Z

That is super strange. It works fine for me. Anyway, checkout out DJPhatso#6.

Hercules DJControl Inpulse 200: Fix some code stye issues

Holzhaus · 2020-03-15T14:51:55Z

Ok, the code style issues seem to be fixed. Ignore the CI build fails - our CI for 2.2 does not work properly. I'll review soon.

Holzhaus

@DJPhatso, thanks for contributing this mapping. It's really similar to the Inpulse 300 mapping that was merged a few days ago, so this should be fine. @Be-ing @Swiftb0y Do any of you want to take a look or shall I merge?

Swiftb0y · 2020-03-15T14:56:53Z

I'll take a look.

res/controllers/Hercules-DJControl-Inpulse-200-script.js

res/controllers/Hercules_DJControl_Inpulse_200.midi.xml

- Corrected a bad assignment to Effect Rack On/off - Mapped FX On/Off to both standard and SHIFT mode for the FX pads (related to an upcoming update to the device that will change how the pads work ).

Holzhaus

LGTM, thank you! Sorry for the delay, I'll go ahead and merge now.

DJPhatso · 2020-06-12T16:26:40Z

Thanks Jan.

Holzhaus · 2021-05-13T16:32:33Z

@DJPhatso I just noticed that this controller is lacking documentation in the manual (probably because this was originally merged for 2.2.5, before we added controller documentation in the manual). You could make a PR to the mixxxdj/manual to add it? Something similar to the documentation for the Pioneer DDJ-200 or the Roland DJ-505 would be great.

DJPhatso · 2021-05-13T16:45:50Z

…

________________________________ From: Jan Holthuis ***@***.***> Sent: Thursday, May 13, 2021 12:32:53 PM To: mixxxdj/mixxx ***@***.***> Cc: Benoit Duval ***@***.***>; Mention ***@***.***> Subject: Re: [mixxxdj/mixxx] Hercules Inpulse 200 (update March 2020) (#2542) @DJPhatso<https://github.com/DJPhatso> I just noticed that this controller is lacking documentation in the manual (probably because this was originally merged for 2.2.5, before we added controller documentation in the manual). You could make a PR to the mixxxdj/manual to add it? Something similar to the documentation for the Pioneer DDJ-200<https://manual.mixxx.org/2.3/en/hardware/controllers/pioneer_ddj_200.html> or the Roland DJ-505<https://manual.mixxx.org/2.3/en/hardware/controllers/roland_dj_505.html> would be great. — You are receiving this because you were mentioned. Reply to this email directly, view it on GitHub<#2542 (comment)>, or unsubscribe<https://github.com/notifications/unsubscribe-auth/ALQYI6O7Q6EHZTUTR7M55VLTNP5LLANCNFSM4LE67IFA>.

DJPhatso and others added 6 commits March 10, 2020 09:23

Add files via upload

85d12fc

Initial release of MIDI configuration files for Hercules DJControl Inpulse 200

Add files via upload

217ab26

Hercules-Inpulse-200

f8206e0

Delete Hercules-DJControl-Inpulse-200-script.js

3f1e62b

Deleted old file

Delete Hercules_DJControl_Inpulse_200.midi.xml

31c91d3

Deleted old file

Update Hercules-DJControl-Inpulse-200-script.js

78bb41e

Minor corrections that eslint didn't catch.

DJPhatso changed the base branch from master to 2.2 March 11, 2020 12:15

Holzhaus added the controller mappings label Mar 12, 2020

Holzhaus added this to the 2.2.4 milestone Mar 12, 2020

Hercules DJControl Inpulse 200: Fix some code stye issues

3a731ab

Merge pull request #6 from Holzhaus/Hercules-Inpulse-200

276da56

Hercules DJControl Inpulse 200: Fix some code stye issues

Holzhaus approved these changes Mar 15, 2020

View reviewed changes

Swiftb0y reviewed Mar 15, 2020

View reviewed changes

res/controllers/Hercules-DJControl-Inpulse-200-script.js Show resolved Hide resolved

res/controllers/Hercules-DJControl-Inpulse-200-script.js Show resolved Hide resolved

Holzhaus reviewed Mar 18, 2020

View reviewed changes

res/controllers/Hercules_DJControl_Inpulse_200.midi.xml Show resolved Hide resolved

Changes related to FX pad

561238e

- Corrected a bad assignment to Effect Rack On/off - Mapped FX On/Off to both standard and SHIFT mode for the FX pads (related to an upcoming update to the device that will change how the pads work ).

uklotzde modified the milestones: 2.2.4, 2.2.5 Jun 12, 2020

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

Holzhaus approved these changes Jun 12, 2020

View reviewed changes

Holzhaus merged commit c9ef8d8 into mixxxdj:2.2 Jun 12, 2020

DJPhatso mentioned this pull request Jun 22, 2020

Mapping for Hercules DJControl Inpulse 200 #2104

Closed

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

Holzhaus mentioned this pull request May 13, 2021

Hercules DJControl Inpulse 200: Add documentation mixxxdj/manual#388

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

Hercules Inpulse 200 (update March 2020) #2542

Hercules Inpulse 200 (update March 2020) #2542

DJPhatso commented Mar 10, 2020

Holzhaus commented Mar 10, 2020

Holzhaus commented Mar 10, 2020

Holzhaus commented Mar 12, 2020 •

edited

Loading

DJPhatso commented Mar 12, 2020

Holzhaus commented Mar 12, 2020

DJPhatso commented Mar 12, 2020

Holzhaus commented Mar 12, 2020

DJPhatso commented Mar 12, 2020

Holzhaus commented Mar 12, 2020

DJPhatso commented Mar 12, 2020

Holzhaus commented Mar 12, 2020

Holzhaus commented Mar 15, 2020

Holzhaus left a comment

Swiftb0y commented Mar 15, 2020

Holzhaus left a comment

DJPhatso commented Jun 12, 2020

Holzhaus commented May 13, 2021

DJPhatso commented May 13, 2021 via email

Hercules Inpulse 200 (update March 2020) #2542

Hercules Inpulse 200 (update March 2020) #2542

Conversation

DJPhatso commented Mar 10, 2020

Holzhaus commented Mar 10, 2020

Holzhaus commented Mar 10, 2020

Holzhaus commented Mar 12, 2020 • edited Loading

DJPhatso commented Mar 12, 2020

Holzhaus commented Mar 12, 2020

DJPhatso commented Mar 12, 2020

Holzhaus commented Mar 12, 2020

DJPhatso commented Mar 12, 2020

Holzhaus commented Mar 12, 2020

DJPhatso commented Mar 12, 2020

Holzhaus commented Mar 12, 2020

Holzhaus commented Mar 15, 2020

Holzhaus left a comment

Choose a reason for hiding this comment

Swiftb0y commented Mar 15, 2020

Holzhaus left a comment

Choose a reason for hiding this comment

DJPhatso commented Jun 12, 2020

Holzhaus commented May 13, 2021

DJPhatso commented May 13, 2021 via email

Holzhaus commented Mar 12, 2020 •

edited

Loading