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

Angle at min and max removed

Browse source
This commit is contained in:
Pawel Spychalski (DzikuVx) 2017-05-26 15:21:40 +02:00
parent 017cb54ea0
commit 6300fefdef
5 changed files with 10 additions and 34 deletions
Download patch file Download diff file Expand all files Collapse all files

6
_locales/en/messages.json
View file

@ -1128,12 +1128,6 @@
"servosMax": { "servosMax": {
"message": "MAX" "message": "MAX"
}, },
"servosAngleAtMin": {
"message": "Angle at min"
},
"servosAngleAtMax": {
"message": "Angle at max"
},
"servosDirectionAndRate": { "servosDirectionAndRate": {
"message": "Direction and rate" "message": "Direction and rate"
}, },

18
build/script.js Normal file → Executable file
View file

@ -7893,8 +7893,6 @@ var mspHelper = (function (gui) {
'max': data.getInt16(i + 2, true), 'max': data.getInt16(i + 2, true),
'middle': data.getInt16(i + 4, true), 'middle': data.getInt16(i + 4, true),
'rate': data.getInt8(i + 6), 'rate': data.getInt8(i + 6),
'angleAtMin': data.getInt8(i + 7),
'angleAtMax': data.getInt8(i + 8),
'indexOfChannelToForward': data.getInt8(i + 9), 'indexOfChannelToForward': data.getInt8(i + 9),
'reversedInputSources': data.getUint32(i + 10) 'reversedInputSources': data.getUint32(i + 10)
}; };
@ -9067,8 +9065,8 @@ var mspHelper = (function (gui) {
buffer.push(lowByte(servoConfiguration.rate)); buffer.push(lowByte(servoConfiguration.rate));
buffer.push(servoConfiguration.angleAtMin); buffer.push(0);
buffer.push(servoConfiguration.angleAtMax); buffer.push(0);
var out = servoConfiguration.indexOfChannelToForward; var out = servoConfiguration.indexOfChannelToForward;
if (out == undefined) { if (out == undefined) {
@ -22747,10 +22745,10 @@ TABS.servos.initialize = function (callback) {
var servoHeader = ''; var servoHeader = '';
for (var i = 0; i < RC.active_channels-4; i++) { for (var i = 0; i < RC.active_channels-4; i++) {
servoHeader = servoHeader + '\ servoHeader = servoHeader + '\
<th >A' + (i+1) + '</th>\ <th class="short">A' + (i+1) + '</th>\
'; ';
} }
servoHeader = servoHeader + '<th style="width: 110px" i18n="servosDirectionAndRate"></th>'; servoHeader = servoHeader + '<th data-i18n="servosDirectionAndRate"></th>';
for (var i = 0; i < RC.active_channels; i++) { for (var i = 0; i < RC.active_channels; i++) {
servoCheckbox = servoCheckbox + '\ servoCheckbox = servoCheckbox + '\
@ -22770,8 +22768,6 @@ TABS.servos.initialize = function (callback) {
<td class="middle"><input type="number" min="500" max="2500" value="' + SERVO_CONFIG[obj].middle + '" /></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="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>\ <td class="max"><input type="number" min="500" max="2500" value="' + SERVO_CONFIG[obj].max +'" /></td>\
<td class="angleAtMin"><input type="number" min="-90" max="0" value="' + (-SERVO_CONFIG[obj].angleAtMin) +'" /></td>\
<td class="angleAtMax"><input type="number" min="0" max="90" value="' + SERVO_CONFIG[obj].angleAtMax +'" /></td>\
' + servoCheckbox + '\ ' + servoCheckbox + '\
<td class="direction">\ <td class="direction">\
</td>\ </td>\
@ -22825,11 +22821,7 @@ TABS.servos.initialize = function (callback) {
SERVO_CONFIG[info.obj].middle = parseInt($('.middle input', this).val()); SERVO_CONFIG[info.obj].middle = parseInt($('.middle input', this).val());
SERVO_CONFIG[info.obj].min = parseInt($('.min 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].max = parseInt($('.max input', this).val());
SERVO_CONFIG[info.obj].angleAtMin = -parseInt($('.angleAtMin input', this).val()); SERVO_CONFIG[info.obj].rate = parseInt($('.direction select', this).val());
SERVO_CONFIG[info.obj].angleAtMax = parseInt($('.angleAtMax input', this).val());
var val = parseInt($('.direction select', this).val());
SERVO_CONFIG[info.obj].rate = val;
}); });
// //

6
js/msp/MSPHelper.js
View file

@ -340,8 +340,6 @@ var mspHelper = (function (gui) {
'max': data.getInt16(i + 2, true), 'max': data.getInt16(i + 2, true),
'middle': data.getInt16(i + 4, true), 'middle': data.getInt16(i + 4, true),
'rate': data.getInt8(i + 6), 'rate': data.getInt8(i + 6),
'angleAtMin': data.getInt8(i + 7),
'angleAtMax': data.getInt8(i + 8),
'indexOfChannelToForward': data.getInt8(i + 9), 'indexOfChannelToForward': data.getInt8(i + 9),
'reversedInputSources': data.getUint32(i + 10) 'reversedInputSources': data.getUint32(i + 10)
}; };
@ -1514,8 +1512,8 @@ var mspHelper = (function (gui) {
buffer.push(lowByte(servoConfiguration.rate)); buffer.push(lowByte(servoConfiguration.rate));
buffer.push(servoConfiguration.angleAtMin); buffer.push(0);
buffer.push(servoConfiguration.angleAtMax); buffer.push(0);
var out = servoConfiguration.indexOfChannelToForward; var out = servoConfiguration.indexOfChannelToForward;
if (out == undefined) { if (out == undefined) {

2
tabs/servos.html
View file

@ -13,8 +13,6 @@
<th data-i18n="servosMid"></th> <th data-i18n="servosMid"></th>
<th data-i18n="servosMin"></th> <th data-i18n="servosMin"></th>
<th data-i18n="servosMax"></th> <th data-i18n="servosMax"></th>
<th class="wide" data-i18n="servosAngleAtMin"></th>
<th class="wide" data-i18n="servosAngleAtMax"></th>
<th class="short">CH1</th> <th class="short">CH1</th>
<th class="short">CH2</th> <th class="short">CH2</th>
<th class="short">CH3</th> <th class="short">CH3</th>

12
tabs/servos.js
View file

@ -45,10 +45,10 @@ TABS.servos.initialize = function (callback) {
var servoHeader = ''; var servoHeader = '';
for (var i = 0; i < RC.active_channels-4; i++) { for (var i = 0; i < RC.active_channels-4; i++) {
servoHeader = servoHeader + '\ servoHeader = servoHeader + '\
<th >A' + (i+1) + '</th>\ <th class="short">A' + (i+1) + '</th>\
'; ';
} }
servoHeader = servoHeader + '<th style="width: 110px" i18n="servosDirectionAndRate"></th>'; servoHeader = servoHeader + '<th data-i18n="servosDirectionAndRate"></th>';
for (var i = 0; i < RC.active_channels; i++) { for (var i = 0; i < RC.active_channels; i++) {
servoCheckbox = servoCheckbox + '\ servoCheckbox = servoCheckbox + '\
@ -68,8 +68,6 @@ TABS.servos.initialize = function (callback) {
<td class="middle"><input type="number" min="500" max="2500" value="' + SERVO_CONFIG[obj].middle + '" /></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="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>\ <td class="max"><input type="number" min="500" max="2500" value="' + SERVO_CONFIG[obj].max +'" /></td>\
<td class="angleAtMin"><input type="number" min="-90" max="0" value="' + (-SERVO_CONFIG[obj].angleAtMin) +'" /></td>\
<td class="angleAtMax"><input type="number" min="0" max="90" value="' + SERVO_CONFIG[obj].angleAtMax +'" /></td>\
' + servoCheckbox + '\ ' + servoCheckbox + '\
<td class="direction">\ <td class="direction">\
</td>\ </td>\
@ -123,11 +121,7 @@ TABS.servos.initialize = function (callback) {
SERVO_CONFIG[info.obj].middle = parseInt($('.middle input', this).val()); SERVO_CONFIG[info.obj].middle = parseInt($('.middle input', this).val());
SERVO_CONFIG[info.obj].min = parseInt($('.min 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].max = parseInt($('.max input', this).val());
SERVO_CONFIG[info.obj].angleAtMin = -parseInt($('.angleAtMin input', this).val()); SERVO_CONFIG[info.obj].rate = parseInt($('.direction select', this).val());
SERVO_CONFIG[info.obj].angleAtMax = parseInt($('.angleAtMax input', this).val());
var val = parseInt($('.direction select', this).val());
SERVO_CONFIG[info.obj].rate = val;
}); });
// //