mirror of
https://github.com/alexhopeoconnor/firmware.git
synced 2026-10-19 09:51:30 +10:00
Use upstream fusion library (#10724)
* Use upstream fusion library * Update Fusion dependency to new repository and version
This commit is contained in:
@@ -53,11 +53,11 @@ int32_t BMX160Sensor::runOnce()
|
||||
|
||||
// If we're set to one of the inverted positions
|
||||
if (config.display.compass_orientation > meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270) {
|
||||
ma = FusionAxesSwap(ma, FusionAxesAlignmentNXNYPZ);
|
||||
ga = FusionAxesSwap(ga, FusionAxesAlignmentNXNYPZ);
|
||||
ma = FusionRemap(ma, FusionRemapAlignmentNXNYPZ);
|
||||
ga = FusionRemap(ga, FusionRemapAlignmentNXNYPZ);
|
||||
}
|
||||
|
||||
float heading = FusionCompassCalculateHeading(FusionConventionNed, ga, ma);
|
||||
float heading = FusionCompass(ga, ma, FusionConventionNed);
|
||||
|
||||
heading = applyCompassOrientation(heading);
|
||||
if (screen)
|
||||
|
||||
@@ -93,11 +93,11 @@ int32_t ICM20948Sensor::runOnce()
|
||||
|
||||
// If we're set to one of the inverted positions
|
||||
if (config.display.compass_orientation > meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270) {
|
||||
ma = FusionAxesSwap(ma, FusionAxesAlignmentNXNYPZ);
|
||||
ga = FusionAxesSwap(ga, FusionAxesAlignmentNXNYPZ);
|
||||
ma = FusionRemap(ma, FusionRemapAlignmentNXNYPZ);
|
||||
ga = FusionRemap(ga, FusionRemapAlignmentNXNYPZ);
|
||||
}
|
||||
|
||||
float heading = FusionCompassCalculateHeading(FusionConventionNed, ga, ma);
|
||||
float heading = FusionCompass(ga, ma, FusionConventionNed);
|
||||
|
||||
heading = applyCompassOrientation(heading);
|
||||
if (screen)
|
||||
|
||||
@@ -103,10 +103,10 @@ int32_t MMC5983MASensor::runOnce()
|
||||
FusionVector ga = {.axis = {accelX, accelY, accelZ}};
|
||||
FusionVector ma = {.axis = {magX, magY, magZ}};
|
||||
if (config.display.compass_orientation > meshtastic_Config_DisplayConfig_CompassOrientation_DEGREES_270) {
|
||||
ma = FusionAxesSwap(ma, FusionAxesAlignmentNXNYPZ);
|
||||
ga = FusionAxesSwap(ga, FusionAxesAlignmentNXNYPZ);
|
||||
ma = FusionRemap(ma, FusionRemapAlignmentNXNYPZ);
|
||||
ga = FusionRemap(ga, FusionRemapAlignmentNXNYPZ);
|
||||
}
|
||||
heading = FusionCompassCalculateHeading(FusionConventionNed, ga, ma) + MMC5983MA_HEADING_OFFSET_DEG;
|
||||
heading = FusionCompass(ga, ma, FusionConventionNed) + MMC5983MA_HEADING_OFFSET_DEG;
|
||||
} else {
|
||||
heading = atan2f(magY, magX) * RAD_TO_DEG + MMC5983MA_HEADING_OFFSET_DEG;
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user