Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-19 06:15:11 +03:00
Code Wiki Activity

Improve non-metric handling

Browse source 
- Forced default min/max after conversion back to firmware units
- Increased decimal places for non-integer conversions
- Fixed a typo
This commit is contained in:
Darren Lines 2022-11-16 08:36:57 +00:00
parent 8a546654b4
commit 1bd46911bb
1 changed files with 18 additions and 4 deletions
Download patch file Download diff file Expand all files Collapse all files

22
js/settings.js
View file

@ -518,11 +518,17 @@ var Settings = (function () {
if (multiplier !== 1) {
decimalPlaces = Math.min(Math.ceil(multiplier / 100), 3);
// Add extra decimal place for non-integer conversions.
if (multiplier % 1 != 0 && decimalPlaces < 3) {
decimalPlaces++;
}
step = 1 / Math.pow(10, decimalPlaces);
}
element.attr('step', step.toFixed(decimalPlaces));
if (multiplier !== 'FAHREN' && multiplier !== 'TZHOURS' && multiplier !== 1) {
element.data('default-min', element.attr('min'));
element.data('default-max', element.attr('max'));
element.attr('min', (parseFloat(element.attr('min')) / multiplier).toFixed(decimalPlaces));
element.attr('max', (parseFloat(element.attr('max')) / multiplier).toFixed(decimalPlaces));
}
@ -591,13 +597,21 @@ var Settings = (function () {
} else {
multiplier = parseFloat(multiplier);
let presicion = input.data("step") || 1; // data-step is always based on the default firmware units.
presicion = self.countDecimals(presicion);
let precision = input.data("step") || 1; // data-step is always based on the default firmware units.
precision = self.countDecimals(precision);
if (presicion === 0) {
if (precision === 0) {
value = Math.round(parseFloat(input.val()) * multiplier);
} else {
value = Math.round((parseFloat(input.val()) * multiplier) * Math.pow(10, presicion)) / Math.pow(10, presicion);
value = Math.round((parseFloat(input.val()) * multiplier) * Math.pow(10, precision)) / Math.pow(10, precision);
}
if (value > parseInt(input.data('default-max'))) {
value = parseInt(input.data('default-max'));
}
if (value < parseInt(input.data('default-min'))) {
value = parseInt(input.data('default-min'));
}
}
}