umpRPN text

jazz-soft · Dec 31, 2023 · b56140c · b56140c
1 parent 0230936
commit b56140c
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 6 deletions.
diff --git a/javascript/JZZ.js b/javascript/JZZ.js
@@ -2726,8 +2726,8 @@
     var b = typeof lsb == 'undefined' ? '??' : __hex(lsb);
     var c = {
       '0000': 'Pitch Bend Sensitivity',
-      '0001': 'Channel Fine Tune',
-      '0002': 'Channel Coarse Tune',
+      '0001': 'Channel Fine Tuning',
+      '0002': 'Channel Coarse Tuning',
       '0003': 'Select Tuning Program',
       '0004': 'Select Tuning Bank',
       '0005': 'Vibrato Depth Range',
@@ -3386,7 +3386,7 @@
     return t ? _hexx(this) + ' -- ' + t : _hexx(this);
   };
   UMP.prototype._string = function() {
-    var n, s;
+    var n, s, ss;
     var t = this[0] >> 4;
     if (t == 1 || t == 2) return new MIDI(this.slice(1))._string();
     else if (t == 0) {
@@ -3420,6 +3420,18 @@
           84: 'Portamento'
         }[this[2]] || s;
       }
+      if (n == 2) {
+        ss = {
+          '0000': 'Pitch Bend Sensitivity',
+          '0001': 'Fine Tuning',
+          '0002': 'Coarse Tuning',
+          '0003': 'Select Tuning Program',
+          '0004': 'Select Tuning Bank',
+          '0005': 'Vibrato Depth Range',
+          '7f7f': 'NONE'
+        }[__hex(this[2]) + '' + __hex(this[3])];
+        if (ss) s += ': ' + ss;
+      }
     }
     else if (t == 5) {
       s = 'Data';

diff --git a/minified/JZZ.js b/minified/JZZ.js
diff --git a/test/common.js b/test/common.js
@@ -1072,7 +1072,7 @@ describe('UMP messages', function() {
     assert.equal(JZZ.UMP.umpRPN(1, 2, 3, 4, 5, 6, 7, 8).toString(), '41220304 05060708 -- Registered Controller');
   });
   it('umpCoarseTuning', function() {
-    assert.equal(JZZ.UMP.umpCoarseTuning(1, 2, 3).toString(), '41220002 06000000 -- Registered Controller');
+    assert.equal(JZZ.UMP.umpCoarseTuning(1, 2, 3).toString(), '41220002 06000000 -- Registered Controller: Coarse Tuning');
   });
   it('umpPitchBend', function() {
     assert.equal(JZZ.UMP.umpPitchBend(1, 2, 3, 4, 5, 6).toString(), '41e20000 03040506 -- Pitch Bend');
@@ -1735,7 +1735,7 @@ describe('JZZ.Context', function() {
     var ctxt = JZZ.Context();
     ctxt.rpn(0, 0, 1);
     ctxt.connect(function(msg) {
-      assert.equal(msg.toString(), 'b0 26 00 -- Data Entry LSB (RPN 00 01: Channel Fine Tune)');
+      assert.equal(msg.toString(), 'b0 26 00 -- Data Entry LSB (RPN 00 01: Channel Fine Tuning)');
       done();
     });
     ctxt.dataLSB(0, 0);