Add tempo button LED as beat indicator option

Signed-off-by: Sam Whited <[email protected]>

Author: SamWhited

Diff for: res/controllers/DJ TechTools MIDI Fighter Twister.midi.xml

@@ -11,6 +11,23 @@
     </devices>
   </info>
   <settings>
+    <option variable="beatColor" type="enum" label="Beat Indicator Color">
+      <description>
+        Use the tempo knob LED as a beat indicator when set.
+      </description>
+      <value label="Off" default="true">-1</value>
+      <value label="Firmware Default">127</value>
+      <value label="Blue">1</value>
+      <value label="Celeste">32</value>
+      <value label="Teal">40</value>
+      <value label="Green">50</value>
+      <value label="Lime">60</value>
+      <value label="Yellow">66</value>
+      <value label="Orange">74</value>
+      <value label="Red">85</value>
+      <value label="Fuscia">100</value>
+      <value label="Purple">108</value>
+    </option>
     <option variable="peakColor" type="enum" label="Peak Indicator Color">
       <description>
         Use the gain knob LED as a peak indicator when set.

Diff for: res/controllers/DJ TechTools-MIDI Fighter Twister-scripts.js

@@ -15,20 +15,21 @@ var MidiFighterTwister;
         return Math.pow(value / 4, 0.5) * max;
     };
 
-    const gainConnect = function() {
-        this.connections[0] = engine.makeConnection(this.group, this.outKey, this.output.bind(this));
-
-        const peakColor = engine.getSetting("peakColor");
-        if (peakColor !== -1) {
-            this.connections[1] = engine.makeConnection(this.group, "PeakIndicator", (value) => {
-                if (value) {
-                    this.send(peakColor);
-                } else {
-                    const pregainDef = this.inGetParameter();
-                    this.send(pregainDef ? this.on : this.off);
-                }
-            });
-        }
+    const indicatorConnect = function(color, key) {
+        return function() {
+            this.connections[0] = engine.makeConnection(this.group, this.outKey, this.output.bind(this));
+
+            if (color !== -1) {
+                this.connections[1] = engine.makeConnection(this.group, key, (value) => {
+                    if (value === 0) {
+                        this.send(color);
+                    } else {
+                        const pregainDef = this.inGetParameter();
+                        this.send(pregainDef ? this.on : this.off);
+                    }
+                });
+            }
+        };
     };
 
     components.Button.prototype.on = engine.getSetting("defColor");
@@ -101,12 +102,14 @@ var MidiFighterTwister;
                 group: `[Channel${this.deckNumbers[0]}]`,
                 midi: [0xB1, this.midiModifier(0x04)],
                 key: "rate_set_default",
+                connect: indicatorConnect(engine.getSetting("beatColor"), "beat_active"),
             });
+
             this.gainButton = new components.Button({
                 group: `[Channel${this.deckNumbers[0]}]`,
                 midi: [0xB1, this.midiModifier(0x00)],
                 key: "pregain_set_default",
-                connect: gainConnect,
+                connect: indicatorConnect(engine.getSetting("peakColor"), "PeakIndicator"),
             });
             // The volume button toggles the headphones, unlike the others which
             // reset their control.
@@ -167,7 +170,7 @@ var MidiFighterTwister;
                 group: "[Master]",
                 midi: [0xB1, 0x0F],
                 key: "gain_set_default",
-                connect: gainConnect,
+                connect: indicatorConnect(engine.getSetting("peakColor"), "PeakIndicator"),
             });
         }