diff --git a/build/script.js b/build/script.js index c8f695cd..5596fa56 100755 --- a/build/script.js +++ b/build/script.js @@ -10984,6 +10984,8 @@ var CONFIG, FW_CONFIG; var FC = { + MAX_SERVO_RATE: 125, + MIN_SERVO_RATE: -125, isRatesInDps: function () { return !!(typeof CONFIG != "undefined" && CONFIG.flightControllerIdentifier == "INAV" && semver.gt(CONFIG.flightControllerVersion, "1.1.0")); }, @@ -22698,11 +22700,11 @@ TABS.sensors.cleanup = function (callback) { if (callback) callback(); }; +/*global fc*/ 'use strict'; TABS.servos = {}; TABS.servos.initialize = function (callback) { - var self = this; if (GUI.active_tab != 'servos') { GUI.active_tab = 'servos'; @@ -22733,27 +22735,25 @@ TABS.servos.initialize = function (callback) { function update_ui() { - if (SERVO_CONFIG.length == 0) { + var i, + $tabServos = $(".tab-servos"); - $(".tab-servos").removeClass("supported"); + if (SERVO_CONFIG.length == 0) { + $tabServos.removeClass("supported"); return; } - $(".tab-servos").addClass("supported"); + $tabServos.addClass("supported"); var servoCheckbox = ''; var servoHeader = ''; - for (var i = 0; i < RC.active_channels-4; i++) { - servoHeader = servoHeader + '\ - A' + (i+1) + '\ - '; + for (i = 0; i < RC.active_channels-4; i++) { + servoHeader = servoHeader + 'A' + (i+1) + ''; } servoHeader = servoHeader + ''; - for (var i = 0; i < RC.active_channels; i++) { - servoCheckbox = servoCheckbox + '\ - \ - '; + for (i = 0; i < RC.active_channels; i++) { + servoCheckbox = servoCheckbox + ''; } $('div.tab-servos table.fields tr.main').append(servoHeader); @@ -22779,13 +22779,11 @@ TABS.servos.initialize = function (callback) { } // adding select box and generating options - $('div.tab-servos table.fields tr:last td.direction').append('\ - \ - '); + $('div.tab-servos table.fields tr:last td.direction').append(''); var select = $('div.tab-servos table.fields tr:last td.direction select'); - for (var i = 100; i > -101; i--) { + for (var i = FC.MAX_SERVO_RATE; i >= FC.MIN_SERVO_RATE; i--) { select.append(''); } diff --git a/js/fc.js b/js/fc.js index 41a2273c..fb06f609 100644 --- a/js/fc.js +++ b/js/fc.js @@ -49,6 +49,8 @@ var CONFIG, FW_CONFIG; var FC = { + MAX_SERVO_RATE: 125, + MIN_SERVO_RATE: -125, isRatesInDps: function () { return !!(typeof CONFIG != "undefined" && CONFIG.flightControllerIdentifier == "INAV" && semver.gt(CONFIG.flightControllerVersion, "1.1.0")); }, diff --git a/tabs/servos.js b/tabs/servos.js index 40378f02..a8c06264 100755 --- a/tabs/servos.js +++ b/tabs/servos.js @@ -1,8 +1,8 @@ +/*global fc*/ 'use strict'; TABS.servos = {}; TABS.servos.initialize = function (callback) { - var self = this; if (GUI.active_tab != 'servos') { GUI.active_tab = 'servos'; @@ -33,27 +33,25 @@ TABS.servos.initialize = function (callback) { function update_ui() { - if (SERVO_CONFIG.length == 0) { + var i, + $tabServos = $(".tab-servos"); - $(".tab-servos").removeClass("supported"); + if (SERVO_CONFIG.length == 0) { + $tabServos.removeClass("supported"); return; } - $(".tab-servos").addClass("supported"); + $tabServos.addClass("supported"); var servoCheckbox = ''; var servoHeader = ''; - for (var i = 0; i < RC.active_channels-4; i++) { - servoHeader = servoHeader + '\ - A' + (i+1) + '\ - '; + for (i = 0; i < RC.active_channels-4; i++) { + servoHeader = servoHeader + 'A' + (i+1) + ''; } servoHeader = servoHeader + ''; - for (var i = 0; i < RC.active_channels; i++) { - servoCheckbox = servoCheckbox + '\ - \ - '; + for (i = 0; i < RC.active_channels; i++) { + servoCheckbox = servoCheckbox + ''; } $('div.tab-servos table.fields tr.main').append(servoHeader); @@ -79,13 +77,11 @@ TABS.servos.initialize = function (callback) { } // adding select box and generating options - $('div.tab-servos table.fields tr:last td.direction').append('\ - \ - '); + $('div.tab-servos table.fields tr:last td.direction').append(''); var select = $('div.tab-servos table.fields tr:last td.direction select'); - for (var i = 100; i > -101; i--) { + for (var i = FC.MAX_SERVO_RATE; i >= FC.MIN_SERVO_RATE; i--) { select.append(''); }