From f01b4836579500989b267284283aa7edb478ca3d Mon Sep 17 00:00:00 2001 From: Randy Mackay Date: Wed, 22 Nov 2017 17:13:05 +0900 Subject: [PATCH] Sub: move barometer_accumulate to sensors.cpp non-functional change --- ArduSub/ArduSub.cpp | 8 -------- ArduSub/Sub.h | 2 +- ArduSub/sensors.cpp | 6 ++++++ 3 files changed, 7 insertions(+), 9 deletions(-) diff --git a/ArduSub/ArduSub.cpp b/ArduSub/ArduSub.cpp index 9c0e71fb5a..b7135e85db 100644 --- a/ArduSub/ArduSub.cpp +++ b/ArduSub/ArduSub.cpp @@ -94,14 +94,6 @@ void Sub::setup() fast_loopTimer = AP_HAL::micros(); } -/* - try to accumulate a baro reading - */ -void Sub::barometer_accumulate(void) -{ - barometer.accumulate(); -} - void Sub::perf_update(void) { if (should_log(MASK_LOG_PM)) { diff --git a/ArduSub/Sub.h b/ArduSub/Sub.h index 4011ea9def..21ef14fa72 100644 --- a/ArduSub/Sub.h +++ b/ArduSub/Sub.h @@ -460,7 +460,6 @@ private: void compass_accumulate(void); void compass_cal_update(void); - void barometer_accumulate(void); void perf_update(void); void fast_loop(); void fifty_hz_loop(); @@ -642,6 +641,7 @@ private: void clear_input_hold(); void init_barometer(bool save); void read_barometer(void); + void barometer_accumulate(void); void init_rangefinder(void); void read_rangefinder(void); bool rangefinder_alt_ok(void); diff --git a/ArduSub/sensors.cpp b/ArduSub/sensors.cpp index eaf8e89d4c..6fdcf88f94 100644 --- a/ArduSub/sensors.cpp +++ b/ArduSub/sensors.cpp @@ -20,6 +20,12 @@ void Sub::read_barometer(void) } } +// try to accumulate a baro reading +void Sub::barometer_accumulate(void) +{ + barometer.accumulate(); +} + void Sub::init_rangefinder(void) { #if RANGEFINDER_ENABLED == ENABLED