diff --git a/res/controllers/KANE_QuNeo_scripts.js b/res/controllers/KANE_QuNeo_scripts.js index de835cd4aa7..e7d30677981 100644 --- a/res/controllers/KANE_QuNeo_scripts.js +++ b/res/controllers/KANE_QuNeo_scripts.js @@ -888,7 +888,8 @@ KANE_QuNeo.closeSliderMode = function () { KANE_QuNeo.deckZoom = function (deck, value) { var channel = deck - 1; // track channels start at 0 to properly reference arrays var channelName = KANE_QuNeo.getChannelName(deck) - var normalized = Math.ceil(6 * ((127 - value) / 127)) + // range is 1..10 + var normalized = Math.ceil(9 * ((127 - value) / 127)) + 1; // adjust zoom engine.setValue(channelName, "waveform_zoom", normalized) } @@ -2347,8 +2348,8 @@ KANE_QuNeo.masterVuMeter = function (value) { // Sliders KANE_QuNeo.deckZoomLEDs = function (deck, value) { var LEDGroup = KANE_QuNeo.getLEDGroup(deck); - // normalize zoom LED value to be 0-127 - var zoom = ((value - 1) / 5) * 127 + // normalize zoom LED value to be 0-127, range is 1..10 + var zoom = ((value - 1) / 9) * 127 // determine which control we are manipulating var control = KANE_QuNeo.getSliderControl(deck, 0) // emit message diff --git a/res/controllers/Korg-nanoKONTROL-2-scripts.js b/res/controllers/Korg-nanoKONTROL-2-scripts.js index 192e6b4502e..5bd1190d5bc 100644 --- a/res/controllers/Korg-nanoKONTROL-2-scripts.js +++ b/res/controllers/Korg-nanoKONTROL-2-scripts.js @@ -506,9 +506,9 @@ NK2.toggleBinaryControlAll = function toggleBinaryControlAll(control){ NK2.wavezoomAll = function wavezoomAll(value){ if (NK2.debug>2){print("##function: "+NK2.getFunctionName())}; - var range=6-1; + var range=10-1; var newValue=Math.round(1+((value/127)*range)); - if (newValue>6)newValue=6; + if (newValue>10)newValue=10; if (newValue<1)newValue=1; if (NK2.lastwavevalue!=value){ for (var i=1; i<9; i++){ @@ -522,9 +522,9 @@ NK2.wavezoomDeck = function wavezoomDeck(value, group){ if (NK2.debug>2){print("##function: "+NK2.getFunctionName())}; if (group=="default"){group=NK2.Deck[NK2.curDeck];}; - var range=6-1; + var range=10-1; var newValue=Math.round(1+((value/127)*range)); - if (newValue>6)newValue=6; + if (newValue>10)newValue=10; if (newValue<1)newValue=1; if (NK2.lastwavevalue!=value){ engine.setValue(group, "waveform_zoom", newValue); diff --git a/res/controllers/Novation-Launchpad MK2-scripts.js b/res/controllers/Novation-Launchpad MK2-scripts.js index f9a65dd9356..03f37109ace 100644 --- a/res/controllers/Novation-Launchpad MK2-scripts.js +++ b/res/controllers/Novation-Launchpad MK2-scripts.js @@ -4410,7 +4410,7 @@ var NLMK2 = (function () { waveform_zoom: { group: `[${type}${i}]`, name: 'waveform_zoom', - type: '1.0 - 6.0' + type: '1.0 - 10.0' }, waveform_zoom_up: { group: `[${type}${i}]`, diff --git a/res/controllers/Novation-Launchpad Mini MK3-scripts.js b/res/controllers/Novation-Launchpad Mini MK3-scripts.js index ce1fb372417..ced3dfb1608 100644 --- a/res/controllers/Novation-Launchpad Mini MK3-scripts.js +++ b/res/controllers/Novation-Launchpad Mini MK3-scripts.js @@ -4410,7 +4410,7 @@ var NLMMK3 = (function () { waveform_zoom: { group: `[${type}${i}]`, name: 'waveform_zoom', - type: '1.0 - 6.0' + type: '1.0 - 10.0' }, waveform_zoom_up: { group: `[${type}${i}]`, diff --git a/res/controllers/Novation-Launchpad-Mini-scripts.js b/res/controllers/Novation-Launchpad-Mini-scripts.js index bacdb0de531..7f981a609c9 100644 --- a/res/controllers/Novation-Launchpad-Mini-scripts.js +++ b/res/controllers/Novation-Launchpad-Mini-scripts.js @@ -337,7 +337,8 @@ function ZoomKey(dir) { that.onPushOrig = that.onPush; that.onPush = function() { - if ( ZoomKey.zoom < 6 && this.dir == "+" ) { + // range is 1..10 + if ( ZoomKey.zoom < 10 && this.dir == "+" ) { ZoomKey.zoom++; } if ( ZoomKey.zoom > 1 && this.dir == "-") { diff --git a/res/controllers/Novation-Launchpad-scripts.js b/res/controllers/Novation-Launchpad-scripts.js index bc1d5643634..ab65c3a511b 100644 --- a/res/controllers/Novation-Launchpad-scripts.js +++ b/res/controllers/Novation-Launchpad-scripts.js @@ -4410,7 +4410,7 @@ var NLMK1 = (function () { waveform_zoom: { group: `[${type}${i}]`, name: 'waveform_zoom', - type: '1.0 - 6.0' + type: '1.0 - 10.0' }, waveform_zoom_up: { group: `[${type}${i}]`,