Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-25 01:05:27 +03:00
Code Issues Wiki Activity

Fix aux channel configuration when using an rc system with 3 aux

Browse source 
channels.
This commit is contained in:
Dominic Clifton 2014-08-25 10:50:25 +01:00
parent a710a2fbb1
commit 6f4d04eb90
3 changed files with 24 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

4
changelog.html
View file

@ -1,3 +1,7 @@
<span>08.25.2014 - 0.49.1 cleanflight</span>
<p>
- Fix auxiliary configuration tab when using an rc system with 3 aux channels.<br />
</p>
<span>08.18.2014 - 0.49</span> <span>08.18.2014 - 0.49</span>
<p> <p>
- Motor indicators now display signal length in tooltips<br /> - Motor indicators now display signal length in tooltips<br />

2
manifest.json
View file

@ -1,7 +1,7 @@
{ {
"manifest_version": 2, "manifest_version": 2,
"minimum_chrome_version": "36", "minimum_chrome_version": "36",
"version": "0.49", "version": "0.49.1",
"author": "Hydra", "author": "Hydra",
"name": "Cleanflight - Configurator", "name": "Cleanflight - Configurator",

28
tabs/auxiliary_configuration.js
View file

@ -48,24 +48,32 @@ TABS.auxiliary_configuration.initialize = function (callback) {
var line = '<tr class="switches">'; var line = '<tr class="switches">';
line += '<td class="name">' + AUX_CONFIG[i] + '</td>'; line += '<td class="name">' + AUX_CONFIG[i] + '</td>';
var switches = '';
var auxChannelCount = RC.active_channels - 4;
var bitIndex = 0; var bitIndex = 0;
var chunks = 1; var chunks = 1;
if (bit_check(CONFIG.capability, 5) && (RC.active_channels - 4) > 4) { if (bit_check(CONFIG.capability, 5) && (auxChannelCount) > 4) {
chunks = 2; chunks = 2;
} }
var channelsRemaining = auxChannelCount;
var channelsPerChunk = 4; var channelsPerChunk = 4;
for (var chunk = 0; chunk < chunks; chunk++) { for (var chunk = 0; chunk < chunks; chunk++) {
for (var j = 0; j < channelsPerChunk * 3; j++) { for (var chunkChannel = 0; chunkChannel < channelsPerChunk && channelsRemaining; chunkChannel++, channelsRemaining--) {
if (bit_check(AUX_CONFIG_values[i], bitIndex++)) { for (var j = 0; j < 3; j++) {
line += '<td><input type="checkbox" checked="checked" /></td>'; if (bit_check(AUX_CONFIG_values[i], bitIndex++)) {
} else { switches += '<td><input type="checkbox" checked="checked" /></td>';
line += '<td><input type="checkbox" /></td>'; } else {
switches += '<td><input type="checkbox" /></td>';
}
} }
} }
bitIndex += 16 - (4 * 3); bitIndex += 16 - (4 * 3);
} }
line += '</tr>'; line += switches + '</tr>';
$('.boxes > tbody:last').append(line); $('.boxes > tbody:last').append(line);
} }
@ -76,9 +84,11 @@ TABS.auxiliary_configuration.initialize = function (callback) {
var main_needle = 0; var main_needle = 0;
var needle = 0; var needle = 0;
var auxChannelCount = RC.active_channels - 4;
var boxCountFor4AuxChannels = 3 * 4; var boxCountFor4AuxChannels = 3 * 4;
var boxCountPerLine = boxCountFor4AuxChannels; var boxCountPerLine = auxChannelCount * 3;
if (bit_check(CONFIG.capability, 5) && (RC.active_channels - 4) > 4) { if (bit_check(CONFIG.capability, 5) && (auxChannelCount) > 4) {
boxCountPerLine = boxCountFor4AuxChannels * 2; boxCountPerLine = boxCountFor4AuxChannels * 2;
} }