From b62abd74e7eeb5ccc16c3dfa94d37b10cf8a1a11 Mon Sep 17 00:00:00 2001 From: gaelj Date: Sun, 26 Jun 2016 23:02:28 +0200 Subject: [PATCH] MSP versioning CF compatible --- js/backup_restore.js | 10 +++++----- js/msp.js | 8 ++++---- tabs/led_strip.html | 10 +++++----- tabs/led_strip.js | 32 ++++++++++++++++---------------- 4 files changed, 30 insertions(+), 30 deletions(-) diff --git a/js/backup_restore.js b/js/backup_restore.js index 7b37046e..4385d0f9 100644 --- a/js/backup_restore.js +++ b/js/backup_restore.js @@ -112,7 +112,7 @@ function configuration_backup(callback) { uniqueData.push(MSP_codes.MSP_FAILSAFE_CONFIG); uniqueData.push(MSP_codes.MSP_RXFAIL_CONFIG); } - if (semver.gte(CONFIG.apiVersion, "1.17.0")) { + if (semver.gte(CONFIG.apiVersion, "1.19.0")) { uniqueData.push(MSP_codes.MSP_LED_STRIP_MODECOLOR); } } @@ -136,7 +136,7 @@ function configuration_backup(callback) { configuration.LED_STRIP = jQuery.extend(true, [], LED_STRIP); configuration.LED_COLORS = jQuery.extend(true, [], LED_COLORS); - if (semver.gte(CONFIG.apiVersion, "1.17.0")) { + if (semver.gte(CONFIG.apiVersion, "1.19.0")) { configuration.LED_MODE_COLORS = jQuery.extend(true, [], LED_MODE_COLORS); } if (semver.gte(CONFIG.apiVersion, "1.8.0")) { @@ -612,7 +612,7 @@ function configuration_restore(callback) { appliedMigrationsCount++; } - if (!compareVersions(migratedVersion, '1.2.1')) { + if (!compareVersions(migratedVersion, '1.3.1')) { // LED_COLORS & LED_MODE_COLORS support was added. if (!configuration.LED_COLORS) { @@ -622,7 +622,7 @@ function configuration_restore(callback) { configuration.LED_MODE_COLORS = []; } - migratedVersion = '1.2.1'; + migratedVersion = '1.3.1'; GUI.log(chrome.i18n.getMessage('configMigratedTo', [migratedVersion])); appliedMigrationsCount++; } @@ -793,7 +793,7 @@ function configuration_restore(callback) { } function send_led_strip_mode_colors() { - if (semver.gte(CONFIG.apiVersion, "1.17.0")) + if (semver.gte(CONFIG.apiVersion, "1.19.0")) MSP.sendLedStripModeColors(send_rxfail_config); else send_rxfail_config(); diff --git a/js/msp.js b/js/msp.js index 31b32c1a..198b504f 100755 --- a/js/msp.js +++ b/js/msp.js @@ -941,13 +941,13 @@ var MSP = { LED_STRIP = []; var ledCount = data.byteLength / 7; // v1.4.0 and below incorrectly reported 4 bytes per led. - if (semver.gte(CONFIG.apiVersion, "1.17.0")) + if (semver.gte(CONFIG.apiVersion, "1.20.0")) ledCount = data.byteLength / 4; var offset = 0; for (var i = 0; offset < data.byteLength && i < ledCount; i++) { - if (semver.lt(CONFIG.apiVersion, "1.17.0")) { + if (semver.lt(CONFIG.apiVersion, "1.20.0")) { var directionMask = data.getUint16(offset, 1); offset += 2; @@ -1048,7 +1048,7 @@ var MSP = { console.log('Led strip colors saved'); break; case MSP_codes.MSP_LED_STRIP_MODECOLOR: - if (semver.gte(CONFIG.apiVersion, "1.17.0")) { + if (semver.gte(CONFIG.apiVersion, "1.19.0")) { LED_MODE_COLORS = []; @@ -1838,7 +1838,7 @@ MSP.sendLedStripConfig = function(onCompleteCallback) { buffer.push(ledIndex); - if (semver.lt(CONFIG.apiVersion, "1.17.0")) { + if (semver.lt(CONFIG.apiVersion, "1.20.0")) { var directionMask = 0; for (var directionLetterIndex = 0; directionLetterIndex < led.directions.length; directionLetterIndex++) { var bitIndex = MSP.ledDirectionLetters.indexOf(led.directions[directionLetterIndex]); diff --git a/tabs/led_strip.html b/tabs/led_strip.html index 27ade963..bd9d6e20 100644 --- a/tabs/led_strip.html +++ b/tabs/led_strip.html @@ -64,9 +64,9 @@ - - - + + + @@ -78,13 +78,13 @@ -
+
-
+
Blink
diff --git a/tabs/led_strip.js b/tabs/led_strip.js index 27f19a09..bc825a9a 100644 --- a/tabs/led_strip.js +++ b/tabs/led_strip.js @@ -11,7 +11,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { var selectedColorIndex = null; var selectedModeColor = null; - if (semver.lt(CONFIG.apiVersion, "1.17.0")) { + if (semver.lt(CONFIG.apiVersion, "1.20.0")) { TABS.led_strip.functions = ['i', 'w', 'f', 'a', 't', 'r', 'c', 'g', 's', 'b']; TABS.led_strip.baseFuncs = ['c', 'f', 'a', 'b', 'g', 'r']; TABS.led_strip.overlays = ['t', 's', 'i', 'w']; @@ -36,7 +36,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { } function load_led_mode_colors() { - if (semver.gte(CONFIG.apiVersion, "1.17.0")) + if (semver.gte(CONFIG.apiVersion, "1.19.0")) MSP.send_message(MSP_codes.MSP_LED_STRIP_MODECOLOR, false, false, load_html); else load_html(); @@ -73,7 +73,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { var theHTML = []; var theHTMLlength = 0; for (var i = 0; i < 256; i++) { - if (semver.lt(CONFIG.apiVersion, "1.17.0")) + if (semver.lte(CONFIG.apiVersion, "1.19.0")) theHTML[theHTMLlength++] = ('
UD
'); else theHTML[theHTMLlength++] = ('
UD
'); @@ -520,7 +520,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { } function send_led_strip_mode_colors() { - if (semver.gte(CONFIG.apiVersion, "1.17.0")) + if (semver.gte(CONFIG.apiVersion, "1.19.0")) MSP.sendLedStripModeColors(save_to_eeprom); else save_to_eeprom(); @@ -645,7 +645,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { // refresh mode color buttons function setModeBackgroundColor(element) { - if (semver.gte(CONFIG.apiVersion, "1.17.0")) { + if (semver.gte(CONFIG.apiVersion, "1.19.0")) { element.find('[class*="mode_color"]').each(function() { var m = 0; var d = 0; @@ -678,19 +678,19 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { $('select.functionSelect').addClass(activeFunction); - if (semver.lte(CONFIG.apiVersion, "1.16.0")) { - // <= 16 + if (semver.lte(CONFIG.apiVersion, "1.18.0")) { + // <= 18 // Hide GPS (Func) // Hide RSSI (O/L), Blink (Func) // Hide Battery, RSSI (Func), Larson (O/L), Blink (O/L), Landing (O/L) - $(".extra_functions17").hide(); + $(".extra_functions20").hide(); $(".mode_colors").hide(); } else { - // >= 17 + // >= 20 // Show GPS (Func) // Hide RSSI (O/L), Blink (Func) // Show Battery, RSSI (Func), Larson (O/L), Blink (O/L), Landing (O/L) - $(".extra_functions17").show(); + $(".extra_functions20").show(); $(".mode_colors").show(); } @@ -701,7 +701,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { $('.modifiers').hide(); $('.blinkers').hide(); - if (semver.lt(CONFIG.apiVersion, "1.17.0")) { + if (semver.lt(CONFIG.apiVersion, "1.20.0")) { switch (activeFunction) { case "function-c": case "function-a": @@ -751,7 +751,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { break; case "function-r": case "function-b": - if (semver.lt(CONFIG.apiVersion, "1.17.0")) + if (semver.lt(CONFIG.apiVersion, "1.20.0")) $('.warningOverlay').hide(); break; default: @@ -783,7 +783,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { // set overlays (checkboxes) visibility // set directions visibility - if (semver.lt(CONFIG.apiVersion, "1.17.0")) { + if (semver.lt(CONFIG.apiVersion, "1.20.0")) { switch (activeFunction) { case "function-r": $('.indicatorOverlay').hide(); @@ -796,7 +796,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { } } $('.mode_colors').hide(); - if (semver.gte(CONFIG.apiVersion, "1.17.0")) { + if (semver.gte(CONFIG.apiVersion, "1.19.0")) { // set mode colors visibility if (activeFunction == "function-f") $('.mode_colors').show(); @@ -868,7 +868,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { } function unselectOverlays(letter) { - if (semver.lt(CONFIG.apiVersion, "1.17.0")) { + if (semver.lt(CONFIG.apiVersion, "1.20.0")) { if (letter == 'b' || letter == 'r') { unselectOverlay(letter, 'i'); } @@ -878,7 +878,7 @@ TABS.led_strip.initialize = function (callback, scrollPosition) { unselectOverlay(letter, 's'); } } else { - // MSP 1.17 + // MSP 1.20 if (letter == 'r' || letter == '') { unselectOverlay(letter, 'o'); unselectOverlay(letter, 'b');