Merge branch 'development' of https://github.com/MauroMombelli/cleanflight-configurator into development

Conflicts:
	tabs/servos.js
10.3.x-maintenance
Dominic Clifton 2015-10-14 20:33:42 +01:00
commit d70067c9b2
1 changed files with 4 additions and 4 deletions

View File

@ -75,9 +75,9 @@ TABS.servos.initialize = function (callback) {
$('div.tab-servos table.fields').append('\
<tr> \
<td style="text-align: center">' + name + '</td>\
<td class="middle"><input type="number" min="1000" max="2000" value="' + SERVO_CONFIG[obj].middle + '" /></td>\
<td class="min"><input type="number" min="1000" max="2000" value="' + SERVO_CONFIG[obj].min +'" /></td>\
<td class="max"><input type="number" min="1000" max="2000" value="' + SERVO_CONFIG[obj].max +'" /></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>\
<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 + '\
@ -198,4 +198,4 @@ TABS.servos.initialize = function (callback) {
TABS.servos.cleanup = function (callback) {
if (callback) callback();
};
};