working mixer list with mixer preview

10.3.x-maintenance
cTn 2014-09-17 14:22:16 +02:00
parent e8c46d1f25
commit c352199434
4 changed files with 75 additions and 7 deletions

View File

@ -300,6 +300,9 @@
"configurationFeatures": { "configurationFeatures": {
"message": "Features" "message": "Features"
}, },
"configurationThrottleAndRC": {
"message": "Throttle & RC"
},
"configurationEepromSaved": { "configurationEepromSaved": {
"message": "EEPROM <span style=\"color: green\">saved</span>" "message": "EEPROM <span style=\"color: green\">saved</span>"
}, },

View File

@ -3,16 +3,33 @@
} }
.tab-configuration .groupTitle { .tab-configuration .groupTitle {
padding: 0 0 5px 0; padding: 0 0 5px 0;
margin: 0 0 10px 0; margin: 10px 0 10px 0;
font-size: 16px; font-size: 16px;
border-bottom: 1px solid #dddddd; border-bottom: 1px solid #dddddd;
} }
.tab-configuration .hugeWhitespace { .tab-configuration .groupTitle:nth-of-type(1){
height: 100px; margin-top: 0;
} }
.tab-configuration dl.features { .tab-configuration .mixerList {
float: left;
height: 100px;
border: 1px solid silver;
}
.tab-configuration .mixerPreview {
float: left;
width: 100px;
height: 100px;
margin: 0 0 0 15px;
}
.tab-configuration .mixerPreview img {
width: 100%;
height: 100%;
} }
.tab-configuration dl.features dt { .tab-configuration dl.features dt {
float: left; float: left;
@ -30,7 +47,6 @@
line-height: 18px; line-height: 18px;
} }
.tab-configuration .buttons { .tab-configuration .buttons {
position: fixed; position: fixed;

View File

@ -1,10 +1,17 @@
<div class="tab-configuration"> <div class="tab-configuration">
<div class="groupTitle" i18n="configurationMixer"></div> <div class="groupTitle" i18n="configurationMixer"></div>
<div class="hugeWhitespace"></div> <select class="mixerList" size="6">
<!-- mixer list generated here -->
</select>
<div class="mixerPreview">
<img src="./images/motor_order/custom.svg" />
</div>
<div class="clear-both"></div>
<div class="groupTitle" i18n="configurationFeatures"></div> <div class="groupTitle" i18n="configurationFeatures"></div>
<dl class="features"> <dl class="features">
<!-- feature list generated here --> <!-- feature list generated here -->
</dl> </dl>
<div class="groupTitle" i18n="configurationThrottleAndRC"></div>
<div class="buttons"> <div class="buttons">
<a class="save" href="#" i18n="configurationButtonSave"></a> <a class="save" href="#" i18n="configurationButtonSave"></a>
</div> </div>

View File

@ -50,6 +50,49 @@ TABS.configuration.initialize = function (callback) {
// index references // index references
var RCMAPlLetters = ['A', 'E', 'R', 'T', '1', '2', '3', '4']; var RCMAPlLetters = ['A', 'E', 'R', 'T', '1', '2', '3', '4'];
// generate mixer
var mixerList = [
{name: 'Tricopter', image: 'tri'},
{name: 'Quad +', image: 'quadp'},
{name: 'Quad X', image: 'quadx'},
{name: 'Bicopter', image: 'custom'},
{name: 'Gimbal', image: 'custom'},
{name: 'Y 6', image: 'y6'},
{name: 'HEX 6', image: 'hex6p'},
{name: 'Flying Wing', image: 'custom'},
{name: 'Y 4', image: 'y4'},
{name: 'HEX 6 X', image: 'hex6x'},
{name: 'OCTO X8', image: 'octox'},
{name: 'OCTO Flat +', image: 'octox'},
{name: 'OCTO Flat X', image: 'octox'},
{name: 'Airplane', image: 'airplane'},
{name: 'Heli 120', image: 'custom'},
{name: 'Heli 90', image: 'custom'},
{name: 'Vtail 4', image: 'vtail'},
{name: 'Hex 6 H', image: 'custom'},
{name: 'PPM to SERVO', image: 'custom'},
{name: 'Dualcopter', image: 'custom'},
{name: 'Singlecopter', image: 'custom'},
{name: 'Custom', image: 'custom'}
];
var mixer_list_e = $('select.mixerList');
for (var i = 0; i < mixerList.length; i++) {
mixer_list_e.append('<option value="' + (i + 1) + '">' + mixerList[i].name + '</option>');
}
mixer_list_e.change(function () {
var val = parseInt($(this).val());
BF_CONFIG.mixerConfiguration = val;
$('.mixerPreview img').attr('src', './images/motor_order/' + mixerList[val - 1].image + '.svg');
});
// select current configuration
mixer_list_e.val(BF_CONFIG.mixerConfiguration).change();
// generate features
var featureNames = [ var featureNames = [
'PPM - Disable PWM input and enable PPM input', 'PPM - Disable PWM input and enable PPM input',
'VBAT', 'VBAT',
@ -68,7 +111,6 @@ TABS.configuration.initialize = function (callback) {
'3D' '3D'
]; ];
// generate features
var features_e = $('.features'); var features_e = $('.features');
for (var i = 0; i < featureNames.length; i++) { for (var i = 0; i < featureNames.length; i++) {
var element = $('<dt><input id="feature-' + i + '" type="checkbox" /></dt><dd><label for="feature-' + i + '">' + featureNames[i] + '</label></dd>'); var element = $('<dt><input id="feature-' + i + '" type="checkbox" /></dt><dd><label for="feature-' + i + '">' + featureNames[i] + '</label></dd>');