X32 cleanup

plugins/x32/main.js

@@ -16,10 +16,10 @@ exports.config = {
   },
 };
 
-exports.ready = function ready(device) {
-  const d = device;
-  d.data.X32 = new Console();
-  d.send('/xinfo');
+exports.ready = function ready(_device) {
+  const device = _device;
+  device.data = new Console();
+  device.send('/xinfo');
 
   device.send('/batchsubscribe', [
     { type: 's', value: '/ch/meters' },
@@ -44,25 +44,25 @@ function parseAddress(msg) {
   return addr;
 }
 
-exports.data = function data(device, oscData) {
-  this.deviceInfoUpdate(device, 'status', 'ok');
+exports.data = function data(_device, oscData) {
+  this.deviceInfoUpdate(_device, 'status', 'ok');
 
-  const d = device;
+  const device = _device;
 
   if (oscData.address === '/xinfo') {
-    d.data.X32.info.name = oscData.args[1];
-    d.data.X32.info.ip = oscData.args[0];
-    d.data.X32.info.firmware = oscData.args[3];
-    d.data.X32.info.model = oscData.args[2];
+    device.data.info.name = oscData.args[1];
+    device.data.info.ip = oscData.args[0];
+    device.data.info.firmware = oscData.args[3];
+    device.data.info.model = oscData.args[2];
 
-    this.deviceInfoUpdate(device, 'defaultName', d.data.X32.info.name);
+    this.deviceInfoUpdate(_device, 'defaultName', device.data.info.name);
 
-    d.send('/main/st/config/name');
+    device.send('/main/st/config/name');
 
     for (let i = 0; i <= 32; i++) {
-      d.send(`/ch/${i.toString().padStart(2, '0')}/config/name`);
+      device.send(`/ch/${i.toString().padStart(2, '0')}/config/name`);
     }
-    d.draw();
+    device.draw();
   } else if (oscData.address.includes('/ch/meters')) {
     const buf = Buffer.from(oscData.args[0]);
 
@@ -70,12 +70,12 @@ exports.data = function data(device, oscData) {
     for (let i = 0; i < 70; i++) {
       if (i >= 0 && i < 32) {
         // These are channel meters
-        d.data.X32.inputs.channels[i].meter = Console.getBehringerDB(buf.readFloatLE(offset));
+        device.data.inputs.channels[i].meter = Console.getBehringerDB(buf.readFloatLE(offset));
       }
 
       offset += 4;
     }
-    d.draw();
+    device.draw();
   } else if (oscData.address.includes('/main/meters')) {
     const buf = Buffer.from(oscData.args[0]);
     let offset = 4; // skip first 4 bytes they are the length bytes
@@ -83,10 +83,10 @@ exports.data = function data(device, oscData) {
     for (let i = 0; i < 49; i++) {
       if (i === 22) {
         // STEREO LEFT METER
-        d.data.X32.main.stereo.meter[0] = Console.getBehringerDB(buf.readFloatLE(offset));
+        device.data.main.stereo.meter[0] = Console.getBehringerDB(buf.readFloatLE(offset));
       } else if (i === 23) {
         // STEREO RIGHT METER
-        d.data.X32.main.stereo.meter[1] = Console.getBehringerDB(buf.readFloatLE(offset));
+        device.data.main.stereo.meter[1] = Console.getBehringerDB(buf.readFloatLE(offset));
       }
       offset += 4;
     }
@@ -95,56 +95,53 @@ exports.data = function data(device, oscData) {
 
     if (addr[0] === 'ch') {
       const channel = Number(addr[1]);
-      d.data.X32.inputs.channels[channel - 1].fader = oscData.args[0];
-      d.data.X32.inputs.channels[channel - 1].faderDB = Console.getBehringerDB(oscData.args[0]);
+      device.data.inputs.channels[channel - 1].fader = oscData.args[0];
+      device.data.inputs.channels[channel - 1].faderDB = Console.getBehringerDB(oscData.args[0]);
     } else if (addr[0] === 'main') {
-      d.data.X32.main.stereo.fader = oscData.args[0];
-      d.data.X32.main.stereo.faderDB = Console.getBehringerDB(oscData.args[0]);
+      device.data.main.stereo.fader = oscData.args[0];
+      device.data.main.stereo.faderDB = Console.getBehringerDB(oscData.args[0]);
     }
 
-    d.draw();
+    device.draw();
   } else if (oscData.address.includes('/mix/on')) {
     const addr = parseAddress(oscData.address);
     if (addr[0] === 'ch') {
       const channel = Number(addr[1]);
-      d.data.X32.inputs.channels[channel - 1].mute = oscData.args[0];
-      d.send(`/ch/${addr[1]}/mix/fader`);
+      device.data.inputs.channels[channel - 1].mute = oscData.args[0];
+      device.send(`/ch/${addr[1]}/mix/fader`);
     } else if (addr[0] === 'main') {
-      d.data.X32.main.stereo.mute = oscData.args[0];
-      d.send(`/main/${addr[1]}/mix/fader`);
+      device.data.main.stereo.mute = oscData.args[0];
+      device.send(`/main/${addr[1]}/mix/fader`);
     }
-    d.draw();
+    device.draw();
   } else if (oscData.address.includes('/config/name')) {
     const addr = parseAddress(oscData.address);
     if (addr[0] === 'main') {
       if (addr[1] === 'st') {
-        d.data.X32.main.stereo.name = oscData.args[0];
-        if (d.data.X32.main.stereo.name === '') {
-          d.data.X32.main.stereo.name = 'LR';
+        device.data.main.stereo.name = oscData.args[0];
+        if (device.data.main.stereo.name === '') {
+          device.data.main.stereo.name = 'LR';
         }
-        d.send(`/main/${addr[1]}/config/color`);
+        device.send(`/main/${addr[1]}/config/color`);
       }
     } else if (addr[0] === 'ch') {
       const channel = Number(addr[1]);
-      d.data.X32.inputs.channels[channel - 1].name = oscData.args[0];
-      d.send(`/ch/${addr[1]}/config/color`);
+      device.data.inputs.channels[channel - 1].name = oscData.args[0];
+      device.send(`/ch/${addr[1]}/config/color`);
     }
-    d.draw();
+    device.draw();
   } else if (oscData.address.includes('/config/color')) {
     const addr = parseAddress(oscData.address);
     if (addr[0] === 'main') {
-      d.data.X32.main.stereo.color = oscData.args[0];
-      d.send(`/main/${addr[1]}/mix/on`);
+      device.data.main.stereo.color = oscData.args[0];
+      device.send(`/main/${addr[1]}/mix/on`);
     } else if (addr[0] === 'ch') {
       const channel = Number(addr[1]);
-      d.data.X32.inputs.channels[channel - 1].color = oscData.args[0];
-      d.send(`/ch/${addr[1]}/mix/on`);
+      device.data.inputs.channels[channel - 1].color = oscData.args[0];
+      device.send(`/ch/${addr[1]}/mix/on`);
     }
-    d.draw();
-  } else {
-    // console.log(oscData);
+    device.draw();
   }
-  // console.log(msg)
 };
 
 exports.heartbeat = function heartbeat(device) {

plugins/x32/styles.css

@@ -30,7 +30,6 @@ tr td:first-child {
   padding: 1px 6px;
   border-radius: 10px;
   color: black;
-  font-family: PlexMono !important;
   text-align: center;
   text-overflow: ellipsis;
   white-space: nowrap;
@@ -136,12 +135,7 @@ input[type='range']::-webkit-slider-runnable-track {
 
 .meter {
   height: 3px;
-  background: linear-gradient(
-    90deg,
-    rgba(19, 126, 30, 1) 0%,
-    rgba(255, 238, 30, 1) 85%,
-    rgba(255, 0, 0, 1) 100%
-  );
+  background: linear-gradient(90deg, rgba(19, 126, 30, 1) 0%, rgba(255, 238, 30, 1) 85%, rgba(255, 0, 0, 1) 100%);
 }
 
 /* need to find a way to match the color of this with the table row */

plugins/x32/template.ejs

@@ -1,6 +1,6 @@
 <header>
   <h1><%= listName %></h1>
-  <h2><%= data.X32.info.model %></h2>
+  <h2><%= data.info.model %></h2>
 </header>
 
 <table class="cv-table">
@@ -13,15 +13,15 @@
   </tr>
   <tr>
     <td width="40px">LR</td>
-    <td width="100px"><div class="color color-<%= data.X32.main.stereo.color %>"><%- data.X32.main.stereo.name%></div></td>
-    <td><div class="fader-mute mute-<%=data.X32.main.stereo.mute%>">M</div></td>
-    <td><%= formatAsDB(data.X32.main.stereo.faderDB) %></td>
+    <td width="100px"><div class="color color-<%= data.main.stereo.color %>"><%- data.main.stereo.name%></div></td>
+    <td><div class="fader-mute mute-<%=data.main.stereo.mute%>">M</div></td>
+    <td><%= formatAsDB(data.main.stereo.faderDB) %></td>
     <td>
-      <% let style = `style=width:${Math.abs(data.X32.main.stereo.meter[0] - 10)}%`; %>
+      <% let style = `style=width:${Math.abs(data.main.stereo.meter[0] - 10)}%`; %>
       <div class="meter">
         <div class="meter-cover" <%= style %>></div>
       </div>
-      <% style = `style=width:${Math.abs(data.X32.main.stereo.meter[1] - 10)}%`; %>
+      <% style = `style=width:${Math.abs(data.main.stereo.meter[1] - 10)}%`; %>
       <div class="meter">
         <div class="meter-cover" <%= style %>></div>
       </div>
@@ -29,22 +29,22 @@
         type="range"
         min="0"
         max="100"
-        value="<%= data.X32.main.stereo.fader*100 %>"
+        value="<%= data.main.stereo.fader*100 %>"
         disabled />
     </td>
   </tr>
-  <% for(var i=0; i<32; i++){ %> <% if(data.X32.inputs.channels[i].name == "end"){break;} %>
+  <% for(var i=0; i<32; i++){ %> <% if(data.inputs.channels[i].name == "end"){break;} %>
   <tr>
     <td><%= i+1 %></td>
     <td>
-      <div class="color color-<%= data.X32.inputs.channels[i].color %>">
-        <%- data.X32.inputs.channels[i].name || i+1 %>
+      <div class="color color-<%= data.inputs.channels[i].color %>">
+        <%- data.inputs.channels[i].name || i+1 %>
       </div>
     </td>
-    <td><div class="fader-mute mute-<%=data.X32.inputs.channels[i].mute%>">M</div></td>
-    <td><%= formatAsDB(data.X32.inputs.channels[i].faderDB) %></td>
+    <td><div class="fader-mute mute-<%=data.inputs.channels[i].mute%>">M</div></td>
+    <td><%= formatAsDB(data.inputs.channels[i].faderDB) %></td>
     <td>
-      <% let style = `style=width:${Math.abs(data.X32.inputs.channels[i].meter - 10)}%`; %>
+      <% let style = `style=width:${Math.abs(data.inputs.channels[i].meter - 10)}%`; %>
       <div class="meter">
         <div class="meter-cover" <%= style %>></div>
       </div>
@@ -52,7 +52,7 @@
         type="range"
         min="0"
         max="100"
-        value="<%= data.X32.inputs.channels[i].fader*100 %>"
+        value="<%= data.inputs.channels[i].fader*100 %>"
         disabled />
     </td>
   </tr>