Skip to content

Commit 26917e5

Browse files
superfluous mechanism removed.
Keeping it silently for offline analysis some day.
1 parent 65551c3 commit 26917e5

File tree

3 files changed

+11
-0
lines changed

3 files changed

+11
-0
lines changed

NAV_Algorithms/AHRS.cpp

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -115,8 +115,10 @@ void AHRS_type::feed_magnetic_induction_observer(const float3vector &mag_sensor)
115115
else
116116
mag_calibration_data_collector_left_turn[i].add_value ( MAG_SCALE * expected_body_induction[i], MAG_SCALE * mag_sensor[i]);
117117

118+
#if USE_EARTH_INDUCTION_DATA_COLLECTOR
118119
// measurement of earth induction to find the local earth field parameters
119120
earth_induction_data_collector.feed( induction_nav_frame, turning_right);
121+
#endif
120122
}
121123

122124
AHRS_type::AHRS_type (float sampling_time)
@@ -139,7 +141,9 @@ AHRS_type::AHRS_type (float sampling_time)
139141
turn_rate_averager( ANGLE_F_BY_FS),
140142
G_load_averager( G_LOAD_F_BY_FS),
141143
compass_calibration(),
144+
#if USE_EARTH_INDUCTION_DATA_COLLECTOR
142145
earth_induction_data_collector( MAG_SCALE),
146+
#endif
143147
antenna_DOWN_correction( configuration( ANT_SLAVE_DOWN) / configuration( ANT_BASELENGTH)),
144148
antenna_RIGHT_correction( configuration( ANT_SLAVE_RIGHT) / configuration( ANT_BASELENGTH)),
145149
heading_difference_AHRS_DGNSS(0.0f),
@@ -424,6 +428,8 @@ void AHRS_type::handle_magnetic_calibration ( char type)
424428

425429
float3vector new_induction_estimate;
426430

431+
#if USE_EARTH_INDUCTION_DATA_COLLECTOR
432+
427433
if (earth_induction_data_collector.data_valid ())
428434
{
429435
new_induction_estimate = earth_induction_data_collector.get_estimated_induction();
@@ -439,6 +445,7 @@ void AHRS_type::handle_magnetic_calibration ( char type)
439445
}
440446
earth_induction_data_collector.reset ();
441447
}
448+
#endif
442449

443450
if( calibration_changed)
444451
{

NAV_Algorithms/AHRS.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -229,7 +229,9 @@ class AHRS_type
229229
linear_least_square_fit<int64_t, float> mag_calibration_data_collector_right_turn[3];
230230
linear_least_square_fit<int64_t, float> mag_calibration_data_collector_left_turn[3];
231231
compass_calibration_t <int64_t, float> compass_calibration;
232+
#if USE_EARTH_INDUCTION_DATA_COLLECTOR
232233
induction_observer_t <int64_t> earth_induction_data_collector;
234+
#endif
233235
float antenna_DOWN_correction; //!< slave antenna lower / DGNSS base length
234236
float antenna_RIGHT_correction; //!< slave antenna more right / DGNSS base length
235237
float heading_difference_AHRS_DGNSS;

NAV_Algorithms/NAV_tuning_parameters.h

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,8 @@
2525
#ifndef NAV_ALGORITHMS_NAV_TUNING_PARAMETERS_H_
2626
#define NAV_ALGORITHMS_NAV_TUNING_PARAMETERS_H_
2727

28+
#define USE_EARTH_INDUCTION_DATA_COLLECTOR 0
29+
2830
#define MINIMUM_MAG_CALIBRATION_SAMPLES 6000
2931
#define MAG_OFFSET_CHANGE_LIMIT 0.01f
3032
#define MAG_SCALE_CHANGE_LIMIT 0.01f

0 commit comments

Comments
 (0)