Update fusion to 1.3.0
This commit is contained in:
Vendored
+1
-1
Submodule 3rdparty/fusion/fusion updated: 008e03eac0...a853d08a85
Vendored
+4
-4
@@ -13,17 +13,17 @@
|
||||
<ItemGroup>
|
||||
<ClInclude Include="fusion\Fusion\Fusion.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionAhrs.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionAxes.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionCalibration.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionBias.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionCompass.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionConvention.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionMath.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionOffset.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionModel.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionRemap.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="fusion\Fusion\FusionAhrs.c" />
|
||||
<ClCompile Include="fusion\Fusion\FusionBias.c" />
|
||||
<ClCompile Include="fusion\Fusion\FusionCompass.c" />
|
||||
<ClCompile Include="fusion\Fusion\FusionOffset.c" />
|
||||
</ItemGroup>
|
||||
<PropertyGroup Label="Globals">
|
||||
<RootNamespace>Fusion</RootNamespace>
|
||||
|
||||
+4
-4
@@ -8,12 +8,12 @@
|
||||
<ItemGroup>
|
||||
<ClInclude Include="fusion\Fusion\Fusion.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionAhrs.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionAxes.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionCalibration.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionCompass.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionConvention.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionMath.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionOffset.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionBias.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionModel.h" />
|
||||
<ClInclude Include="fusion\Fusion\FusionRemap.h" />
|
||||
</ItemGroup>
|
||||
<ItemGroup>
|
||||
<ClCompile Include="fusion\Fusion\FusionAhrs.c">
|
||||
@@ -22,7 +22,7 @@
|
||||
<ClCompile Include="fusion\Fusion\FusionCompass.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
<ClCompile Include="fusion\Fusion\FusionOffset.c">
|
||||
<ClCompile Include="fusion\Fusion\FusionBias.c">
|
||||
<Filter>Source Files</Filter>
|
||||
</ClCompile>
|
||||
</ItemGroup>
|
||||
|
||||
@@ -979,7 +979,7 @@ void PadDevice::reset_orientation()
|
||||
ahrs->settings.convention = FusionConvention::FusionConventionEnu;
|
||||
ahrs->settings.gain = 0.0f; // If gain is set, the algorithm tries to adjust the orientation over time.
|
||||
FusionAhrsSetSettings(ahrs.get(), &ahrs->settings);
|
||||
FusionAhrsReset(ahrs.get());
|
||||
FusionAhrsRestart(ahrs.get());
|
||||
}
|
||||
|
||||
void PadDevice::update_orientation(ps_move_data& move_data)
|
||||
@@ -1028,7 +1028,8 @@ void PadDevice::update_orientation(ps_move_data& move_data)
|
||||
}
|
||||
|
||||
// Update Fusion
|
||||
FusionAhrsUpdate(ahrs.get(), gyroscope, accelerometer, magnetometer, elapsed_sec);
|
||||
FusionAhrsSetSamplePeriod(ahrs.get(), elapsed_sec);
|
||||
FusionAhrsUpdate(ahrs.get(), gyroscope, accelerometer, magnetometer);
|
||||
|
||||
// Get quaternion
|
||||
const FusionQuaternion quaternion = FusionAhrsGetQuaternion(ahrs.get());
|
||||
|
||||
Reference in New Issue
Block a user