merging-ravenna 0.1.0 → 0.2.0

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "merging-ravenna",
-  "version": "0.1.0",
+  "version": "0.2.0",
   "description": "Standalone client for Merging Technologies RAVENNA devices (Hapi / Horus / Anubis) over their CometD/WebSocket control protocol. Unofficial; not affiliated with Merging Technologies.",
   "keywords": [
     "merging",

package/src/catalog.js

@@ -91,11 +91,11 @@ function buildCatalog(tree) {
         }));
       }
 
-      // out max level
+      // out max level (model-supplied enum: device gives only the int)
       if (typeof sec.out_max_level === 'number' && caps.out_max_level) {
         out.push(Object.assign({}, base, {
           key: 'out_max_level', raw: sec.out_max_level, value: sec.out_max_level,
-          unit: 'int', min: null, max: null, step: null, enum: null,
+          unit: 'enum', min: null, max: null, step: null, enum: PARAMS.out_max_level.enum || null,
           settable: true, confidence: PARAMS.out_max_level.confidence
         }));
       }

package/src/engine.js

@@ -266,6 +266,15 @@ class RavennaEngine extends EventEmitter {
     if (!desc) throw new Error(`Unknown parameter '${key}'`);
 
     let v = value;
+    if (desc.unit === 'enum') {
+      // Accept either the integer or a label string (e.g. 'Brickwall', '+24 dBu').
+      if (typeof v === 'string') {
+        const map = this._enumMapFor(moduleId, key);
+        const hit = map && Object.keys(map).find((k) => k.toLowerCase() === v.toLowerCase());
+        if (hit != null) v = map[hit];
+        if (typeof v === 'string') v = parseInt(v, 10); // numeric-string fallback ("3")
+      }
+    }
     if (desc.unit === 'tenths-db') {
       v = dbToTenths(value);
       const cap = this._capFor(moduleId, key);
@@ -287,6 +296,15 @@ class RavennaEngine extends EventEmitter {
     return null;
   }
 
+  /** Label->int map for an enum param: static (PARAMS) or device-provided (capabilities). */
+  _enumMapFor(moduleId, key) {
+    const desc = PARAMS[key];
+    if (desc && desc.enum) return desc.enum;                 // model-supplied (e.g. out_max_level)
+    const c = this.capabilities[moduleId];
+    if (key === 'roll_off_filter' && c && c.rollOff) return c.rollOff; // device-supplied
+    return null;
+  }
+
   _channelCountFor(moduleId, section) {
     if (!this.tree || !Array.isArray(this.tree._modules)) return 1;
     const m = this.tree._modules.find((x) => x.id === moduleId);
@@ -416,7 +434,7 @@ class RavennaEngine extends EventEmitter {
     }
     if (typeof outs.out_max_level === 'number' && outs.out_max_level !== prev.out_max_level) {
       prev.out_max_level = outs.out_max_level;
-      this.emit('param', { moduleId, key: 'out_max_level', raw: outs.out_max_level, value: outs.out_max_level, unit: 'int' });
+      this.emit('param', { moduleId, key: 'out_max_level', raw: outs.out_max_level, value: outs.out_max_level, unit: 'enum' });
     }
     if (Array.isArray(outs.channels)) {
       if (!Array.isArray(prev.trims)) prev.trims = [];

package/src/paths.js

@@ -60,11 +60,14 @@ const PARAMS = {
     capEnum: 'roll_off_filters',
     build: (v) => ({ roll_off_filter: v | 0 })
   },
-  // out_max_level is a 0/1 toggle between the card's two output reference levels.
+  // out_max_level selects the card's output reference level. The device exposes only
+  // the raw int (0/1) with NO label map, so the meanings are MODEL knowledge encoded
+  // here (Hapi MkII D/A, sub_type 218; may differ on other cards). Confirmed mapping.
   out_max_level: {
-    section: 'outs', unit: 'int', confidence: 'confirmed',
+    section: 'outs', unit: 'enum', confidence: 'confirmed',
     capFlag: 'out_max_level',
-    build: (v) => ({ out_max_level: v ? 1 : 0 })
+    enum: { '+18 dBu': 0, '+24 dBu': 1 },
+    build: (v) => ({ out_max_level: v | 0 })
   },
   // Per-channel trim is an array within custom.outs; the partial-array shape (target
   // channel carries {trim}, others {}) is confirmed to apply on the device.