Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-26 01:35:23 +03:00
Code Wiki Activity

Servo tab cleanup

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2018-05-07 20:32:56 +02:00
parent cf176f2201
commit 55385f5831
5 changed files with 45 additions and 49 deletions
Download patch file Download diff file Expand all files Collapse all files

9
js/fc.js
View file

@ -507,10 +507,15 @@ var FC = {
{bit: 15, group: 'other', name: 'RSSI_ADC', haveTip: true, showNameInTip: true},
{bit: 16, group: 'other', name: 'LED_STRIP', showNameInTip: true},
{bit: 17, group: 'other', name: 'DISPLAY', showNameInTip: true},
{bit: 19, group: 'other', name: 'BLACKBOX', haveTip: true, showNameInTip: true},
{bit: 20, group: 'other', name: 'CHANNEL_FORWARDING', showNameInTip: true}
{bit: 19, group: 'other', name: 'BLACKBOX', haveTip: true, showNameInTip: true}
];
if (semver.lt(CONFIG.flightControllerVersion, "2.0.0")) {
features.push(
{bit: 20, group: 'other', name: 'CHANNEL_FORWARDING', showNameInTip: true}
);
}
if (semver.lt(CONFIG.flightControllerVersion, "1.6.0")) {
features.push(
{bit: 2, group: 'other', name: 'INFLIGHT_ACC_CAL', showNameInTip: true},

4
main.css
View file

@ -2027,3 +2027,7 @@ select {
.position-relative {
position: relative;
}
.text-center {
text-align: center;
}

16
src/css/tabs/servos.css
View file

@ -50,22 +50,6 @@
background-color: #f9f9f9;
}
.tab-servos table td:nth-child(2) {
width: 140px;
}
.tab-servos table td:nth-child(3) {
width: 140px;
}
.tab-servos table td:nth-child(4) {
width: 140px;
}
.tab-servos table td:nth-child(19) {
width: 110px;
}
.tab-servos table .main {
font-weight: bold;
text-align: center;

2
tabs/servos.html
View file

@ -5,7 +5,7 @@
<a id="button-documentation" href="" target="_blank"></a>
</div>
<div>
<div class="title" data-i18n="servosChangeDirection"></div>
<!-- <div class="title" data-i18n="servosChangeDirection"></div> -->
<table id="servo-config-table" class="fields">
<tr class="main">
<th width="110px" data-i18n="servosName"></th>

63
tabs/servos.js
View file

@ -51,64 +51,67 @@ TABS.servos.initialize = function (callback) {
let servoCheckbox = '',
servoHeader = '';
for (i = 0; i < RC.active_channels - 4; i++) {
servoHeader = servoHeader + '<th class="short">CH' + (i + 5) + '</th>';
}
servoHeader = servoHeader + '<th data-i18n="servosDirectionAndRate"></th>';
if (semver.lt(CONFIG.flightControllerVersion, "2.0.0")) {
for (i = 0; i < RC.active_channels - 4; i++) {
servoHeader = servoHeader + '<th class="short">CH' + (i + 5) + '</th>';
}
servoHeader = servoHeader + '<th data-i18n="servosDirectionAndRate"></th>';
for (i = 0; i < RC.active_channels; i++) {
servoCheckbox = servoCheckbox + '<td class="channel"><input type="checkbox"/></td>';
}
for (i = 0; i < RC.active_channels; i++) {
servoCheckbox = servoCheckbox + '<td class="channel"><input type="checkbox"/></td>';
}
$servoConfigTable.find('tr.main').append(servoHeader);
$servoConfigTable.find('tr.main').append(servoHeader);
} else {
$servoConfigTable.find('tr.main').html('\
<th width="110px" data-i18n="servosName"></th>\
<th data-i18n="servosMid"></th>\
<th data-i18n="servosMin"></th>\
<th data-i18n="servosMax"></th>\
<th data-i18n="servosDirectionAndRate"></th>\
');
}
function process_servos(name, alternate, obj) {
$servoConfigTable.append('\
<tr> \
<td style="text-align: center">' + name + '</td>\
<td class="text-center">' + name + '</td>\
<td class="middle"><input type="number" min="500" max="2500" value="' + SERVO_CONFIG[obj].middle + '" /></td>\
<td class="min"><input type="number" min="500" max="2500" value="' + SERVO_CONFIG[obj].min + '" /></td>\
<td class="max"><input type="number" min="500" max="2500" value="' + SERVO_CONFIG[obj].max + '" /></td>\
' + servoCheckbox + '\
<td class="direction">\
<td class="text-center direction">\
</td>\
</tr> \
');
//This routine is pre 2.0 only
if (SERVO_CONFIG[obj].indexOfChannelToForward >= 0) {
$servoConfigTable.find('tr:last td.channel input').eq(SERVO_CONFIG[obj].indexOfChannelToForward).prop('checked', true);
}
// adding select box and generating options
$servoConfigTable.find('tr:last td.direction').append('<select class="rate" name="rate"></select>');
var select = $servoConfigTable.find('tr:last td.direction select');
for (var i = FC.MAX_SERVO_RATE; i >= FC.MIN_SERVO_RATE; i--) {
select.append('<option value="' + i + '">Rate: ' + i + '%</option>');
}
// select current rate
select.val(SERVO_CONFIG[obj].rate);
$servoConfigTable.find('tr:last td.direction').append(
'<input class="rate-input" type="number" min="' + FC.MIN_SERVO_RATE + '" max="' + FC.MAX_SERVO_RATE + '" value="' + SERVO_CONFIG[obj].rate + '" />'
);
$servoConfigTable.find('tr:last').data('info', { 'obj': obj });
// UI hooks
// only one checkbox for indicating a channel to forward can be selected at a time, perhaps a radio group would be best here.
$servoConfigTable.find('tr:last td.channel input').click(function () {
if ($(this).is(':checked')) {
$(this).parent().parent().find('.channel input').not($(this)).prop('checked', false);
}
});
if (semver.lt(CONFIG.flightControllerVersion, "2.0.0")) {
// only one checkbox for indicating a channel to forward can be selected at a time, perhaps a radio group would be best here.
$servoConfigTable.find('tr:last td.channel input').click(function () {
if ($(this).is(':checked')) {
$(this).parent().parent().find('.channel input').not($(this)).prop('checked', false);
}
});
}
}
function servos_update(save_configuration_to_eeprom) {
$servoConfigTable.find('tr:not(".main")').each(function () {
var info = $(this).data('info');
var selection = $('.channel input', this);
var channelIndex = parseInt(selection.index(selection.filter(':checked')));
if (channelIndex == -1) {
@ -120,7 +123,7 @@ TABS.servos.initialize = function (callback) {
SERVO_CONFIG[info.obj].middle = parseInt($('.middle input', this).val());
SERVO_CONFIG[info.obj].min = parseInt($('.min input', this).val());
SERVO_CONFIG[info.obj].max = parseInt($('.max input', this).val());
SERVO_CONFIG[info.obj].rate = parseInt($('.direction select', this).val());
SERVO_CONFIG[info.obj].rate = parseInt($('.rate-input', this).val());
});
//Save configuration to FC