Improvements suggested by Holzhaus

- Changed class name to uppercase (DJC4 instead of djc4)
- Improved controller description

2 files changed, 172 insertions, 173 deletions

diff --git a/res/controllers/Stanton-DJC-4-scripts.js b/res/controllers/Stanton-DJC-4-scripts.js
index a70ae4a789..c0c2ebc70c 100644
--- a/res/controllers/Stanton-DJC-4-scripts.js
+++ b/res/controllers/Stanton-DJC-4-scripts.js
@@ -1,5 +1,5 @@
 /**
- * Stanton DJC4 controller script v1.0 for Mixxx v2.2.3
+ * Stanton DJC.4 controller script v1.0 for Mixxx v2.2.3
  *
  * Written by Martin Bruset Solberg
  * Adopted for v2.2.3 by Christoph Zimmermann
@@ -14,18 +14,17 @@
  *
  **/
 
-var djc4 = {};
+var DJC4 = {};
 
 /////////////////
 // Tweakables. //
 /////////////////
 
-djc4.tempoRange = [0.08, 0.16, 0.5];  // not used yet!
-djc4.autoShowFourDecks = false;
-djc4.showMasterVu = true;  // if set to false, show channel VU meter
+DJC4.autoShowFourDecks = false;
+DJC4.showMasterVu = true;  // if set to false, show channel VU meter
 
 // amount the dryWetKnob changes the value for each increment
-djc4.dryWetAdjustValue = 0.05;
+DJC4.dryWetAdjustValue = 0.05;
 
 ///////////
 // Code. //
@@ -34,7 +33,7 @@ djc4.dryWetAdjustValue = 0.05;
 // ----------   Global variables    ----------
 
 // MIDI Reception commands (from spec)
-djc4.leds = {
+DJC4.leds = {
     loopminus: 2,
     loopplus: 3,
     loopin: 4,
@@ -78,20 +77,20 @@ djc4.leds = {
 // ----------   Functions    ----------
 
 // Called when the MIDI device is opened & set up.
-djc4.init = function() {
+DJC4.init = function() {
     var i;
 
     // Put all LEDs to default state.
-    djc4.allLed2Default();
+    DJC4.allLed2Default();
 
-    engine.makeConnection("[Channel3]", "track_loaded", djc4.autoShowDecks);
-    engine.makeConnection("[Channel4]", "track_loaded", djc4.autoShowDecks);
+    engine.makeConnection("[Channel3]", "track_loaded", DJC4.autoShowDecks);
+    engine.makeConnection("[Channel4]", "track_loaded", DJC4.autoShowDecks);
 
     if (engine.getValue("[Master]", "num_samplers") < 8) {
         engine.setValue("[Master]", "num_samplers", 8);
     }
 
-    djc4.browseEncoder = new components.Encoder({
+    DJC4.browseEncoder = new components.Encoder({
         group: "[Library]",
         inKey: "Move",
         input: function(channel, control, value) {
@@ -109,38 +108,38 @@ djc4.init = function() {
         },
     });
 
-    djc4.deck = [];
+    DJC4.deck = [];
     for (i = 0; i < 4; i++) {
-        djc4.deck[i] = new djc4.Deck(i + 1);
-        djc4.deck[i].setCurrentDeck("[Channel" + (i + 1) + "]");
+        DJC4.deck[i] = new DJC4.Deck(i + 1);
+        DJC4.deck[i].setCurrentDeck("[Channel" + (i + 1) + "]");
     }
 
-    djc4.effectUnit = [];
+    DJC4.effectUnit = [];
     for (i = 0; i <= 3; i++) {
-        djc4.effectUnit[i] = new components.EffectUnit([i + 1]);
-        djc4.effectUnit[i].shiftOffset = 0x32;
-        djc4.effectUnit[i].shiftControl = true;
-        djc4.effectUnit[i].enableButtons[1].midi = [0x90 + i, 0x1F];
-        djc4.effectUnit[i].enableButtons[2].midi = [0x90 + i, 0x20];
-        djc4.effectUnit[i].enableButtons[3].midi = [0x90 + i, 0x21];
-        djc4.effectUnit[i].effectFocusButton.midi = [0x90 + i, 0x1D];
-        djc4.effectUnit[i].knobs[1].midi = [0xB0 + i, 0x09];
-        djc4.effectUnit[i].knobs[2].midi = [0xB0 + i, 0x0A];
-        djc4.effectUnit[i].knobs[3].midi = [0xB0 + i, 0x0B];
-        djc4.effectUnit[i].dryWetKnob.midi = [0xB0 + i, 0x08];
-        djc4.effectUnit[i].dryWetKnob.input = function(channel, control, value) {
+        DJC4.effectUnit[i] = new components.EffectUnit([i + 1]);
+        DJC4.effectUnit[i].shiftOffset = 0x32;
+        DJC4.effectUnit[i].shiftControl = true;
+        DJC4.effectUnit[i].enableButtons[1].midi = [0x90 + i, 0x1F];
+        DJC4.effectUnit[i].enableButtons[2].midi = [0x90 + i, 0x20];
+        DJC4.effectUnit[i].enableButtons[3].midi = [0x90 + i, 0x21];
+        DJC4.effectUnit[i].effectFocusButton.midi = [0x90 + i, 0x1D];
+        DJC4.effectUnit[i].knobs[1].midi = [0xB0 + i, 0x09];
+        DJC4.effectUnit[i].knobs[2].midi = [0xB0 + i, 0x0A];
+        DJC4.effectUnit[i].knobs[3].midi = [0xB0 + i, 0x0B];
+        DJC4.effectUnit[i].dryWetKnob.midi = [0xB0 + i, 0x08];
+        DJC4.effectUnit[i].dryWetKnob.input = function(channel, control, value) {
             if (value === 0x41) {
-                this.inSetParameter(this.inGetParameter() + djc4.dryWetAdjustValue);
+                this.inSetParameter(this.inGetParameter() + DJC4.dryWetAdjustValue);
             } else if (value === 0x3F) {
-                this.inSetParameter(this.inGetParameter() - djc4.dryWetAdjustValue);
+                this.inSetParameter(this.inGetParameter() - DJC4.dryWetAdjustValue);
             }
         };
-        djc4.effectUnit[i].init();
+        DJC4.effectUnit[i].init();
     }
 
     // === Master VU Meter ===
-    if (djc4.showMasterVu === true) {
-        djc4.vuMeter = new components.Component({
+    if (DJC4.showMasterVu === true) {
+        DJC4.vuMeter = new components.Component({
             midi: [0xB0, 0x03],
             group: "[Master]",
             outKey: "VuMeterL",
@@ -156,7 +155,7 @@ djc4.init = function() {
             },
         });
 
-        djc4.vuMeter = new components.Component({
+        DJC4.vuMeter = new components.Component({
             midi: [0xB0, 0x04],
             group: "[Master]",
             outKey: "VuMeterR",
@@ -175,12 +174,12 @@ djc4.init = function() {
 };
 
 // Called when the MIDI device is closed
-djc4.shutdown = function() {
+DJC4.shutdown = function() {
     // Put all LEDs to default state.
-    djc4.allLed2Default();
+    DJC4.allLed2Default();
 };
 
-djc4.Deck = function(deckNumber) {
+DJC4.Deck = function(deckNumber) {
     components.Deck.call(this, deckNumber);
 
     // === Instantiate controls ===
@@ -206,8 +205,8 @@ djc4.Deck = function(deckNumber) {
     }
 
     // === Channel VU Meter ===
-    if (djc4.showMasterVu === false) {
-        djc4.vuMeter = new components.Component({
+    if (DJC4.showMasterVu === false) {
+        DJC4.vuMeter = new components.Component({
             midi: [0xB0+deckNumber-1, 0x02],
             group: "[Channel" + deckNumber + "]",
             outKey: "VuMeter",
@@ -231,7 +230,7 @@ djc4.Deck = function(deckNumber) {
         if (value === 0x7F) {
             // Toggle setting
             this.scratchMode = !this.scratchMode;
-            djc4.setLed(script.deckFromGroup(this.currentDeck), djc4.leds["scratch"], this.scratchMode);
+            DJC4.setLed(script.deckFromGroup(this.currentDeck), DJC4.leds["scratch"], this.scratchMode);
         }
     };
 
@@ -278,7 +277,7 @@ djc4.Deck = function(deckNumber) {
             // song duration in order for the jog wheel to cover the same amount
             // of time given a constant turning angle.
             var duration = engine.getValue(this.currentDeck, "duration");
-            var newPos = Math.max(0, oldPos + (newValue * djc4.stripSearchScaling / duration));
+            var newPos = Math.max(0, oldPos + (newValue * DJC4.stripSearchScaling / duration));
             engine.setValue(this.currentDeck, "playposition", newPos); // Strip search
         } else {
             engine.setValue(this.currentDeck, "jog", newValue); // Pitch bend
@@ -288,12 +287,12 @@ djc4.Deck = function(deckNumber) {
 
 // === FOR MANAGING LEDS ===
 
-djc4.allLed2Default = function() {
+DJC4.allLed2Default = function() {
     // All LEDs OFF for deck 1 to 4
     var i = 0;
     for (i = 1; i <= 4; i++) {
-        for (var led in djc4.leds) {
-            djc4.setLed(i, djc4.leds[led], 0);
+        for (var led in DJC4.leds) {
+            DJC4.setLed(i, DJC4.leds[led], 0);
         }
         // Channel VU meter
         midi.sendShortMsg(0xB0 + (i - 1), 2, 0);
@@ -304,7 +303,7 @@ djc4.allLed2Default = function() {
 };
 
 // Set leds function
-djc4.setLed = function(deck, led, status) {
+DJC4.setLed = function(deck, led, status) {
     var ledStatus = 0x00; // Default OFF
     switch (status) {
     case 0:
@@ -327,37 +326,37 @@ djc4.setLed = function(deck, led, status) {
 
 // === MISC COMMON ===
 
-djc4.autoShowDecks = function() {
+DJC4.autoShowDecks = function() {
     var anyLoaded = engine.getValue("[Channel3]", "track_loaded") || engine.getValue("[Channel4]", "track_loaded");
-    if (!djc4.autoShowFourDecks) {
+    if (!DJC4.autoShowFourDecks) {
         return;
     }
     engine.setValue("[Master]", "show_4decks", anyLoaded);
 };
 
-djc4.shiftButton = function(channel, control, value) {
+DJC4.shiftButton = function(channel, control, value) {
     var i;
     if (value === 0x7F) {
-        djc4.browseEncoder.shift();
+        DJC4.browseEncoder.shift();
         for (i = 0; i < 4; i++) {
-            djc4.deck[i].shift();
-            djc4.effectUnit[i].shift();
+            DJC4.deck[i].shift();
+            DJC4.effectUnit[i].shift();
         }
     } else {
-        djc4.browseEncoder.unshift();
+        DJC4.browseEncoder.unshift();
         for (i = 0; i < 4; i++) {
-            djc4.deck[i].unshift();
-            djc4.effectUnit[i].unshift();
+            DJC4.deck[i].unshift();
+            DJC4.effectUnit[i].unshift();
         }
     }
 };
 
-djc4.crossfaderCurve = function(channel, control, value) {
-    script.crossfaderCurve(value, 0, 127);
+DJC4.crossfaderCurve = function(channel, control, value) {
+    script.crossfaderCurve(value, 0, 0x7F);
 };
 
 // === Sampler Volume Control ===
-djc4.samplerVolume = function(channel, control, value) {
+DJC4.samplerVolume = function(channel, control, value) {
     // check if the Sampler Volume is at Zero and if so hide the sampler bank
     if (value > 0x00) {
         engine.setValue("[Samplers]", "show_samplers", true);
@@ -376,4 +375,4 @@ djc4.samplerVolume = function(channel, control, value) {
 
 
 // give your custom Deck all the methods of the generic Deck in the Components library
-djc4.Deck.prototype = Object.create(components.Deck.prototype);
+DJC4.Deck.prototype = Object.create(components.Deck.prototype);
diff --git a/res/controllers/Stanton-DJC-4.midi.xml b/res/controllers/Stanton-DJC-4.midi.xml
index 0caf19fc50..e095496d81 100644
--- a/res/controllers/Stanton-DJC-4.midi.xml
+++ b/res/controllers/Stanton-DJC-4.midi.xml
@@ -3,19 +3,19 @@
   <info>
     <name>Stanton DJC.4</name>
     <author>Martin Bruset Solberg, Christoph Zimmermann</author>
-    <description>The Stanton DJC.4 is a four-deck control surface with large, touch-sensitive jog wheels and built-in audio interface (2 inputs, 2 outputs). Configured as four-deck, four-fx and master VU meter controller</description>
+    <description>The Stanton DJC.4 is a 4 deck controller with large, touch-sensitive jog wheels and a built-in audio interface (2 inputs, 2 outputs). It features 4 FX units and a master VU meter.</description>
     <wiki>https://mixxx.org/wiki/doku.php/stanton_djc.4</wiki>
   </info>
   <controller id="DJC-4">
     <scriptfiles>
       <file functionprefix="" filename="lodash.mixxx.js"/>
       <file functionprefix="" filename="midi-components-0.0.js"/>
-      <file functionprefix="djc4" filename="Stanton-DJC-4-scripts.js" />
+      <file functionprefix="DJC4" filename="Stanton-DJC-4-scripts.js" />
     </scriptfiles>
     <controls>
       <control>
         <group>[Channel1]</group>
-        <key>djc4.deck[0].beatLoopEncoder.input</key>
+        <key>DJC4.deck[0].beatLoopEncoder.input</key>
         <status>0xB0</status>
         <midino>0x01</midino>
         <options>
@@ -33,7 +33,7 @@
       </control>
       <control>
         <group>[Channel2]</group>
-        <key>djc4.deck[1].beatLoopEncoder.input</key>
+        <key>DJC4.deck[1].beatLoopEncoder.input</key>
         <status>0xB1</status>
         <midino>0x01</midino>
         <options>
@@ -51,7 +51,7 @@
       </control>
       <control>
         <group>[Channel3]</group>
-        <key>djc4.deck[2].beatLoopEncoder.input</key>
+        <key>DJC4.deck[2].beatLoopEncoder.input</key>
         <status>0xB2</status>
         <midino>0x01</midino>
         <options>
@@ -69,7 +69,7 @@
       </control>
       <control>
         <group>[Channel4]</group>
-        <key>djc4.deck[3].beatLoopEncoder.input</key>
+        <key>DJC4.deck[3].beatLoopEncoder.input</key>
         <status>0xB3</status>
         <midino>0x01</midino>
         <options>
@@ -87,7 +87,7 @@
       </control>
       <control>
         <group>[Channel1]</group>
-        <key>djc4.deck[0].wheelTurn</key>
+        <key>DJC4.deck[0].wheelTurn</key>
         <status>0xB0</status>
         <midino>0x02</midino>
         <options>
@@ -105,7 +105,7 @@
       </control>
       <control>
         <group>[Channel2]</group>
-        <key>djc4.deck[1].wheelTurn</key>
+        <key>DJC4.deck[1].wheelTurn</key>
         <status>0xB1</status>
         <midino>0x02</midino>
         <options>
@@ -123,7 +123,7 @@
       </control>
       <control>
         <group>[Channel3]</group>
-        <key>djc4.deck[2].wheelTurn</key>
+        <key>DJC4.deck[2].wheelTurn</key>
         <status>0xB2</status>
         <midino>0x02</midino>
         <options>
@@ -141,7 +141,7 @@
       </control>
       <control>
         <group>[Channel4]</group>
-        <key>djc4.deck[3].wheelTurn</key>
+        <key>DJC4.deck[3].wheelTurn</key>
         <status>0xB3</status>
         <midino>0x02</midino>
         <options>
@@ -483,7 +483,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1]</group>
-        <key>djc4.effectUnit[0].dryWetKnob.input</key>
+        <key>DJC4.effectUnit[0].dryWetKnob.input</key>
         <status>0xB0</status>
         <midino>0x08</midino>
         <options>
@@ -492,7 +492,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit3]</group>
-        <key>djc4.effectUnit[1].dryWetKnob.input</key>
+        <key>DJC4.effectUnit[1].dryWetKnob.input</key>
         <status>0xB1</status>
         <midino>0x08</midino>
         <options>
@@ -501,7 +501,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit3]</group>
-        <key>djc4.effectUnit[2].dryWetKnob.input</key>
+        <key>DJC4.effectUnit[2].dryWetKnob.input</key>
         <status>0xB2</status>
         <midino>0x08</midino>
         <options>
@@ -510,7 +510,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit3]</group>
-        <key>djc4.effectUnit[3].dryWetKnob.input</key>
+        <key>DJC4.effectUnit[3].dryWetKnob.input</key>
         <status>0xB3</status>
         <midino>0x08</midino>
         <options>
@@ -591,7 +591,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1_Effect1]</group>
-        <key>djc4.effectUnit[0].knobs[1].input</key>
+        <key>DJC4.effectUnit[0].knobs[1].input</key>
         <status>0xB0</status>
         <midino>0x09</midino>
         <options>
@@ -600,7 +600,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2_Effect1]</group>
-        <key>djc4.effectUnit[1].knobs[1].input</key>
+        <key>DJC4.effectUnit[1].knobs[1].input</key>
         <status>0xB1</status>
         <midino>0x09</midino>
         <options>
@@ -609,7 +609,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1_Effect1]</group>
-        <key>djc4.effectUnit[2].knobs[1].input</key>
+        <key>DJC4.effectUnit[2].knobs[1].input</key>
         <status>0xB2</status>
         <midino>0x09</midino>
         <options>
@@ -618,7 +618,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2_Effect1]</group>
-        <key>djc4.effectUnit[3].knobs[1].input</key>
+        <key>DJC4.effectUnit[3].knobs[1].input</key>
         <status>0xB3</status>
         <midino>0x09</midino>
         <options>
@@ -663,7 +663,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1_Effect2]</group>
-        <key>djc4.effectUnit[0].knobs[2].input</key>
+        <key>DJC4.effectUnit[0].knobs[2].input</key>
         <status>0xB0</status>
         <midino>0x0A</midino>
         <options>
@@ -672,7 +672,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2_Effect2]</group>
-        <key>djc4.effectUnit[1].knobs[2].input</key>
+        <key>DJC4.effectUnit[1].knobs[2].input</key>
         <status>0xB1</status>
         <midino>0x0A</midino>
         <options>
@@ -681,7 +681,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1_Effect2]</group>
-        <key>djc4.effectUnit[2].knobs[2].input</key>
+        <key>DJC4.effectUnit[2].knobs[2].input</key>
         <status>0xB2</status>
         <midino>0x0A</midino>
         <options>
@@ -690,7 +690,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2_Effect2]</group>
-        <key>djc4.effectUnit[3].knobs[2].input</key>
+        <key>DJC4.effectUnit[3].knobs[2].input</key>
         <status>0xB3</status>
         <midino>0x0A</midino>
         <options>
@@ -735,7 +735,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1_Effect3]</group>
-        <key>djc4.effectUnit[0].knobs[3].input</key>
+        <key>DJC4.effectUnit[0].knobs[3].input</key>
         <status>0xB0</status>
         <midino>0x0B</midino>
         <options>
@@ -744,7 +744,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2_Effect3]</group>
-        <key>djc4.effectUnit[1].knobs[3].input</key>
+        <key>DJC4.effectUnit[1].knobs[3].input</key>
         <status>0xB1</status>
         <midino>0x0B</midino>
         <options>
@@ -753,7 +753,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1_Effect3]</group>
-        <key>djc4.effectUnit[2].knobs[3].input</key>
+        <key>DJC4.effectUnit[2].knobs[3].input</key>
         <status>0xB2</status>
         <midino>0x0B</midino>
         <options>
@@ -762,7 +762,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2_Effect3]</group>
-        <key>djc4.effectUnit[3].knobs[3].input</key>
+        <key>DJC4.effectUnit[3].knobs[3].input</key>
         <status>0xB3</status>
         <midino>0x0B</midino>
         <options>
@@ -771,7 +771,7 @@
       </control>
       <control>
         <group>[Sampler1]</group>
-        <key>djc4.deck[0].samplerButtons[0].input</key>
+        <key>DJC4.deck[0].samplerButtons[0].input</key>
         <status>0x90</status>
         <midino>0x0C</midino>
         <options>
@@ -780,7 +780,7 @@
       </control>
       <control>
         <group>[Sampler5]</group>
-        <key>djc4.deck[1].samplerButtons[0].input</key>
+        <key>DJC4.deck[1].samplerButtons[0].input</key>
         <status>0x91</status>
         <midino>0x0C</midino>
         <options>
@@ -789,7 +789,7 @@
       </control>
       <control>
         <group>[Sampler1]</group>
-        <key>djc4.deck[2].samplerButtons[0].input</key>
+        <key>DJC4.deck[2].samplerButtons[0].input</key>
         <status>0x92</status>
         <midino>0x0C</midino>
         <options>
@@ -798,7 +798,7 @@
       </control>
       <control>
         <group>[Sampler5]</group>
-        <key>djc4.deck[3].samplerButtons[0].input</key>
+        <key>DJC4.deck[3].samplerButtons[0].input</key>
         <status>0x93</status>
         <midino>0x0C</midino>
         <options>
@@ -807,7 +807,7 @@
       </control>
       <control>
         <group>[Sampler2]</group>
-        <key>djc4.deck[0].samplerButtons[1].input</key>
+        <key>DJC4.deck[0].samplerButtons[1].input</key>
         <status>0x90</status>
         <midino>0x0D</midino>
         <options>
@@ -816,7 +816,7 @@
       </control>
       <control>
         <group>[Sampler6]</group>
-        <key>djc4.deck[1].samplerButtons[1].input</key>
+        <key>DJC4.deck[1].samplerButtons[1].input</key>
         <status>0x91</status>
         <midino>0x0D</midino>
         <options>
@@ -825,7 +825,7 @@
       </control>
       <control>
         <group>[Sampler2]</group>
-        <key>djc4.deck[2].samplerButtons[1].input</key>
+        <key>DJC4.deck[2].samplerButtons[1].input</key>
         <status>0x92</status>
         <midino>0x0D</midino>
         <options>
@@ -834,7 +834,7 @@
       </control>
       <control>
         <group>[Sampler6]</group>
-        <key>djc4.deck[3].samplerButtons[1].input</key>
+        <key>DJC4.deck[3].samplerButtons[1].input</key>
         <status>0x93</status>
         <midino>0x0D</midino>
         <options>
@@ -843,7 +843,7 @@
       </control>
       <control>
         <group>[Sampler]</group>
-        <key>djc4.samplerVolume</key>
+        <key>DJC4.samplerVolume</key>
         <status>0xB0</status>
         <midino>0x0D</midino>
         <options>
@@ -852,7 +852,7 @@
       </control>
       <control>
         <group>[Library]</group>
-        <key>djc4.browseEncoder.input</key>
+        <key>DJC4.browseEncoder.input</key>
         <status>0xB0</status>
         <midino>0x0E</midino>
         <options>
@@ -861,7 +861,7 @@
       </control>
       <control>
         <group>[Sampler3]</group>
-        <key>djc4.deck[0].samplerButtons[2].input</key>
+        <key>DJC4.deck[0].samplerButtons[2].input</key>
         <status>0x90</status>
         <midino>0x0E</midino>
         <options>
@@ -870,7 +870,7 @@
       </control>
       <control>
         <group>[Sampler7]</group>
-        <key>djc4.deck[1].samplerButtons[2].input</key>
+        <key>DJC4.deck[1].samplerButtons[2].input</key>
         <status>0x91</status>
         <midino>0x0E</midino>
         <options>
@@ -879,7 +879,7 @@
       </control>
       <control>
         <group>[Sampler3]</group>
-        <key>djc4.deck[2].samplerButtons[2].input</key>
+        <key>DJC4.deck[2].samplerButtons[2].input</key>
         <status>0x92</status>
         <midino>0x0E</midino>
         <options>
@@ -888,7 +888,7 @@
       </control>
       <control>
         <group>[Sampler7]</group>
-        <key>djc4.deck[3].samplerButtons[2].input</key>
+        <key>DJC4.deck[3].samplerButtons[2].input</key>
         <status>0x93</status>
         <midino>0x0E</midino>
         <options>
@@ -897,7 +897,7 @@
       </control>
       <control>
         <group>[Sampler4]</group>
-        <key>djc4.deck[0].samplerButtons[3].input</key>
+        <key>DJC4.deck[0].samplerButtons[3].input</key>
         <status>0x90</status>
         <midino>0x0F</midino>
         <options>
@@ -906,7 +906,7 @@
       </control>
       <control>
         <group>[Sampler8]</group>
-        <key>djc4.deck[1].samplerButtons[3].input</key>
+        <key>DJC4.deck[1].samplerButtons[3].input</key>
         <status>0x91</status>
         <midino>0x0F</midino>
         <options>
@@ -915,7 +915,7 @@
       </control>
       <control>
         <group>[Sampler4]</group>
-        <key>djc4.deck[2].samplerButtons[3].input</key>
+        <key>DJC4.deck[2].samplerButtons[3].input</key>
         <status>0x92</status>
         <midino>0x0F</midino>
         <options>
@@ -924,7 +924,7 @@
       </control>
       <control>
         <group>[Sampler8]</group>
-        <key>djc4.deck[3].samplerButtons[3].input</key>
+        <key>DJC4.deck[3].samplerButtons[3].input</key>
         <status>0x93</status>
         <midino>0x0F</midino>
         <options>
@@ -978,7 +978,7 @@
       </control>
       <control>
         <group>[Master]</group>
-        <key>djc4.crossfaderCurve</key>
+        <key>DJC4.crossfaderCurve</key>
         <status>0xB0</status>
         <midino>0x12</midino>
         <options>
@@ -1113,7 +1113,7 @@
       </control>
       <control>
         <group>[Channel1]</group>
-        <key>djc4.deck[0].toggleScratchMode</key>
+        <key>DJC4.deck[0].toggleScratchMode</key>
         <status>0x90</status>
         <midino>0x15</midino>
         <options>
@@ -1122,7 +1122,7 @@
       </control>
       <control>
         <group>[Channel2]</group>
-        <key>djc4.deck[1].toggleScratchMode</key>
+        <key>DJC4.deck[1].toggleScratchMode</key>
         <status>0x91</status>
         <midino>0x15</midino>
         <options>
@@ -1131,7 +1131,7 @@
       </control>
       <control>
         <group>[Channel3]</group>
-        <key>djc4.deck[2].toggleScratchMode</key>
+        <key>DJC4.deck[2].toggleScratchMode</key>
         <status>0x92</status>
         <midino>0x15</midino>
         <options>
@@ -1140,7 +1140,7 @@
       </control>
       <control>
         <group>[Channel4]</group>
-        <key>djc4.deck[3].toggleScratchMode</key>
+        <key>DJC4.deck[3].toggleScratchMode</key>
         <status>0x93</status>
         <midino>0x15</midino>
         <options>
@@ -1401,7 +1401,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1]</group>
-        <key>djc4.effectUnit[0].effectFocusButton.input</key>
+        <key>DJC4.effectUnit[0].effectFocusButton.input</key>
         <status>0x90</status>
         <midino>0x1D</midino>
         <options>
@@ -1410,7 +1410,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1]</group>
-        <key>djc4.effectUnit[1].effectFocusButton.input</key>
+        <key>DJC4.effectUnit[1].effectFocusButton.input</key>
         <status>0x91</status>
         <midino>0x1D</midino>
         <options>
@@ -1419,7 +1419,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1]</group>
-        <key>djc4.effectUnit[2].effectFocusButton.input</key>
+        <key>DJC4.effectUnit[2].effectFocusButton.input</key>
         <status>0x92</status>
         <midino>0x1D</midino>
         <options>
@@ -1428,7 +1428,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1]</group>
-        <key>djc4.effectUnit[3].effectFocusButton.input</key>
+        <key>DJC4.effectUnit[3].effectFocusButton.input</key>
         <status>0x93</status>
         <midino>0x1D</midino>
         <options>
@@ -1473,7 +1473,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1_Effect1]</group>
-        <key>djc4.effectUnit[0].enableButtons[1].input</key>
+        <key>DJC4.effectUnit[0].enableButtons[1].input</key>
         <status>0x90</status>
         <midino>0x1F</midino>
         <options>
@@ -1482,7 +1482,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2_Effect1]</group>
-        <key>djc4.effectUnit[1].enableButtons[1].input</key>
+        <key>DJC4.effectUnit[1].enableButtons[1].input</key>
         <status>0x91</status>
         <midino>0x1F</midino>
         <options>
@@ -1491,7 +1491,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit3_Effect1]</group>
-        <key>djc4.effectUnit[2].enableButtons[1].input</key>
+        <key>DJC4.effectUnit[2].enableButtons[1].input</key>
         <status>0x92</status>
         <midino>0x1F</midino>
         <options>
@@ -1500,7 +1500,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit4_Effect1]</group>
-        <key>djc4.effectUnit[3].enableButtons[1].input</key>
+        <key>DJC4.effectUnit[3].enableButtons[1].input</key>
         <status>0x93</status>
         <midino>0x1F</midino>
         <options>
@@ -1509,7 +1509,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1_Effect2]</group>
-        <key>djc4.effectUnit[0].enableButtons[2].input</key>
+        <key>DJC4.effectUnit[0].enableButtons[2].input</key>
         <status>0x90</status>
         <midino>0x20</midino>
         <options>
@@ -1518,7 +1518,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2_Effect2]</group>
-        <key>djc4.effectUnit[1].enableButtons[2].input</key>
+        <key>DJC4.effectUnit[1].enableButtons[2].input</key>
         <status>0x91</status>
         <midino>0x20</midino>
         <options>
@@ -1527,7 +1527,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit3_Effect2]</group>
-        <key>djc4.effectUnit[2].enableButtons[2].input</key>
+        <key>DJC4.effectUnit[2].enableButtons[2].input</key>
         <status>0x92</status>
         <midino>0x20</midino>
         <options>
@@ -1536,7 +1536,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit4_Effect2]</group>
-        <key>djc4.effectUnit[3].enableButtons[2].input</key>
+        <key>DJC4.effectUnit[3].enableButtons[2].input</key>
         <status>0x93</status>
         <midino>0x20</midino>
         <options>
@@ -1545,7 +1545,7 @@
       </control>
       <control>
         <group>[Channel1]</group>
-        <key>djc4.deck[0].wheelTurn</key>
+        <key>DJC4.deck[0].wheelTurn</key>
         <status>0xB0</status>
         <midino>0x20</midino>
         <options>
@@ -1554,7 +1554,7 @@
       </control>
       <control>
         <group>[Channel2]</group>
-        <key>djc4.deck[1].wheelTurn</key>
+        <key>DJC4.deck[1].wheelTurn</key>
         <status>0xB1</status>
         <midino>0x20</midino>
         <options>
@@ -1563,7 +1563,7 @@
       </control>
       <control>
         <group>[Channel3]</group>
-        <key>djc4.deck[2].wheelTurn</key>
+        <key>DJC4.deck[2].wheelTurn</key>
         <status>0xB2</status>
         <midino>0x20</midino>
         <options>
@@ -1572,7 +1572,7 @@
       </control>
       <control>
         <group>[Channel4]</group>
-        <key>djc4.deck[3].wheelTurn</key>
+        <key>DJC4.deck[3].wheelTurn</key>
         <status>0xB3</status>
         <midino>0x20</midino>
         <options>
@@ -1581,7 +1581,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1_Effect3]</group>
-        <key>djc4.effectUnit[0].enableButtons[3].input</key>
+        <key>DJC4.effectUnit[0].enableButtons[3].input</key>
         <status>0x90</status>
         <midino>0x21</midino>
         <options>
@@ -1590,7 +1590,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2_Effect3]</group>
-        <key>djc4.effectUnit[1].enableButtons[3].input</key>
+        <key>DJC4.effectUnit[1].enableButtons[3].input</key>
         <status>0x91</status>
         <midino>0x21</midino>
         <options>
@@ -1599,7 +1599,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1_Effect3]</group>
-        <key>djc4.effectUnit[2].enableButtons[3].input</key>
+        <key>DJC4.effectUnit[2].enableButtons[3].input</key>
         <status>0x92</status>
         <midino>0x21</midino>
         <options>
@@ -1608,7 +1608,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2_Effect3]</group>
-        <key>djc4.effectUnit[3].enableButtons[3].input</key>
+        <key>DJC4.effectUnit[3].enableButtons[3].input</key>
         <status>0x93</status>
         <midino>0x21</midino>
         <options>
@@ -1689,7 +1689,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit1]</group>
-        <key>djc4.effectUnit[0].dryWetKnob.input</key>
+        <key>DJC4.effectUnit[0].dryWetKnob.input</key>
         <status>0xB0</status>
         <midino>0x26</midino>
         <options>
@@ -1698,7 +1698,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2]</group>
-        <key>djc4.effectUnit[1].dryWetKnob.input</key>
+        <key>DJC4.effectUnit[1].dryWetKnob.input</key>
         <status>0xB1</status>
         <midino>0x26</midino>
         <options>
@@ -1707,7 +1707,7 @@
       </control>
       <control>
         <group>[EffectRack1_EffectUnit2]</group>
-        <key>djc4.effectUnit[2].dryWetKnob.input</key>
+        <key>DJC4.effectUnit[2].dryWetKnob.input</key>
         <status>0xB2</status>