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

Merge branch 'development' into thenickdude-private-development

Browse source
This commit is contained in:
Dominic Clifton 2015-12-16 11:04:43 +01:00
commit cccb0423b5
6 changed files with 8 additions and 8 deletions
Download patch file Download diff file Expand all files Collapse all files

4
_locales/en/messages.json
View file

@ -1343,13 +1343,13 @@
"message": "Failsafe Throttle" "message": "Failsafe Throttle"
}, },
"failsafeFeaturesHelpNew": { "failsafeFeaturesHelpNew": {
"message": "Failsafe has two stages. <strong>Stage 1</strong> is entered when a flightchannel has an invalid pulse length, the receiver reports failsafe mode or there is no signal from the receiver at all, the channel fallback settings are applied to <span style=\"color: red\">all channels</span> and a short amount of time is provided to allow for recovery. <strong>Stage 2</strong> is entered when the error condition takes longer then the configured guard time while the craft is <span style=\"color: red\">armed</span>, all channels will remain at the applied channel fallback setting unless overruled by the chosen procedure. <br /><strong>Note:</strong> Prior to entering stage 1, channel fallback settings are also applied to individual AUX channels that have invalid pulses." "message": "Failsafe has two stages. <strong>Stage 1</strong> is entered when a flightchannel has an invalid pulse length, the receiver reports failsafe mode or there is no signal from the receiver at all, the channel fallback settings are applied to <span style=\"color: red\">all channels</span> and a short amount of time is provided to allow for recovery. <strong>Stage 2</strong> is entered when the error condition takes longer than the configured guard time while the craft is <span style=\"color: red\">armed</span>, all channels will remain at the applied channel fallback setting unless overruled by the chosen procedure. <br /><strong>Note:</strong> Prior to entering stage 1, channel fallback settings are also applied to individual AUX channels that have invalid pulses."
}, },
"failsafePulsrangeTitle": { "failsafePulsrangeTitle": {
"message": "Valid Pulse Range Settings" "message": "Valid Pulse Range Settings"
}, },
"failsafePulsrangeHelp": { "failsafePulsrangeHelp": {
"message": "Pulses shorter then minimum or longer then maximum are invalid and will trigger application of individual channel fallback settings for AUX channels or entering stage 1 for flightchannels" "message": "Pulses shorter than minimum or longer than maximum are invalid and will trigger application of individual channel fallback settings for AUX channels or entering stage 1 for flightchannels"
}, },
"failsafeRxMinUsecItem": { "failsafeRxMinUsecItem": {
"message": "Minimum length" "message": "Minimum length"

3
tabs/adjustments.css
View file

@ -67,8 +67,7 @@
.tab-adjustments .adjustment select { .tab-adjustments .adjustment select {
/* outline: 1px solid silver; */ /* outline: 1px solid silver; */
border-radius: 3px; border-radius: 3px;
border: 1px solid silver; border: 1px solid silver;
#
} }
.tab-adjustments .adjustment td { .tab-adjustments .adjustment td {

2
tabs/auxiliary.css
View file

@ -58,7 +58,7 @@
} }
.tab-auxiliary .mode.off .info, .tab-auxiliary .mode.on .info { .tab-auxiliary .mode.off .info, .tab-auxiliary .mode.on .info {
color:;
} }
.tab-auxiliary .mode .info { .tab-auxiliary .mode .info {

3
tabs/configuration.css
View file

@ -187,7 +187,8 @@
width: 100%; width: 100%;
} }
.tab-configuration .spacer_box {padding-bottom 10px; .tab-configuration .spacer_box {
padding-bottom: 10px;
float: left; float: left;
width: calc(100% - 20px); width: calc(100% - 20px);
} }

2
tabs/configuration.js
View file

@ -55,7 +55,7 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
function load_3d() { function load_3d() {
var next_callback = load_html; var next_callback = load_html;
if (semver.lt(CONFIG.apiVersion, "1.14.0")) { if (semver.gte(CONFIG.apiVersion, "1.14.0")) {
MSP.send_message(MSP_codes.MSP_3D, false, false, next_callback); MSP.send_message(MSP_codes.MSP_3D, false, false, next_callback);
} else { } else {
next_callback(); next_callback();

2
tabs/setup.css
View file

@ -56,7 +56,7 @@
font-weight: bold; font-weight: bold;
border: 1px solid silver; border: 1px solid silver;
background-color: #ececec; background-color: #ececec;
border-radius: 3px: border-radius: 3px;
z-index: 100; z-index: 100;
} }