Browse Source

Copter: move barometer_accumulate to sensors.cpp

non-functional change
mission-4.1.18
Randy Mackay 7 years ago
parent
commit
9a03ba1bfb
  1. 8
      ArduCopter/ArduCopter.cpp
  2. 2
      ArduCopter/Copter.h
  3. 6
      ArduCopter/sensors.cpp

8
ArduCopter/ArduCopter.cpp

@ -182,14 +182,6 @@ void Copter::setup()
fast_loopTimer = AP_HAL::micros(); fast_loopTimer = AP_HAL::micros();
} }
/*
try to accumulate a baro reading
*/
void Copter::barometer_accumulate(void)
{
barometer.accumulate();
}
void Copter::perf_update(void) void Copter::perf_update(void)
{ {
if (should_log(MASK_LOG_PM)) if (should_log(MASK_LOG_PM))

2
ArduCopter/Copter.h

@ -660,7 +660,6 @@ private:
void compass_accumulate(void); void compass_accumulate(void);
void compass_cal_update(void); void compass_cal_update(void);
void barometer_accumulate(void);
void perf_update(void); void perf_update(void);
void fast_loop(); void fast_loop();
void rc_loop(); void rc_loop();
@ -1052,6 +1051,7 @@ private:
void radio_passthrough_to_motors(); void radio_passthrough_to_motors();
void init_barometer(bool full_calibration); void init_barometer(bool full_calibration);
void read_barometer(void); void read_barometer(void);
void barometer_accumulate(void);
void init_rangefinder(void); void init_rangefinder(void);
void read_rangefinder(void); void read_rangefinder(void);
bool rangefinder_alt_ok(); bool rangefinder_alt_ok();

6
ArduCopter/sensors.cpp

@ -24,6 +24,12 @@ void Copter::read_barometer(void)
motors->set_air_density_ratio(barometer.get_air_density_ratio()); motors->set_air_density_ratio(barometer.get_air_density_ratio());
} }
// try to accumulate a baro reading
void Copter::barometer_accumulate(void)
{
barometer.accumulate();
}
void Copter::init_rangefinder(void) void Copter::init_rangefinder(void)
{ {
#if RANGEFINDER_ENABLED == ENABLED #if RANGEFINDER_ENABLED == ENABLED

Loading…
Cancel
Save