sundowndev
/
betaflight-configurator
mirror of https://github.com/sundowndev/betaflight-configurator.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #624 from piepluquad/master 

clarify message for configurationDisarmKillSwitch  (fixes betaflight/betaflight-configurator#597)
10.3.x-maintenance
Michael Keller 2017-08-20 18:19:09 +12:00 committed by GitHub
parent 61f3978233 e89d87b573
commit e24000e0af
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
_locales/en/messages.json
View File

@ -683,7 +683,10 @@
"message": "Disarm motors after set delay [seconds] (Requires MOTOR_STOP feature)" "message": "Disarm motors after set delay [seconds] (Requires MOTOR_STOP feature)"
}, },
"configurationDisarmKillSwitch": { "configurationDisarmKillSwitch": {
"message": "Disarm motors regardless of throttle value (When arming via AUX channel)" "message": "Disarm motors regardless of throttle value (When ARM is configured in Modes tab via AUX channel)"
},
"configurationDisarmKillSwitchHelp": {
"message": "Arming is always disabled when the throttle is not low. Be careful as you could disarm accidentally with a switch while flying with this option active."
}, },
"configurationDigitalIdlePercent": { "configurationDigitalIdlePercent": {
"message": "Motor Idle Throttle Value [percent]" "message": "Motor Idle Throttle Value [percent]"

3
tabs/configuration.html
View File

@ -186,6 +186,7 @@
</div> </div>
<label for="disarmkillswitch"> <span class="freelabel" <label for="disarmkillswitch"> <span class="freelabel"
i18n="configurationDisarmKillSwitch"></span> i18n="configurationDisarmKillSwitch"></span>
<div class="helpicon cf_tip" i18n_title="cconfigurationDisarmKillSwitcHelp"></div>
</label> </label>
</div> </div>
<div class="number disarmdelay" style="display: none; margin-bottom: 5px;"> <div class="number disarmdelay" style="display: none; margin-bottom: 5px;">
@ -697,4 +698,4 @@
</div> </div>
</div> </div>
</div> </div>
</div> </div>