From 98d01ad2f500b5cad90244f7d4509f6fdc8f0fbe Mon Sep 17 00:00:00 2001 From: Swiftb0y <12380386+Swiftb0y@users.noreply.github.com> Date: Thu, 15 Feb 2024 21:11:24 +0100 Subject: [PATCH] Squashed commit of the following: commit 1dd21d432f6b7662bd420b6166435f9dccf8bb2b Author: ms Date: Thu Feb 15 02:17:19 2024 +0900 lint: rm space commit 6b0baadeb9cf411cb4b23ce57be4dc215dd1656f Author: ms Date: Thu Feb 15 01:18:17 2024 +0900 lint issues 2 commit 61394bdba27ed4c7613747285453ade23282921f Author: ms Date: Thu Feb 15 00:46:48 2024 +0900 fix linting commit 2a66f424409eddc0561fbb8ac4b880f5ec138aa9 Author: pitscher Date: Tue Feb 13 03:45:26 2024 +0100 fix fx toggle commit 8383f1e9f4e886ef5a3b7d7102d0ab1efb78a589 Author: pitscher Date: Tue Feb 13 03:22:43 2024 +0100 fx knob script --- res/controllers/Korg-KAOSS-DJ-scripts.js | 29 +++++++++++++++++++++--- res/controllers/Korg-KAOSS-DJ.midi.xml | 2 +- 2 files changed, 27 insertions(+), 4 deletions(-) diff --git a/res/controllers/Korg-KAOSS-DJ-scripts.js b/res/controllers/Korg-KAOSS-DJ-scripts.js index eca844553fa..0430127cfd5 100644 --- a/res/controllers/Korg-KAOSS-DJ-scripts.js +++ b/res/controllers/Korg-KAOSS-DJ-scripts.js @@ -181,11 +181,34 @@ KAOSSDJ.scratchMode = function(channel, _control, value, _status, _group) { }; KAOSSDJ.fxToggleButton = function(channel, _control, value, _status, _group) { - KAOSSDJ.updateDeckByChannel(channel, "fx", value === MIDI_ON); + KAOSSDJ.updateDeckByChannel(channel, "isFx", value === MIDI_ON); }; -KAOSSDJ.fxKnob = function(_channel, _control, _value, _status) { - // TODO +KAOSSDJ.fxKnob = function(_channel, _control, value, _status, _group) { + if (KAOSSDJ.shiftLeftPressed) { + // If Left Shift is pressed, cycle the effects chains on EffectUnit1 + if (value === MIDI_UP) { + engine.setValue("[EffectRack1_EffectUnit1]", "next_chain", 1); + } else if (value === MIDI_DOWN) { + engine.setValue("[EffectRack1_EffectUnit1]", "prev_chain", 1); + } + } else if (KAOSSDJ.shiftRightPressed) { + // If Right Shift is not pressed, cycle the effects chains on EffectUnit2 + if (value === MIDI_UP) { + engine.setValue("[EffectRack1_EffectUnit2]", "next_chain", 1); + } else if (value === MIDI_DOWN) { + engine.setValue("[EffectRack1_EffectUnit2]", "prev_chain", 1); + } + } else { + // If no shift is pressed, cycle through both QuickEffectRack filters + if (value === MIDI_UP) { + engine.setValue("[QuickEffectRack1_[Channel1]]", "next_chain", 1); + engine.setValue("[QuickEffectRack1_[Channel2]]", "next_chain", 1); + } else if (value === MIDI_DOWN) { + engine.setValue("[QuickEffectRack1_[Channel1]]", "prev_chain", 1); + engine.setValue("[QuickEffectRack1_[Channel2]]", "prev_chain", 1); + } + } }; KAOSSDJ.fxTouchMoveVertical = function(_channel, _control, value, _status, _group) { diff --git a/res/controllers/Korg-KAOSS-DJ.midi.xml b/res/controllers/Korg-KAOSS-DJ.midi.xml index eaab8360f8b..2d7d9133ad2 100644 --- a/res/controllers/Korg-KAOSS-DJ.midi.xml +++ b/res/controllers/Korg-KAOSS-DJ.midi.xml @@ -625,7 +625,7 @@ 0xB6 0x1F - +