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

Fixed voltage / current meter configuration for firmware versions < 3.1.

10.3.x-maintenance
mikeller 2017-01-04 10:54:28 +13:00
parent 4d99e75288
commit 448b4ff093
3 changed files with 48 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
tabs/configuration.css
View File

@ -295,7 +295,7 @@
width: 30px;
}
.tab-configuration .batterymetertype {
.tab-configuration select.batterymetertype {
border: 1px solid silver;
margin-right: 5px;
float: left;

2
tabs/configuration.html
View File

@ -339,7 +339,7 @@
<!-- table generated here -->
</tbody>
</table>
<div class="select">
<div class="select batterymetertype">
<label>
<select class="batterymetertype"><!-- list generated here --></select>
<span i18n="configurationBatteryMeterType"></span>

77
tabs/configuration.js
View File

@ -444,22 +444,26 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
$('input[name="mincommand"]').val(MISC.mincommand);
// fill battery
var batteryMeterTypes = [
'Onboard ADC',
'ESC Sensor',
];
if (semver.gte(CONFIG.flightControllerVersion, "3.1.0")) {
var batteryMeterTypes = [
'Onboard ADC',
'ESC Sensor'
];
var batteryMeterType_e = $('select.batterymetertype');
for (i = 0; i < batteryMeterTypes.length; i++) {
batteryMeterType_e.append('<option value="' + i + '">' + batteryMeterTypes[i] + '</option>');
var batteryMeterType_e = $('select.batterymetertype');
for (i = 0; i < batteryMeterTypes.length; i++) {
batteryMeterType_e.append('<option value="' + i + '">' + batteryMeterTypes[i] + '</option>');
}
batteryMeterType_e.change(function () {
MISC.batterymetertype = parseInt($(this).val());
checkDisableVbatControls();
});
batteryMeterType_e.val(MISC.batterymetertype).change();
} else {
$('div.batterymetertype').hide();
}
batteryMeterType_e.change(function () {
MISC.batterymetertype = parseInt($(this).val());
checkDisableVbatControls();
});
batteryMeterType_e.val(MISC.batterymetertype).change();
$('input[name="mincellvoltage"]').val(MISC.vbatmincellvoltage);
$('input[name="maxcellvoltage"]').val(MISC.vbatmaxcellvoltage);
$('input[name="warningcellvoltage"]').val(MISC.vbatwarningcellvoltage);
@ -469,10 +473,13 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
var currentMeterTypes = [
'None',
'Onboard ADC',
'Virtual',
'ESC Sensor',
'Virtual'
];
if (semver.gte(CONFIG.flightControllerVersion, "3.1.0")) {
currentMeterTypes.push('ESC Sensor');
}
var currentMeterType_e = $('select.currentmetertype');
for (i = 0; i < currentMeterTypes.length; i++) {
currentMeterType_e.append('<option value="' + i + '">' + currentMeterTypes[i] + '</option>');
@ -528,25 +535,33 @@ TABS.configuration.initialize = function (callback, scrollPosition) {
}
function checkDisableVbatControls() {
if (BF_CONFIG.features.isEnabled('VBAT')) {
$('select.batterymetertype').prop('disabled', false);
if (MISC.batterymetertype == 1) {
$('input[name="mincellvoltage"]').prop('disabled', true);
$('input[name="maxcellvoltage"]').prop('disabled', true);
$('input[name="warningcellvoltage"]').prop('disabled', true);
$('input[name="voltagescale"]').prop('disabled', true);
function disableBatteryControls(disabled) {
$('input[name="mincellvoltage"]').prop('disabled', disabled);
$('input[name="maxcellvoltage"]').prop('disabled', disabled);
$('input[name="warningcellvoltage"]').prop('disabled', disabled);
$('input[name="voltagescale"]').prop('disabled', disabled);
}
if (semver.gte(CONFIG.flightControllerVersion, "3.1.0")) {
if (BF_CONFIG.features.isEnabled('VBAT')) {
$('select.batterymetertype').prop('disabled', false);
if (MISC.batterymetertype == 1) {
disableBatteryControls(true);
} else {
disableBatteryControls(false);
}
} else {
$('input[name="mincellvoltage"]').prop('disabled', false);
$('input[name="maxcellvoltage"]').prop('disabled', false);
$('input[name="warningcellvoltage"]').prop('disabled', false);
$('input[name="voltagescale"]').prop('disabled', false);
$('select.batterymetertype').prop('disabled', true);
disableBatteryControls(true);
}
} else {
$('select.batterymetertype').prop('disabled', true);
$('input[name="mincellvoltage"]').prop('disabled', true);
$('input[name="maxcellvoltage"]').prop('disabled', true);
$('input[name="warningcellvoltage"]').prop('disabled', true);
$('input[name="voltagescale"]').prop('disabled', true);
if (BF_CONFIG.features.isEnabled('VBAT')) {
disableBatteryControls(false);
} else {
disableBatteryControls(true);
}
}
}