Skip to content

Commit

Permalink
AP_Compass: Also mark Z axis as calibrations, just like the XY
Browse files Browse the repository at this point in the history
  • Loading branch information
amilcarlucas authored and tridge committed Nov 5, 2024
1 parent 909b48b commit 6a59d3a
Showing 1 changed file with 12 additions and 0 deletions.
12 changes: 12 additions & 0 deletions libraries/AP_Compass/AP_Compass.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -99,6 +99,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @Units: mGauss
// @Increment: 1
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("OFS", 1, Compass, _state._priv_instance[0].offset, 0),

// @Param: DEC
Expand Down Expand Up @@ -170,6 +171,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @Units: mGauss/A
// @Increment: 1
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("MOT", 7, Compass, _state._priv_instance[0].motor_compensation, 0),
#endif

Expand Down Expand Up @@ -215,6 +217,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @Units: mGauss
// @Increment: 1
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("OFS2", 10, Compass, _state._priv_instance[1].offset, 0),

// @Param: MOT2_X
Expand Down Expand Up @@ -242,6 +245,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @Units: mGauss/A
// @Increment: 1
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("MOT2", 11, Compass, _state._priv_instance[1].motor_compensation, 0),

#endif // COMPASS_MAX_INSTANCES
Expand Down Expand Up @@ -272,6 +276,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @Units: mGauss
// @Increment: 1
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("OFS3", 13, Compass, _state._priv_instance[2].offset, 0),

// @Param: MOT3_X
Expand Down Expand Up @@ -299,6 +304,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @Units: mGauss/A
// @Increment: 1
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("MOT3", 14, Compass, _state._priv_instance[2].motor_compensation, 0),
#endif // COMPASS_MAX_INSTANCES

Expand Down Expand Up @@ -390,6 +396,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @DisplayName: Compass soft-iron diagonal Z component
// @Description: DIA_Z in the compass soft-iron calibration matrix: [[DIA_X, ODI_X, ODI_Y], [ODI_X, DIA_Y, ODI_Z], [ODI_Y, ODI_Z, DIA_Z]]
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("DIA", 24, Compass, _state._priv_instance[0].diagonals, 1.0),

// @Param: ODI_X
Expand All @@ -408,6 +415,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @DisplayName: Compass soft-iron off-diagonal Z component
// @Description: ODI_Z in the compass soft-iron calibration matrix: [[DIA_X, ODI_X, ODI_Y], [ODI_X, DIA_Y, ODI_Z], [ODI_Y, ODI_Z, DIA_Z]]
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("ODI", 25, Compass, _state._priv_instance[0].offdiagonals, 0),

#if COMPASS_MAX_INSTANCES > 1
Expand All @@ -427,6 +435,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @DisplayName: Compass2 soft-iron diagonal Z component
// @Description: DIA_Z in the compass2 soft-iron calibration matrix: [[DIA_X, ODI_X, ODI_Y], [ODI_X, DIA_Y, ODI_Z], [ODI_Y, ODI_Z, DIA_Z]]
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("DIA2", 26, Compass, _state._priv_instance[1].diagonals, 1.0),

// @Param: ODI2_X
Expand All @@ -445,6 +454,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @DisplayName: Compass2 soft-iron off-diagonal Z component
// @Description: ODI_Z in the compass2 soft-iron calibration matrix: [[DIA_X, ODI_X, ODI_Y], [ODI_X, DIA_Y, ODI_Z], [ODI_Y, ODI_Z, DIA_Z]]
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("ODI2", 27, Compass, _state._priv_instance[1].offdiagonals, 0),
#endif // COMPASS_MAX_INSTANCES

Expand All @@ -465,6 +475,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @DisplayName: Compass3 soft-iron diagonal Z component
// @Description: DIA_Z in the compass3 soft-iron calibration matrix: [[DIA_X, ODI_X, ODI_Y], [ODI_X, DIA_Y, ODI_Z], [ODI_Y, ODI_Z, DIA_Z]]
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("DIA3", 28, Compass, _state._priv_instance[2].diagonals, 1.0),

// @Param: ODI3_X
Expand All @@ -483,6 +494,7 @@ const AP_Param::GroupInfo Compass::var_info[] = {
// @DisplayName: Compass3 soft-iron off-diagonal Z component
// @Description: ODI_Z in the compass3 soft-iron calibration matrix: [[DIA_X, ODI_X, ODI_Y], [ODI_X, DIA_Y, ODI_Z], [ODI_Y, ODI_Z, DIA_Z]]
// @User: Advanced
// @Calibration: 1
AP_GROUPINFO("ODI3", 29, Compass, _state._priv_instance[2].offdiagonals, 0),
#endif // COMPASS_MAX_INSTANCES
#endif // AP_COMPASS_DIAGONALS_ENABLED
Expand Down

0 comments on commit 6a59d3a

Please sign in to comment.