From ed262fae589f43bdaf122dcde19fd3b76f24fb39 Mon Sep 17 00:00:00 2001 From: BoredGuy1 Date: Tue, 2 Jan 2024 23:30:30 -0700 Subject: [PATCH 1/6] Added sampler stopping and toneplay --- .../hercules_djcontrol_inpulse_300.rst | 19 ++++++++++++++++++- 1 file changed, 18 insertions(+), 1 deletion(-) diff --git a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst index b380442494..ef7dc29f76 100644 --- a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst +++ b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst @@ -111,6 +111,22 @@ Pad 1 - 8 Set and trigger :hwlabel:`SHIFT` + Pad 1 - 8 Delete :term:`hotcue` 1 - 8. =============================================================== ========================================== +Toneplay Mode +^^^^^^^^^^^^ + +=============================================================== ========================================== +Control Function +=============================================================== ========================================== +Pad 1 Jump to the last used hot cue (or cue point if no hotcue is set) and play at original pitch. +Pad 2 Jump to the last used hot cue/cue point and play at +1 semitones. +Pad 3 Jump to the last used hot cue/cue point and play at +2 semitones. +Pad 4 Jump to the last used hot cue/cue point and play at +3 semitones. +Pad 5 Jump to the last used hot cue/cue point and play at -4 semitones. +Pad 6 Jump to the last used hot cue/cue point and play at -3 semitones. +Pad 7 Jump to the last used hot cue/cue point and play at -2 semitones. +Pad 8 Jump to the last used hot cue/cue point and play at -1 semitones. +=============================================================== ========================================== + Roll Mode ^^^^^^^^^ @@ -151,6 +167,8 @@ Control Function =============================================================== ========================================== Pad 1 - 8 (deck A) Trigger Sampler 1 - 8. Pad 1 - 8 (deck B) Trigger Sampler 9 - 16. +:hwlabel:`SHIFT` + Pad 1 - 8 (deck A) Stop Sampler 1 - 8. +:hwlabel:`SHIFT` + Pad 1 - 8 (deck B) Stop Sampler 9 - 16. =============================================================== ========================================== Beatjump Mode @@ -176,4 +194,3 @@ Controls not included in this mapping - Master buttons (Hardware control) - Beatmatch guide (Hardware control) - PADS: Slicer/Slicer Loop -- PADS: Toneplay From 69af91d5108a4fbdcc4b6c23f45fa1eb9d39b88a Mon Sep 17 00:00:00 2001 From: BoredGuy1 Date: Wed, 3 Jan 2024 12:21:07 -0700 Subject: [PATCH 2/6] Fixed syntax --- source/hardware/controllers/hercules_djcontrol_inpulse_300.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst index ef7dc29f76..9a785137e4 100644 --- a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst +++ b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst @@ -112,7 +112,7 @@ Pad 1 - 8 Set and trigger =============================================================== ========================================== Toneplay Mode -^^^^^^^^^^^^ +^^^^^^^^^^^^^ =============================================================== ========================================== Control Function From 573ef3d0e130877d4f6924e3a10596a3f1c91c40 Mon Sep 17 00:00:00 2001 From: BoredGuy1 Date: Mon, 12 Feb 2024 17:11:13 -0500 Subject: [PATCH 3/6] Updated to match Mixxx PR#12503 --- .../hercules_djcontrol_inpulse_300.rst | 22 +++++++++++++++++-- 1 file changed, 20 insertions(+), 2 deletions(-) diff --git a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst index 9a785137e4..a4427c2ba3 100644 --- a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst +++ b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst @@ -70,7 +70,7 @@ Loop :hwlabel:`IN` button Enable Beatloop :hwlabel:`SHIFT` + Loop :hwlabel:`IN` button Halve the current loop size. Loop :hwlabel:`OUT` button Disable Beatloop. :hwlabel:`SHIFT` + Loop :hwlabel:`OUT` button Double the current loop size. -Beat Align LED Track end warning (make sure :hwlabel:`BEATMATCH GUIDE` is on for this to work). +:hwlabel:`BEATMATCH GUIDE` Toggles beatmatch guide LEDs. :hwlabel:`SLIP` Toggles splip mode. :hwlabel:`Q` Toggles quantize. :hwlabel:`SHIFT` + :hwlabel:`Q` Adjusts beatgrid so closest beat is aligned with the current playposition. @@ -125,6 +125,14 @@ Pad 5 Jump to the las Pad 6 Jump to the last used hot cue/cue point and play at -3 semitones. Pad 7 Jump to the last used hot cue/cue point and play at -2 semitones. Pad 8 Jump to the last used hot cue/cue point and play at -1 semitones. +:hwlabel:`SHIFT` + Pad 1 Reset key. +:hwlabel:`SHIFT` + Pad 2 Sync key. +:hwlabel:`SHIFT` + Pad 3 Pitch the track down by 10 cents. +:hwlabel:`SHIFT` + Pad 4 Pitch the track up by 10 cents. +:hwlabel:`SHIFT` + Pad 5 Shift the toneplay keyboard down by 1 semitone. +:hwlabel:`SHIFT` + Pad 6 Shift the toneplay keyboard up by 1 semitone. +:hwlabel:`SHIFT` + Pad 7 Pitch the track down by 1 semitone. +:hwlabel:`SHIFT` + Pad 8 Pitch the track up by 1 semitone. =============================================================== ========================================== Roll Mode @@ -183,8 +191,19 @@ Pad 5 - 6 Jump backward/f Pad 7 - 8 Jump backward/forward by 8 beats. =============================================================== ========================================== +Slicer/Slicer Loop Mode +^^^^^^^^^^^^^^^^^^^^^^^ + +Pressing Slicer or Slicer Loop creates a 4-bar slicer section (length configurable in script). The slicer +section is cut into 8 slices, and pressing pad 1-8 will create a loop on slice 1-8. Pressing two pads +creates a loop between those two slices. Pressing three or more pads will create a loop between the first +and last pad. For example, pressing pads 2, 5, and 7 creates a loop between slices 2 and 7. + +In Slicer mode, the slicer section moves throughout the track. In Slicer Loop mode, the slicer section does not. + Known issues ------------ +- The slicer section does not move backwards with the play indicator when scratching with the jogwheel. Controls not included in this mapping ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -192,5 +211,4 @@ Controls not included in this mapping - Master knob (Hardware control) - Headphone knob (Hardware control) - Master buttons (Hardware control) -- Beatmatch guide (Hardware control) - PADS: Slicer/Slicer Loop From e33b9666bf6c8487fee9bab00696c87bdebb03b6 Mon Sep 17 00:00:00 2001 From: BoredGuy1 Date: Mon, 13 May 2024 13:56:18 -0700 Subject: [PATCH 4/6] Fixing formatting --- .../hercules_djcontrol_inpulse_300.rst | 42 +++++++++++++------ 1 file changed, 30 insertions(+), 12 deletions(-) diff --git a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst index a4427c2ba3..eef7d4ad0a 100644 --- a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst +++ b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst @@ -126,13 +126,13 @@ Pad 6 Jump to the las Pad 7 Jump to the last used hot cue/cue point and play at -2 semitones. Pad 8 Jump to the last used hot cue/cue point and play at -1 semitones. :hwlabel:`SHIFT` + Pad 1 Reset key. -:hwlabel:`SHIFT` + Pad 2 Sync key. -:hwlabel:`SHIFT` + Pad 3 Pitch the track down by 10 cents. -:hwlabel:`SHIFT` + Pad 4 Pitch the track up by 10 cents. -:hwlabel:`SHIFT` + Pad 5 Shift the toneplay keyboard down by 1 semitone. -:hwlabel:`SHIFT` + Pad 6 Shift the toneplay keyboard up by 1 semitone. -:hwlabel:`SHIFT` + Pad 7 Pitch the track down by 1 semitone. -:hwlabel:`SHIFT` + Pad 8 Pitch the track up by 1 semitone. +:hwlabel:`SHIFT` + Pad 2 Pitch the track up by 1 semitone. +:hwlabel:`SHIFT` + Pad 3 Pitch the track up by 10 cents. +:hwlabel:`SHIFT` + Pad 4 Shift the toneplay keyboard up by 1 semitone. +:hwlabel:`SHIFT` + Pad 5 Sync key. +:hwlabel:`SHIFT` + Pad 6 Pitch the track down by 1 semitone. +:hwlabel:`SHIFT` + Pad 7 Pitch the track down by 10 cents. +:hwlabel:`SHIFT` + Pad 8 Shift the toneplay keyboard down by 1 semitone. =============================================================== ========================================== Roll Mode @@ -194,16 +194,35 @@ Pad 7 - 8 Jump backward/f Slicer/Slicer Loop Mode ^^^^^^^^^^^^^^^^^^^^^^^ -Pressing Slicer or Slicer Loop creates a 4-bar slicer section (length configurable in script). The slicer -section is cut into 8 slices, and pressing pad 1-8 will create a loop on slice 1-8. Pressing two pads -creates a loop between those two slices. Pressing three or more pads will create a loop between the first -and last pad. For example, pressing pads 2, 5, and 7 creates a loop between slices 2 and 7. +=============================================================== ========================================== +Control Function +=============================================================== ========================================== +Slicer Create a slicer section (overrides active loops). Removes the slicer section if one is already active. +:hwlabel:`SHIFT` + Slicer Create a looped slicer section (overrides active loops). Removes the slicer section if one is already active. +Pad 1 - 8 Create a loop on slicer section 1-8. +Loop :hwlabel:`IN` button Enable Beatloop 4 beats (overrides active slicers). +:hwlabel:`SHIFT` + Loop :hwlabel:`IN` button Halve the slicer section size. +Loop :hwlabel:`OUT` button Disable Beatloop or slicer section. +:hwlabel:`SHIFT` + Loop :hwlabel:`OUT` button Double the slicer section size. +=============================================================== ========================================== + +Pressing Slicer or Slicer Loop creates a slicer section (indicated by loop markers). The length of the slicer section is dependent on loop size in the spinbox. +Pressing Slicer, Slicer Loop, or Loop Out will remove the slicer section. + +The slicer section is cut into 8 equal slices. Pressing pad 1-8 will create a loop on slice 1-8. For example, if a slicer section of 8 beats is created, then each slice will be 1 beat long. +Pressing pad 1 will create a 1-beat loop on the 1st slice (1st beat). Pad 2 will loop the 2nd slice, pad 3 will loop the 3rd beat, and so on. + +Pressing two pads at the same time creates a loop between two slices. For example, pressing pads 3 and 6 creates a 4 beat loop that encompasses slices 3, 4, 5, and 6. +Pressing three or more pads will create a loop between the first and last slices. For example, pressing pads 2, 5, and 7 creates a 6 beat loop that encompasses slices 2-7. In Slicer mode, the slicer section moves throughout the track. In Slicer Loop mode, the slicer section does not. +For more details, look at the original Inpulse 300 manual. + Known issues ------------ - The slicer section does not move backwards with the play indicator when scratching with the jogwheel. +- Slicer will not work properly if BPM is not constant. Controls not included in this mapping ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -211,4 +230,3 @@ Controls not included in this mapping - Master knob (Hardware control) - Headphone knob (Hardware control) - Master buttons (Hardware control) -- PADS: Slicer/Slicer Loop From fe4fa48c6e5d403a06e703045409c83c107f5ec9 Mon Sep 17 00:00:00 2001 From: BoredGuy1 Date: Mon, 29 Jul 2024 10:32:49 -0700 Subject: [PATCH 5/6] Updated to account for toneplay --- .../hercules_djcontrol_inpulse_300.rst | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst index eef7d4ad0a..b78b09c08e 100644 --- a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst +++ b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst @@ -125,14 +125,14 @@ Pad 5 Jump to the las Pad 6 Jump to the last used hot cue/cue point and play at -3 semitones. Pad 7 Jump to the last used hot cue/cue point and play at -2 semitones. Pad 8 Jump to the last used hot cue/cue point and play at -1 semitones. -:hwlabel:`SHIFT` + Pad 1 Reset key. -:hwlabel:`SHIFT` + Pad 2 Pitch the track up by 1 semitone. -:hwlabel:`SHIFT` + Pad 3 Pitch the track up by 10 cents. -:hwlabel:`SHIFT` + Pad 4 Shift the toneplay keyboard up by 1 semitone. -:hwlabel:`SHIFT` + Pad 5 Sync key. -:hwlabel:`SHIFT` + Pad 6 Pitch the track down by 1 semitone. -:hwlabel:`SHIFT` + Pad 7 Pitch the track down by 10 cents. -:hwlabel:`SHIFT` + Pad 8 Shift the toneplay keyboard down by 1 semitone. +:hwlabel:`SHIFT` + Pad 1 Change the pitch to +1 semitones (without jumping). +:hwlabel:`SHIFT` + Pad 2 Change the pitch to +2 semitones. +:hwlabel:`SHIFT` + Pad 3 Change the pitch to +3 semitones. +:hwlabel:`SHIFT` + Pad 4 Change the pitch to +4 semitones. +:hwlabel:`SHIFT` + Pad 5 Change the pitch to -4 semitones. +:hwlabel:`SHIFT` + Pad 6 Change the pitch to -3 semitones. +:hwlabel:`SHIFT` + Pad 7 Change the pitch to -2 semitones. +:hwlabel:`SHIFT` + Pad 8 Change the pitch to -1 semitones. =============================================================== ========================================== Roll Mode @@ -215,7 +215,7 @@ Pressing pad 1 will create a 1-beat loop on the 1st slice (1st beat). Pad 2 will Pressing two pads at the same time creates a loop between two slices. For example, pressing pads 3 and 6 creates a 4 beat loop that encompasses slices 3, 4, 5, and 6. Pressing three or more pads will create a loop between the first and last slices. For example, pressing pads 2, 5, and 7 creates a 6 beat loop that encompasses slices 2-7. -In Slicer mode, the slicer section moves throughout the track. In Slicer Loop mode, the slicer section does not. +In Slicer mode, the slicer section moves throughout the track. In Slicer Loop mode, the slicer section stays in place. For more details, look at the original Inpulse 300 manual. From f38bebf0cd3c3325c1252793bfd380047ffaf402 Mon Sep 17 00:00:00 2001 From: BoredGuy1 Date: Mon, 29 Jul 2024 11:13:00 -0700 Subject: [PATCH 6/6] Fixed typo --- .../controllers/hercules_djcontrol_inpulse_300.rst | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst index b78b09c08e..b32ca737dc 100644 --- a/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst +++ b/source/hardware/controllers/hercules_djcontrol_inpulse_300.rst @@ -125,10 +125,10 @@ Pad 5 Jump to the las Pad 6 Jump to the last used hot cue/cue point and play at -3 semitones. Pad 7 Jump to the last used hot cue/cue point and play at -2 semitones. Pad 8 Jump to the last used hot cue/cue point and play at -1 semitones. -:hwlabel:`SHIFT` + Pad 1 Change the pitch to +1 semitones (without jumping). -:hwlabel:`SHIFT` + Pad 2 Change the pitch to +2 semitones. -:hwlabel:`SHIFT` + Pad 3 Change the pitch to +3 semitones. -:hwlabel:`SHIFT` + Pad 4 Change the pitch to +4 semitones. +:hwlabel:`SHIFT` + Pad 1 Change the pitch to the original pitch (without jumping). +:hwlabel:`SHIFT` + Pad 2 Change the pitch to +1 semitones. +:hwlabel:`SHIFT` + Pad 3 Change the pitch to +2 semitones. +:hwlabel:`SHIFT` + Pad 4 Change the pitch to +3 semitones. :hwlabel:`SHIFT` + Pad 5 Change the pitch to -4 semitones. :hwlabel:`SHIFT` + Pad 6 Change the pitch to -3 semitones. :hwlabel:`SHIFT` + Pad 7 Change the pitch to -2 semitones.