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

Merge pull request #368 from iNavFlight/agh_remove_disarm_kill_switch

Browse source 
Remove disarm_kill_switch from the configurator UI
This commit is contained in:
Konstantin Sharlaimov 2018-03-03 08:31:23 +10:00 • committed by GitHub
commit 8026403b5f
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 0 additions and 16 deletions
Download patch file Download diff file Expand all files Collapse all files

6
_locales/en/messages.json
View file

@ -684,12 +684,6 @@
"configurationAutoDisarmDelayHelp": { "configurationAutoDisarmDelayHelp": {
"message": "Requires MOTOR_STOP feature" "message": "Requires MOTOR_STOP feature"
}, },
"configurationDisarmKillSwitch": {
"message": "Disarm regardless of throttle value"
},
"configurationDisarmKillSwitchHelp": {
"message": "When arming via radio channel"
},
"configurationThrottleMinimum": { "configurationThrottleMinimum": {
"message": "Minimum Throttle" "message": "Minimum Throttle"
}, },

8
tabs/configuration.html
View file

@ -271,14 +271,6 @@
<div class="features esc"></div> <div class="features esc"></div>
<!--list of generated features goes here--> <!--list of generated features goes here-->
<div class="checkbox">
<input type="checkbox" id="disarmkillswitch" name="disarmkillswitch" class="toggle" />
<label for="disarmkillswitch">
<span data-i18n="configurationDisarmKillSwitch"></span>
</label>
<div class="helpicon cf_tip" data-i18n_title="configurationDisarmKillSwitchHelp"></div>
</div>
<div class="number disarmdelay" style="display: none; margin-bottom: 5px;"> <div class="number disarmdelay" style="display: none; margin-bottom: 5px;">
<input type="number" id="autodisarmdelay" name="autodisarmdelay" min="0" max="60" /> <input type="number" id="autodisarmdelay" name="autodisarmdelay" min="0" max="60" />
<label for="autodisarmdelay"> <label for="autodisarmdelay">

2
tabs/configuration.js
View file

@ -310,7 +310,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
//fill motor disarm params and FC loop time //fill motor disarm params and FC loop time
$('input[name="autodisarmdelay"]').val(ARMING_CONFIG.auto_disarm_delay); $('input[name="autodisarmdelay"]').val(ARMING_CONFIG.auto_disarm_delay);
$('input[name="disarmkillswitch"]').prop('checked', ARMING_CONFIG.disarm_kill_switch);
$('div.disarm').show(); $('div.disarm').show();
if(bit_check(BF_CONFIG.features, 4)) {//MOTOR_STOP if(bit_check(BF_CONFIG.features, 4)) {//MOTOR_STOP
$('div.disarmdelay').show(); $('div.disarmdelay').show();
@ -663,7 +662,6 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
MISC.mag_declination = parseFloat($('#mag_declination').val()); MISC.mag_declination = parseFloat($('#mag_declination').val());
ARMING_CONFIG.auto_disarm_delay = parseInt($('input[name="autodisarmdelay"]').val()); ARMING_CONFIG.auto_disarm_delay = parseInt($('input[name="autodisarmdelay"]').val());
ARMING_CONFIG.disarm_kill_switch = ~~$('input[name="disarmkillswitch"]').is(':checked'); // ~~ boolean to decimal conversion
MISC.minthrottle = parseInt($('#minthrottle').val()); MISC.minthrottle = parseInt($('#minthrottle').val());
MISC.midrc = parseInt($('#midthrottle').val()); MISC.midrc = parseInt($('#midthrottle').val());