Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-21 07:15:13 +03:00
Code Wiki Activity

Allow servo rate 125%

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2017-06-04 13:23:51 +02:00
parent d1d724efb3
commit 8aebbbfa93
3 changed files with 28 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

30
build/script.js
View file

@ -10984,6 +10984,8 @@ var CONFIG,
FW_CONFIG; FW_CONFIG;
var FC = { var FC = {
MAX_SERVO_RATE: 125,
MIN_SERVO_RATE: -125,
isRatesInDps: function () { isRatesInDps: function () {
return !!(typeof CONFIG != "undefined" && CONFIG.flightControllerIdentifier == "INAV" && semver.gt(CONFIG.flightControllerVersion, "1.1.0")); 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(); if (callback) callback();
}; };
/*global fc*/
'use strict'; 'use strict';
TABS.servos = {}; TABS.servos = {};
TABS.servos.initialize = function (callback) { TABS.servos.initialize = function (callback) {
var self = this;
if (GUI.active_tab != 'servos') { if (GUI.active_tab != 'servos') {
GUI.active_tab = 'servos'; GUI.active_tab = 'servos';
@ -22733,27 +22735,25 @@ TABS.servos.initialize = function (callback) {
function update_ui() { 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; return;
} }
$(".tab-servos").addClass("supported"); $tabServos.addClass("supported");
var servoCheckbox = ''; var servoCheckbox = '';
var servoHeader = ''; var servoHeader = '';
for (var i = 0; i < RC.active_channels-4; i++) { for (i = 0; i < RC.active_channels-4; i++) {
servoHeader = servoHeader + '\ servoHeader = servoHeader + '<th class="short">A' + (i+1) + '</th>';
<th class="short">A' + (i+1) + '</th>\
';
} }
servoHeader = servoHeader + '<th data-i18n="servosDirectionAndRate"></th>'; servoHeader = servoHeader + '<th data-i18n="servosDirectionAndRate"></th>';
for (var i = 0; i < RC.active_channels; i++) { for (i = 0; i < RC.active_channels; i++) {
servoCheckbox = servoCheckbox + '\ servoCheckbox = servoCheckbox + '<td class="channel"><input type="checkbox"/></td>';
<td class="channel"><input type="checkbox"/></td>\
';
} }
$('div.tab-servos table.fields tr.main').append(servoHeader); $('div.tab-servos table.fields tr.main').append(servoHeader);
@ -22779,13 +22779,11 @@ TABS.servos.initialize = function (callback) {
} }
// adding select box and generating options // 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('<select class="rate" name="rate"></select>');
<select class="rate" name="rate"></select>\
');
var select = $('div.tab-servos table.fields tr:last td.direction select'); 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('<option value="' + i + '">Rate: ' + i + '%</option>'); select.append('<option value="' + i + '">Rate: ' + i + '%</option>');
} }

2
js/fc.js
View file

@ -49,6 +49,8 @@ var CONFIG,
FW_CONFIG; FW_CONFIG;
var FC = { var FC = {
MAX_SERVO_RATE: 125,
MIN_SERVO_RATE: -125,
isRatesInDps: function () { isRatesInDps: function () {
return !!(typeof CONFIG != "undefined" && CONFIG.flightControllerIdentifier == "INAV" && semver.gt(CONFIG.flightControllerVersion, "1.1.0")); return !!(typeof CONFIG != "undefined" && CONFIG.flightControllerIdentifier == "INAV" && semver.gt(CONFIG.flightControllerVersion, "1.1.0"));
}, },

28
tabs/servos.js
View file

@ -1,8 +1,8 @@
/*global fc*/
'use strict'; 'use strict';
TABS.servos = {}; TABS.servos = {};
TABS.servos.initialize = function (callback) { TABS.servos.initialize = function (callback) {
var self = this;
if (GUI.active_tab != 'servos') { if (GUI.active_tab != 'servos') {
GUI.active_tab = 'servos'; GUI.active_tab = 'servos';
@ -33,27 +33,25 @@ TABS.servos.initialize = function (callback) {
function update_ui() { 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; return;
} }
$(".tab-servos").addClass("supported"); $tabServos.addClass("supported");
var servoCheckbox = ''; var servoCheckbox = '';
var servoHeader = ''; var servoHeader = '';
for (var i = 0; i < RC.active_channels-4; i++) { for (i = 0; i < RC.active_channels-4; i++) {
servoHeader = servoHeader + '\ servoHeader = servoHeader + '<th class="short">A' + (i+1) + '</th>';
<th class="short">A' + (i+1) + '</th>\
';
} }
servoHeader = servoHeader + '<th data-i18n="servosDirectionAndRate"></th>'; servoHeader = servoHeader + '<th data-i18n="servosDirectionAndRate"></th>';
for (var i = 0; i < RC.active_channels; i++) { for (i = 0; i < RC.active_channels; i++) {
servoCheckbox = servoCheckbox + '\ servoCheckbox = servoCheckbox + '<td class="channel"><input type="checkbox"/></td>';
<td class="channel"><input type="checkbox"/></td>\
';
} }
$('div.tab-servos table.fields tr.main').append(servoHeader); $('div.tab-servos table.fields tr.main').append(servoHeader);
@ -79,13 +77,11 @@ TABS.servos.initialize = function (callback) {
} }
// adding select box and generating options // 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('<select class="rate" name="rate"></select>');
<select class="rate" name="rate"></select>\
');
var select = $('div.tab-servos table.fields tr:last td.direction select'); 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('<option value="' + i + '">Rate: ' + i + '%</option>'); select.append('<option value="' + i + '">Rate: ' + i + '%</option>');
} }