Mirrors_Framework/PX4-Autopilot
1
0
Fork 0
mirror of https://github.com/PX4/PX4-Autopilot.git synced 2026-05-27 18:27:05 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

Add inline to avoid double definition errors

Browse Source
This commit is contained in:
Julian Kent
2021-01-22 10:59:10 +01:00
committed by Lorenz Meier
parent c79bd033c0
commit a9fc104387
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/modules/commander/lm_fit.hpp
+6 -6
View File
@@ -54,9 +54,9 @@
* *
* @return 0 on success, 1 on failure * @return 0 on success, 1 on failure
*/ */
int run_lm_sphere_fit(const float x[], const float y[], const float z[], float &_fitness, float &_sphere_lambda, inline int run_lm_sphere_fit(const float x[], const float y[], const float z[], float &_fitness, float &_sphere_lambda,
unsigned int samples_collected, float *offset_x, float *offset_y, float *offset_z, unsigned int samples_collected, float *offset_x, float *offset_y, float *offset_z,
float *sphere_radius, float *diag_x, float *diag_y, float *diag_z, float *offdiag_x, float *offdiag_y, float *offdiag_z) float *sphere_radius, float *diag_x, float *diag_y, float *diag_z, float *offdiag_x, float *offdiag_y, float *offdiag_z)
{ {
// Run Sphere Fit using Levenberg Marquardt LSq Fit // Run Sphere Fit using Levenberg Marquardt LSq Fit
const float lma_damping = 10.f; const float lma_damping = 10.f;
@@ -178,9 +178,9 @@ int run_lm_sphere_fit(const float x[], const float y[], const float z[], float &
} }
} }
int run_lm_ellipsoid_fit(const float x[], const float y[], const float z[], float &_fitness, float &_sphere_lambda, inline int run_lm_ellipsoid_fit(const float x[], const float y[], const float z[], float &_fitness,
unsigned int samples_collected, float *offset_x, float *offset_y, float *offset_z, float &_sphere_lambda, unsigned int samples_collected, float *offset_x, float *offset_y, float *offset_z,
float *sphere_radius, float *diag_x, float *diag_y, float *diag_z, float *offdiag_x, float *offdiag_y, float *offdiag_z) float *sphere_radius, float *diag_x, float *diag_y, float *diag_z, float *offdiag_x, float *offdiag_y, float *offdiag_z)
{ {
// Run Sphere Fit using Levenberg Marquardt LSq Fit // Run Sphere Fit using Levenberg Marquardt LSq Fit
const float lma_damping = 10.0f; const float lma_damping = 10.0f;