speedybac
/
inav-configurator
mirror of https://github.com/iNavFlight/inav-configurator
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'tricopterY-Motor_test_patch' into development

Browse Source
pull/3/head
NightHawk32 9 years ago
parent fb5d2678b6 d22271ce61
commit 08f26c1549
3 changed files with 42 additions and 36 deletions
Show Stats Download Patch File Download Diff File

2
tabs/configuration.html
Unescape Escape View File

@ -420,7 +420,7 @@
</label> </label>
</div> </div>
<div class="number"> <div class="number">
<label> <input type="number" name="3dneutral" step="1" min="1000" max="2000" /> <span <label> <input type="number" name="3dneutral" step="1" min="1475" max="1525" /> <span
i18n="configuration3dNeutral"></span> i18n="configuration3dNeutral"></span>
</label> </label>
</div> </div>

20
tabs/motors.html
Unescape Escape View File

@ -92,15 +92,15 @@
<div class="motor_testing"> <div class="motor_testing">
<div class="left"> <div class="left">
<div class="sliders"> <div class="sliders">
<input type="range" min="1000" max="2000" value="1000" disabled="disabled" /> <input <input type="range" min="1000" max="2000" value="1000" disabled="disabled"/>
type="range" min="1000" max="2000" value="1000" disabled="disabled" /> <input <input type="range" min="1000" max="2000" value="1000" disabled="disabled"/>
type="range" min="1000" max="2000" value="1000" disabled="disabled" /> <input <input type="range" min="1000" max="2000" value="1000" disabled="disabled"/>
type="range" min="1000" max="2000" value="1000" disabled="disabled" /> <input <input type="range" min="1000" max="2000" value="1000" disabled="disabled"/>
type="range" min="1000" max="2000" value="1000" disabled="disabled" /> <input <input type="range" min="1000" max="2000" value="1000" disabled="disabled"/>
type="range" min="1000" max="2000" value="1000" disabled="disabled" /> <input <input type="range" min="1000" max="2000" value="1000" disabled="disabled"/>
type="range" min="1000" max="2000" value="1000" disabled="disabled" /> <input <input type="range" min="1000" max="2000" value="1000" disabled="disabled"/>
type="range" min="1000" max="2000" value="1000" disabled="disabled" /> <input <input type="range" min="1000" max="2000" value="1000" disabled="disabled"/>
class="master" type="range" min="1000" max="2000" value="1000" disabled="disabled" /> <input type="range" min="1000" max="2000" value="1000" disabled="disabled" class="master"/>
</div> </div>
<div class="values"> <div class="values">
<ul> <ul>
@ -118,7 +118,7 @@
</div> </div>
<div class="notice"> <div class="notice">
<p i18n="motorsNotice"></p> <p i18n="motorsNotice"></p>
<label><input id="motorsEnableTestMode" type="checkbox" /><span <label><input id="motorsEnableTestMode" type="checkbox" class="togglesmall"/><span
class="motorsEnableTestMode" i18n="motorsEnableControl"></span></label> class="motorsEnableTestMode" i18n="motorsEnableControl"></span></label>
</div> </div>
<div class="cler-both"></div> <div class="cler-both"></div>

44
tabs/motors.js
Unescape Escape View File

@ -183,7 +183,8 @@ TABS.motors.initialize = function (callback) {
self.allowTestMode = false; self.allowTestMode = false;
} }
$('#motorsEnableTestMode').prop('disabled', 'true'); $('#motorsEnableTestMode').prop('checked', false);
$('#motorsEnableTestMode').prop('disabled', true);
update_model(CONFIG.multiType); update_model(CONFIG.multiType);
@ -317,6 +318,11 @@ TABS.motors.initialize = function (callback) {
$('div.values li:not(:last)').text(MISC.mincommand); $('div.values li:not(:last)').text(MISC.mincommand);
if(self.feature3DEnabled && self.feature3DSupported) { if(self.feature3DEnabled && self.feature3DSupported) {
//Arbitrary sanity checks
//Note: values may need to be revisited
if(_3D.neutral3d > 1575 || _3D.neutral3d < 1425)
_3D.neutral3d = 1500;
$('div.sliders input').val(_3D.neutral3d); $('div.sliders input').val(_3D.neutral3d);
} else { } else {
$('div.sliders input').val(MISC.mincommand); $('div.sliders input').val(MISC.mincommand);
@ -448,26 +454,9 @@ TABS.motors.initialize = function (callback) {
} }
var full_block_scale = MISC.maxthrottle - MISC.mincommand; var full_block_scale = MISC.maxthrottle - MISC.mincommand;
function update_ui() {
function update_ui() {
var previousArmState = self.armed; var previousArmState = self.armed;
update_arm_status();
if (self.armed) {
$('#motorsEnableTestMode').prop('disabled', true);
$('#motorsEnableTestMode').prop('checked', false);
} else {
if (self.allowTestMode) {
$('#motorsEnableTestMode').prop('disabled', false);
}
}
if (previousArmState != self.armed) {
console.log('arm state change detected');
$('#motorsEnableTestMode').change();
}
var block_height = $('div.m-block:first').height(); var block_height = $('div.m-block:first').height();
for (var i = 0; i < MOTOR_DATA.length; i++) { for (var i = 0; i < MOTOR_DATA.length; i++) {
@ -490,6 +479,23 @@ TABS.motors.initialize = function (callback) {
$('.servo-' + i + ' .label', servos_wrapper).text(SERVO_DATA[i]); $('.servo-' + i + ' .label', servos_wrapper).text(SERVO_DATA[i]);
$('.servo-' + i + ' .indicator', servos_wrapper).css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgba(89,170,41,1'+ color +')'}); $('.servo-' + i + ' .indicator', servos_wrapper).css({'margin-top' : margin_top + 'px', 'height' : height + 'px', 'background-color' : 'rgba(89,170,41,1'+ color +')'});
} }
//keep the following here so at least we get a visual cue of our motor setup
update_arm_status();
if (!self.allowTestMode) return;
if (self.armed) {
$('#motorsEnableTestMode').prop('disabled', true);
$('#motorsEnableTestMode').prop('checked', false);
} else {
if (self.allowTestMode) {
$('#motorsEnableTestMode').prop('disabled', false);
}
}
if (previousArmState != self.armed) {
console.log('arm state change detected');
$('#motorsEnableTestMode').change();
}
} }
// enable Status and Motor data pulling // enable Status and Motor data pulling

Write Preview
Loading…
Cancel
Save