M2M1 control()

jazz-soft · Nov 29, 2023 · b1416e1 · b1416e1
1 parent 5dc64ff
commit b1416e1
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 2 deletions.
diff --git a/javascript/JZZ.js b/javascript/JZZ.js
@@ -3049,6 +3049,7 @@
     umpRuby: function(g, t) { return _helperGCX.umpCustomText(g, 0, 1, 2, 3, t); },
     umpRubyLanguage: function(g, t) { return _helperGCX.umpCustomText(g, 0, 1, 2, 4, t); }
   };
+  var _noctrl = [0, 6, 32, 38, 98, 99, 100, 101];
   var _helperGC = {
     umpNoteOn: function(g, c, n, v, t, a) {
       if (typeof v == 'undefined')  v = 0xffff;
@@ -3066,7 +3067,7 @@
       return [0x40 + _4b(g), 0xa0 + _ch(c), _7bn(n), 0, (x >> 24) & 255, (x >> 16) & 255, (x >> 8) & 255, x & 255];
     },
     umpControl: function(g, c, n, x) {
-      if ([0, 6, 32, 38, 98, 99, 100, 101].includes(n)) _throw(n);
+      if (_noctrl.includes(n)) _throw(n);
       x = _32b(x);
       return [0x40 + _4b(g), 0xb0 + _ch(c), _7b(n), 0, (x >> 24) & 255, (x >> 16) & 255, (x >> 8) & 255, x & 255];
     },
@@ -3461,6 +3462,10 @@
         if (n == 10) {
           this._emit(_grp(new MIDI([msg[1], msg[2], _32_7(msg[4] * 0x1000000 + msg[5] * 0x10000 + msg[6] * 0x100 + msg[7])]), g));
         }
+        if (n == 11) {
+          if (_noctrl.includes(msg[2])) return;
+          this._emit(_grp(new MIDI([msg[1], msg[2], _32_7(msg[4] * 0x1000000 + msg[5] * 0x10000 + msg[6] * 0x100 + msg[7])]), g));
+        }
         if (n == 13) {
           this._emit(_grp(new MIDI([msg[1], _32_7(msg[4] * 0x1000000 + msg[5] * 0x10000 + msg[6] * 0x100 + msg[7])]), g));
         }

diff --git a/minified/JZZ.js b/minified/JZZ.js
diff --git a/test/common.js b/test/common.js
@@ -1585,6 +1585,14 @@ describe('JZZ.M2M1', function() {
     port.connect(function(msg) { sample.compare(msg); });
     port.umpAftertouch(0, 1, 'C5', 0xa0000000).umpAftertouch(0, 1, 'C5', 0).umpPressure(0, 1, 0xa0000000);
   });
+  it('control', function(done) {
+    var sample = new test.Sample(done, [
+      [0xb1, 1, 80]
+    ]);
+    var port = new JZZ.M2M1();
+    port.connect(function(msg) { sample.compare(msg); });
+    port.send([0x40, 0xb1, 0, 0, 20, 20, 20, 20]).umpControl(0, 1, 1, 0xa0000000).umpControl(0, 1, 1, 0xa0000000);
+  });
   it('sysex', function(done) {
     var sample = new test.Sample(done, [
       [0xf0, 0x7e, 0x7f, 0x09, 0x01, 0xf7],