Mirror/betaflight-configurator
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight-configurator.git synced 2025-07-24 08:45:28 +03:00
Code Issues Wiki Activity

Add magnetic declination info (#4336)

Browse source 
* Add magnetic declination info

* Fix race condition
This commit is contained in:
Mark Haslinghuis 2025-02-11 20:16:17 +01:00 • committed by GitHub
parent 49edb4145b
commit 20fbd871c7
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 25 additions and 14 deletions
Download patch file Download diff file Expand all files Collapse all files

2
locales/en/messages.json
View file

@ -1404,7 +1404,7 @@
"message": "The magnetometer alignment is the orientation of the magnetometer sensor on the flight controller board. The default is usually correct, but if you have a custom build or a flight controller with a different magnetometer orientation, you may need to adjust this setting."
},
"configurationMagDeclination": {
"message": "Magnetometer Declination"
"message": "Magnetic Declination"
},
"configurationMagDeclinationInput": {
"message": "Declination Degrees"

33
src/js/tabs/gps.js
View file

@ -20,10 +20,6 @@ gps.initialize = async function (callback) {
GUI.active_tab = "gps";
await MSP.promise(MSPCodes.MSP_FEATURE_CONFIG);
// mag support added in 1.46
const hasMag = have_sensor(FC.CONFIG.activeSensors, "mag") && semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46);
await MSP.promise(MSPCodes.MSP_GPS_CONFIG);
load_html();
@ -48,6 +44,9 @@ gps.initialize = async function (callback) {
// translate to user-selected languageconsole.log('Online');
i18n.localizePage();
const hasMag =
have_sensor(FC.CONFIG.activeSensors, "mag") && semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46);
function get_raw_gps_data() {
MSP.send_message(MSPCodes.MSP_RAW_GPS, false, false, get_comp_gps_data);
}
@ -65,7 +64,15 @@ gps.initialize = async function (callback) {
}
function get_imu_data() {
MSP.send_message(MSPCodes.MSP_RAW_IMU, false, false, update_ui);
MSP.send_message(MSPCodes.MSP_RAW_IMU, false, false, get_mag_data);
}
function get_mag_data() {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
MSP.send_message(MSPCodes.MSP_COMPASS_CONFIG, false, false, update_ui);
} else {
update_ui();
}
}
// GPS Configuration
@ -338,6 +345,13 @@ gps.initialize = async function (callback) {
if (semver.gte(FC.CONFIG.apiVersion, API_VERSION_1_46)) {
const positionalDop = FC.GPS_DATA.positionalDop / 100;
$(".GPS_info td.positionalDop").text(`${positionalDop.toFixed(2)}`);
if (hasMag) {
$(".GPS_info td.magDeclination").text(
`${FC.COMPASS_CONFIG.mag_declination.toFixed(1)} ${gpsUnitText}`,
);
} else {
$(".GPS_info td.magDeclination").parent().hide();
}
}
updateSignalStrengths();
@ -367,14 +381,7 @@ gps.initialize = async function (callback) {
}
// enable data pulling
GUI.interval_add(
"gps_pull",
function gps_update() {
get_raw_gps_data();
},
75,
true,
);
GUI.interval_add("gps_pull", get_raw_gps_data, 100, true);
//check for internet connection on load
if (ispConnected()) {

4
src/tabs/gps.html
View file

@ -117,6 +117,10 @@
<td i18n="gpsPositionalDop"></td>
<td class="positionalDop"></td>
</tr>
<tr>
<td i18n="configurationMagDeclination"></td>
<td class="magDeclination"></td>
</tr>
</table>
</div>
</div>