Mirror/inav-configurator
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav-configurator.git synced 2025-07-24 16:55:22 +03:00
Code Wiki Activity

Merge pull request #1664 from iNavFlight/MrD_Fix-calibrate-accelerometer-button-for-new-flashed-FCs

Browse source 
Fix calibration button
This commit is contained in:
Darren Lines 2022-12-08 19:14:36 +00:00 • committed by GitHub
commit 858c0affd7
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 24 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

18
js/fc.js
View file

@ -763,6 +763,24 @@ var FC = {
return retVal;
},
getAccelerometerCalibrated: function () {
var calibrated = true;
var flagNames = FC.getArmingFlags();
if (CALIBRATION_DATA.accGain.X === 4096 && CALIBRATION_DATA.accGain.Y === 4096 && CALIBRATION_DATA.accGain.Z === 4096 &&
CALIBRATION_DATA.accZero.X === 0 && CALIBRATION_DATA.accZero.Y === 0 && CALIBRATION_DATA.accZero.Z === 0
) {
calibrated = false;
}
if ((calibrated) && flagNames.hasOwnProperty(13)) {
if (bit_check(CONFIG.armingFlags, 13)) {
calibrated = false;
}
}
return calibrated;
},
getUserControlMode: function () {
return [
"Attitude",

20
tabs/calibration.js
View file

@ -176,24 +176,16 @@ TABS.calibration.initialize = function (callback) {
}
function setupCalibrationButton(callback) {
let showCalibrate = false;
var flagNames = FC.getArmingFlags();
if (flagNames.hasOwnProperty(13)) {
if (bit_check(CONFIG.armingFlags, 13)) {
showCalibrate = true;
}
}
if (showCalibrate) {
$('#calibrate-start-button').html(chrome.i18n.getMessage("AccBtn"));
$('#calibrate-start-button').prop("title", chrome.i18n.getMessage("AccBtn"));
$('#calibrate-start-button').addClass("calibrate");
$('#calibrate-start-button').removeClass("resetCalibration");
} else {
if (FC.getAccelerometerCalibrated()) {
$('#calibrate-start-button').html(chrome.i18n.getMessage("AccResetBtn"));
$('#calibrate-start-button').prop("title", chrome.i18n.getMessage("AccResetBtn"));
$('#calibrate-start-button').removeClass("calibrate");
$('#calibrate-start-button').addClass("resetCalibration");
} else {
$('#calibrate-start-button').html(chrome.i18n.getMessage("AccBtn"));
$('#calibrate-start-button').prop("title", chrome.i18n.getMessage("AccBtn"));
$('#calibrate-start-button').addClass("calibrate");
$('#calibrate-start-button').removeClass("resetCalibration");
}
if (callback) callback();