mirror of
https://github.com/betaflight/betaflight-configurator.git
synced 2025-07-23 16:25:22 +03:00
Merge remote-tracking branch 'cleanflight/development' into NewPIDFunctions
This commit is contained in:
skaman82
commit
a17ca73a53
11 changed files with 114 additions and 85 deletions
|
|
@ -470,13 +470,22 @@
|
|||
"message": "Board and Sensor Alignment"
|
||||
},
|
||||
"configurationBoardAlignmentRoll": {
|
||||
"message": "Roll Adjustment [deg]"
|
||||
"message": "Roll Degrees"
|
||||
},
|
||||
"configurationBoardAlignmentPitch": {
|
||||
"message": "Pitch Adjustment [deg]"
|
||||
"message": "Pitch Degrees"
|
||||
},
|
||||
"configurationBoardAlignmentYaw": {
|
||||
"message": "Yaw Adjustment [deg]"
|
||||
"message": "Yaw Degrees"
|
||||
},
|
||||
"configurationSensorAlignmentGyro": {
|
||||
"message": "Gyroscope Alignment"
|
||||
},
|
||||
"configurationSensorAlignmentAcc": {
|
||||
"message": "Accelerometer Alignment"
|
||||
},
|
||||
"configurationSensorAlignmentMag": {
|
||||
"message": "Compass/Magnetometer Alignment"
|
||||
},
|
||||
"configurationAccelTrims": {
|
||||
"message": "Accelerometer Trim"
|
||||
|
|
@ -1031,7 +1040,7 @@
|
|||
"message": "<strong>Motor Test Mode Notice:</strong><br />Moving the sliders will cause the motors to <strong>spin up</strong>.<br />In order to prevent injury <strong style=\"color: red\">remove ALL propellers</strong> before using this feature.<br />"
|
||||
},
|
||||
"motorsEnableControl": {
|
||||
"message": "I understand the risks, propellors are removed - Enable motor control."
|
||||
"message": "I understand the risks, propellers are removed - Enable motor control."
|
||||
},
|
||||
|
||||
"sensorsInfo": {
|
||||
|
|
@ -1265,7 +1274,7 @@
|
|||
"message": "<strong>Recovery / Lost communication<strong>"
|
||||
},
|
||||
"firmwareFlasherRecoveryText": {
|
||||
"message": "If you have lost comminication with your board follow these steps to restore communication: <ul><li>Power off</li><li>Enable 'No reboot sequence', enable 'Full chip erase'.</li><li>Jumper the BOOT pins or hold BOOT button.</li><li>Power on (activity LED will NOT flash if done correctly).</li><li>Release BOOT button if your FC has one.</li><li>Flash with correct firmware (using manual baud rate if specified in your FC's manual).</li><li>Power off.</li><li>Remove BOOT jumper.</li><li>Power on (activity LED should flash).</li><li>Connect normally.</li></ul>"
|
||||
"message": "If you have lost communication with your board follow these steps to restore communication: <ul><li>Power off</li><li>Enable 'No reboot sequence', enable 'Full chip erase'.</li><li>Jumper the BOOT pins or hold BOOT button.</li><li>Power on (activity LED will NOT flash if done correctly).</li><li>Release BOOT button if your FC has one.</li><li>Flash with correct firmware (using manual baud rate if specified in your FC's manual).</li><li>Power off.</li><li>Remove BOOT jumper.</li><li>Power on (activity LED should flash).</li><li>Connect normally.</li></ul>"
|
||||
},
|
||||
"firmwareFlasherButtonLeave": {
|
||||
"message": "Leave Firmware Flasher"
|
||||
|
|
@ -1417,6 +1426,12 @@
|
|||
"failsafeChannelFallbackSettingsHelp": {
|
||||
"message": "These settings are applied to invalid individual AUX channels or to all channels when entering stage 1. <strong>Note:</strong> values are saved in steps of 25usec, so small changes disappear"
|
||||
},
|
||||
"failsafeChannelFallbackSettingsAuto": {
|
||||
"message": "<strong>Auto</strong> means Roll, Pitch and Yaw to center and Throttle low. <strong>Hold</strong> means maintain the last good value received"
|
||||
},
|
||||
"failsafeChannelFallbackSettingsHold": {
|
||||
"message": "<strong>Hold</strong> means maintain the last good value received. <strong>Set</strong> means the value given here will be used"
|
||||
},
|
||||
"failsafeStageTwoSettingsTitle": {
|
||||
"message": "Stage 2 - Settings"
|
||||
},
|
||||
|
|
|
|||
|
|
@ -4,9 +4,15 @@
|
|||
viewBox="0 0 85 85" style="enable-background:new 0 0 85 85;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#707173;}
|
||||
.st1{fill:#9C9E9F;}
|
||||
</style>
|
||||
<path class="st0" d="M44.8,5.1C25,5.1,8.7,20.6,7.5,40.1h14.4c1.2-11.6,11-20.7,22.9-20.7c12.7,0,23.1,10.3,23.1,23.1
|
||||
S57.5,65.5,44.8,65.5c-5,0-9.6-1.6-13.4-4.3v0l-11.3,9.2c6.6,5.8,15.2,9.4,24.7,9.4c20.6,0,37.4-16.8,37.4-37.4S65.4,5.1,44.8,5.1z"
|
||||
/>
|
||||
<polygon class="st0" points="1.7,31 12.8,58.2 30.9,35.1 "/>
|
||||
<g>
|
||||
<path class="st0" d="M82.4,48.7V26.9C75.6,17.3,60,10.6,41.9,10.6C24.3,10.6,9.1,16.9,2,26.1v22.8c7.1-9.2,22.3-15.5,39.9-15.5
|
||||
c17.8,0,33.1,6.5,40.1,15.8C82.2,49,82.3,48.8,82.4,48.7z"/>
|
||||
<g>
|
||||
<path class="st1" d="M61.7,64.8c9.2-2.9,16.6-7.6,20.7-13.4V29.7c-0.1-0.2-0.2-0.4-0.4-0.5c-4.2,5.6-11.4,10.1-20.3,12.9V64.8z"/>
|
||||
<path class="st1" d="M36.8,67.4V44.6C21.4,43.5,8.4,37.6,2,29.3v22.9C8.4,60.4,21.4,66.4,36.8,67.4z"/>
|
||||
</g>
|
||||
<polygon class="st1" points="28.4,72.3 58.3,54.8 28.3,36.6 "/>
|
||||
</g>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 726 B After Width: | Height: | Size: 948 B |
|
|
@ -4,15 +4,9 @@
|
|||
viewBox="0 0 85 85" style="enable-background:new 0 0 85 85;" xml:space="preserve">
|
||||
<style type="text/css">
|
||||
.st0{fill:#707173;}
|
||||
.st1{fill:#9C9E9F;}
|
||||
</style>
|
||||
<g>
|
||||
<path class="st0" d="M82.4,48.7V26.9C75.6,17.3,60,10.6,41.9,10.6C24.3,10.6,9.1,16.9,2,26.1v22.8c7.1-9.2,22.3-15.5,39.9-15.5
|
||||
c17.8,0,33.1,6.5,40.1,15.8C82.2,49,82.3,48.8,82.4,48.7z"/>
|
||||
<g>
|
||||
<path class="st1" d="M61.7,64.8c9.2-2.9,16.6-7.6,20.7-13.4V29.7c-0.1-0.2-0.2-0.4-0.4-0.5c-4.2,5.6-11.4,10.1-20.3,12.9V64.8z"/>
|
||||
<path class="st1" d="M36.8,67.4V44.6C21.4,43.5,8.4,37.6,2,29.3v22.9C8.4,60.4,21.4,66.4,36.8,67.4z"/>
|
||||
</g>
|
||||
<polygon class="st1" points="28.4,72.3 58.3,54.8 28.3,36.6 "/>
|
||||
</g>
|
||||
<path class="st0" d="M44.8,5.1C25,5.1,8.7,20.6,7.5,40.1h14.4c1.2-11.6,11-20.7,22.9-20.7c12.7,0,23.1,10.3,23.1,23.1
|
||||
S57.5,65.5,44.8,65.5c-5,0-9.6-1.6-13.4-4.3v0l-11.3,9.2c6.6,5.8,15.2,9.4,24.7,9.4c20.6,0,37.4-16.8,37.4-37.4S65.4,5.1,44.8,5.1z"
|
||||
/>
|
||||
<polygon class="st0" points="1.7,31 12.8,58.2 30.9,35.1 "/>
|
||||
</svg>
|
||||
|
|
|
|||
|
Before Width: | Height: | Size: 948 B After Width: | Height: | Size: 726 B |
|
|
@ -287,8 +287,7 @@ GUI_control.prototype.content_ready = function (callback) {
|
|||
});
|
||||
|
||||
$('.cf_tip').each(function() {
|
||||
$(this).jBox('Tooltip', {
|
||||
content: $(this).children('.cf_tooltiptext'),
|
||||
$(this).jBox('Tooltip', {
|
||||
delayOpen: 100,
|
||||
delayClose: 100,
|
||||
position: {
|
||||
|
|
|
|||
|
|
@ -202,7 +202,9 @@
|
|||
border-bottom: 1px solid #ddd;
|
||||
}
|
||||
|
||||
.tab-configuration .number {
|
||||
.tab-configuration .number,
|
||||
.tab-configuration .select
|
||||
{
|
||||
margin-bottom: 5px;
|
||||
clear: left;
|
||||
padding-bottom: 5px;
|
||||
|
|
@ -211,7 +213,8 @@
|
|||
float: left;
|
||||
}
|
||||
|
||||
.tab-configuration .number:last-child {
|
||||
.tab-configuration .number:last-child,
|
||||
.tab-configuration .select:last-child {
|
||||
border-bottom: none;
|
||||
padding-bottom: 0px;
|
||||
margin-bottom: 0px;
|
||||
|
|
@ -361,12 +364,12 @@
|
|||
}
|
||||
|
||||
.tab-configuration .board select {
|
||||
float: left;
|
||||
width: 100%;
|
||||
/*float: left;*/
|
||||
width: 50%;
|
||||
height: 20px;
|
||||
margin: 0 0px 2px 0;
|
||||
border: 1px solid silver;
|
||||
brder-radius:3px;
|
||||
border-radius:3px;
|
||||
}
|
||||
|
||||
|
||||
|
|
@ -385,7 +388,7 @@
|
|||
height: 20px;
|
||||
margin: 0 0px 2px 0;
|
||||
border: 1px solid silver;
|
||||
brder-radius:3px;
|
||||
border-radius:3px;
|
||||
margin-bottom: 20px;
|
||||
margin-top:3px;
|
||||
|
||||
|
|
@ -441,12 +444,17 @@
|
|||
}
|
||||
|
||||
.tab-configuration .sensoralignment {
|
||||
width: 40%;
|
||||
width: 60%;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.tab-configuration .board_align_content {
|
||||
width: 60%;
|
||||
width: 40%;
|
||||
float: left;
|
||||
}
|
||||
|
||||
.tab-configuration .sensoralignment span {
|
||||
width: 50%;
|
||||
float: left;
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -97,9 +97,7 @@
|
|||
<div class="gui_box grey">
|
||||
<div class="gui_box_titlebar">
|
||||
<div class="spacer_box_title" i18n="configurationBoardAlignment"></div>
|
||||
<div class="helpicon cf_tip">
|
||||
<div class="cf_tooltiptext" i18n="configHelp2"></div>
|
||||
</div>
|
||||
<div class="helpicon cf_tip" i18n_title="configHelp2"></div>
|
||||
</div>
|
||||
<div class="spacer_box">
|
||||
<div class="board_align_content">
|
||||
|
|
@ -123,23 +121,32 @@
|
|||
</div>
|
||||
</div>
|
||||
<div class="sensoralignment">
|
||||
<div class="number">
|
||||
<select class="gyroalign">
|
||||
<option value="0">GYRO alignment: default</option>
|
||||
<!-- list generated here -->
|
||||
</select>
|
||||
<div class="select">
|
||||
<label>
|
||||
<span i18n="configurationSensorAlignmentGyro"></span>
|
||||
<select class="gyroalign">
|
||||
<option value="0">Default</option>
|
||||
<!-- list generated here -->
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
<div class="number">
|
||||
<select class="accalign">
|
||||
<option value="0">ACC alignment: default</option>
|
||||
<!-- list generated here -->
|
||||
</select>
|
||||
<div class="select">
|
||||
<label>
|
||||
<span i18n="configurationSensorAlignmentAcc"></span>
|
||||
<select class="accalign">
|
||||
<option value="0">Default</option>
|
||||
<!-- list generated here -->
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
<div class="number">
|
||||
<select class="magalign">
|
||||
<option value="0">MAG alignment: default</option>
|
||||
<!-- list generated here -->
|
||||
</select>
|
||||
<div class="select">
|
||||
<label>
|
||||
<span i18n="configurationSensorAlignmentMag"></span>
|
||||
<select class="magalign">
|
||||
<option value="0">Default</option>
|
||||
<!-- list generated here -->
|
||||
</select>
|
||||
</label>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
@ -283,9 +290,7 @@
|
|||
<div class="gui_box grey">
|
||||
<div class="gui_box_titlebar">
|
||||
<div class="spacer_box_title" i18n="configurationRSSI"></div>
|
||||
<div class="helpicon cf_tip">
|
||||
<div class="cf_tooltiptext" i18n="configurationRSSIHelp"></div>
|
||||
</div>
|
||||
<div class="helpicon cf_tip" i18n_title="configurationRSSIHelp"></div>
|
||||
</div>
|
||||
<div class="spacer_box">
|
||||
<table cellpadding="0" cellspacing="0">
|
||||
|
|
|
|||
|
|
@ -231,9 +231,9 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
|
|||
$('.tab-configuration .sensoralignment').hide();
|
||||
} else {
|
||||
for (var i = 0; i < alignments.length; i++) {
|
||||
orientation_gyro_e.append('<option value="' + (i+1) + '">GYRO align: '+ alignments[i] + '</option>');
|
||||
orientation_acc_e.append('<option value="' + (i+1) + '">ACC align: '+ alignments[i] + '</option>');
|
||||
orientation_mag_e.append('<option value="' + (i+1) + '">MAG align: '+ alignments[i] + '</option>');
|
||||
orientation_gyro_e.append('<option value="' + (i+1) + '">'+ alignments[i] + '</option>');
|
||||
orientation_acc_e.append('<option value="' + (i+1) + '">'+ alignments[i] + '</option>');
|
||||
orientation_mag_e.append('<option value="' + (i+1) + '">'+ alignments[i] + '</option>');
|
||||
}
|
||||
orientation_gyro_e.val(SENSOR_ALIGNMENT.align_gyro);
|
||||
orientation_acc_e.val(SENSOR_ALIGNMENT.align_acc);
|
||||
|
|
|
|||
|
|
@ -211,10 +211,31 @@
|
|||
margin-right: 3px;
|
||||
}
|
||||
|
||||
.tab-failsafe .channelprimary {
|
||||
float:left;
|
||||
width:60%;
|
||||
}
|
||||
|
||||
.tab-failsafe .channelauxiliary {
|
||||
float:left;
|
||||
width:60%;
|
||||
padding-top: 2px;
|
||||
}
|
||||
|
||||
.tab-failsafe .channelname {
|
||||
margin-right: 3px;
|
||||
}
|
||||
|
||||
.tab-failsafe .channelsetting {
|
||||
float:left;
|
||||
width:25%;
|
||||
}
|
||||
|
||||
.tab-failsafe .auxiliary {
|
||||
float:left;
|
||||
width:15%;
|
||||
}
|
||||
|
||||
.tab-failsafe .note {
|
||||
margin-bottom: 20px;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -39,9 +39,7 @@
|
|||
<div class="gui_box grey newpane">
|
||||
<div class="gui_box_titlebar">
|
||||
<div class="spacer_box_title" i18n="failsafePulsrangeTitle"></div>
|
||||
<div class="helpicon cf_tip">
|
||||
<div class="cf_tooltiptext" i18n="failsafePulsrangeHelp"></div>
|
||||
</div>
|
||||
<div class="helpicon cf_tip" i18n_title="failsafePulsrangeHelp"></div>
|
||||
</div>
|
||||
<div class="spacer_box">
|
||||
<div class="number">
|
||||
|
|
@ -59,9 +57,7 @@
|
|||
<div class="gui_box grey stage1 newpane">
|
||||
<div class="gui_box_titlebar">
|
||||
<div class="spacer_box_title" i18n="failsafeChannelFallbackSettingsTitle"></div>
|
||||
<div class="helpicon cf_tip">
|
||||
<div class="cf_tooltiptext" i18n="failsafeChannelFallbackSettingsHelp"></div>
|
||||
</div>
|
||||
<div class="helpicon cf_tip" i18n_title="failsafeChannelFallbackSettingsHelp"></div>
|
||||
</div>
|
||||
<div class="spacer_box">
|
||||
<div class="activechannellist">
|
||||
|
|
@ -82,9 +78,7 @@
|
|||
</div>
|
||||
<label for="failsafe_feature_new"><span i18n="failsafeFeatureItem"></span>
|
||||
</label>
|
||||
<div class="helpicon cf_tip">
|
||||
<div class="cf_tooltiptext" i18n="failsafeFeatureHelp"></div>
|
||||
</div>
|
||||
<div class="helpicon cf_tip" i18n_title="failsafeFeatureHelp"></div>
|
||||
</div>
|
||||
<div class="checkbox stage2">
|
||||
<div class="numberspacer" >
|
||||
|
|
@ -92,25 +86,19 @@
|
|||
</div>
|
||||
<label for="failsafe_kill_switch"><span i18n="failsafeKillSwitchItem"></span>
|
||||
</label>
|
||||
<div class="helpicon cf_tip">
|
||||
<div class="cf_tooltiptext" i18n="failsafeKillSwitchHelp"></div>
|
||||
</div>
|
||||
<div class="helpicon cf_tip" i18n_title="failsafeKillSwitchHelp"></div>
|
||||
</div>
|
||||
<div class="number stage2">
|
||||
<label> <input type="number" name="failsafe_delay" min="0" max="2000" /> <span
|
||||
i18n="failsafeDelayItem"></span>
|
||||
</label>
|
||||
<div class="helpicon cf_tip">
|
||||
<div class="cf_tooltiptext" i18n="failsafeDelayHelp"></div>
|
||||
</div>
|
||||
<div class="helpicon cf_tip" i18n_title="failsafeDelayHelp"></div>
|
||||
</div>
|
||||
<div class="number stage2">
|
||||
<label> <input type="number" name="failsafe_throttle_low_delay" min="0" max="2000" /> <span
|
||||
i18n="failsafeThrottleLowItem"></span>
|
||||
</label>
|
||||
<div class="helpicon cf_tip">
|
||||
<div class="cf_tooltiptext" i18n="failsafeThrottleLowHelp"></div>
|
||||
</div>
|
||||
<div class="helpicon cf_tip" i18n_title="failsafeThrottleLowHelp"></div>
|
||||
</div>
|
||||
<!-- radio buttons -->
|
||||
<div class="subline stage2" i18n="failsafeSubTitle1"></div>
|
||||
|
|
@ -133,9 +121,7 @@
|
|||
<label> <input type="number" name="failsafe_off_delay" min="0" max="2000" /> <span
|
||||
i18n="failsafeOffDelayItem"></span>
|
||||
</label>
|
||||
<div class="helpicon cf_tip">
|
||||
<div class="cf_tooltiptext" i18n="failsafeOffDelayHelp"></div>
|
||||
</div>
|
||||
<div class="helpicon cf_tip" i18n_title="failsafeOffDelayHelp"></div>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
|
|
|
|||
|
|
@ -126,34 +126,31 @@ TABS.failsafe.initialize = function (callback, scrollPosition) {
|
|||
if (i < channelNames.length) {
|
||||
fullChannels_e.append('\
|
||||
<div class="number">\
|
||||
<div style="width:60%; float:left;">\
|
||||
<div class="channelprimary">\
|
||||
<span>' + channelNames[i] + '</span>\
|
||||
</div>\
|
||||
<div class="cf_tip" style="width:25%; float:left;">\
|
||||
<div class="cf_tooltiptext" style="display:none;"><strong>Auto</strong> means Roll, Pitch and Yaw to center and Throttle low. <strong>Hold</strong> means maintain the last good value received.</div>\
|
||||
<div class="cf_tip channelsetting" title="' + chrome.i18n.getMessage("failsafeChannelFallbackSettingsAuto") + '">\
|
||||
<select class="aux_set" id="' + i + '">\
|
||||
<option value="0">Auto</option>\
|
||||
<option value="1">Hold</option>\
|
||||
</select>\
|
||||
</div>\
|
||||
<div style="width:15%; float:left;"><input type="number" name="aux_value" min="750" max="2250" id="' + i + '"/></div>\
|
||||
</div>\
|
||||
');
|
||||
} else {
|
||||
fullChannels_e.append('\
|
||||
<div class="number">\
|
||||
<div style="width:60%; float:left; padding-top: 2px;">\
|
||||
<div class="channelauxiliary">\
|
||||
<span class="channelname">' + chrome.i18n.getMessage("controlAxisAux" + (aux_index++)) + '</span>\
|
||||
' + auxAssignment[aux_assignment_index++] + '\
|
||||
</div>\
|
||||
<div class="cf_tip" style="width:25%; float:left;">\
|
||||
<div class="cf_tooltiptext" style="display:none;"><strong>Hold</strong> means maintain the last good value received. <strong>Set</strong> means the value given here will be used. </div>\
|
||||
<div class="cf_tip channelsetting" title="' + chrome.i18n.getMessage("failsafeChannelFallbackSettingsHold") + '">\
|
||||
<select class="aux_set" id="' + i + '">\
|
||||
<option value="1">Hold</option>\
|
||||
<option value="2">Set</option>\
|
||||
</select>\
|
||||
</div>\
|
||||
<div style="width:15%; float:left;"><input type="number" name="aux_value" min="750" max="2250" id="' + i + '"/></div>\
|
||||
<div class="auxiliary"><input type="number" name="aux_value" min="750" max="2250" id="' + i + '"/></div>\
|
||||
</div>\
|
||||
');
|
||||
}
|
||||
|
|
|
|||
|
|
@ -134,9 +134,7 @@
|
|||
<div class="pid_mode borderleft">
|
||||
<div class="textleft">
|
||||
<div class="pidTuningLevel" i18n="pidTuningLevel"></div>
|
||||
<div class="helpicon cf_tip">
|
||||
<div class="cf_tooltiptext" i18n="pidTuningLevelHelp"></div>
|
||||
</div>
|
||||
<div class="helpicon cf_tip" i18n_title="pidTuningLevelHelp"></div>
|
||||
</div>
|
||||
<div class="pids" i18n="pidTuningLevelP"></div>
|
||||
<div class="pids" i18n="pidTuningLevelI"></div>
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue