aepko/Ardupilot2
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Copter: re-order init_sonar

Browse Source 
No functional change.
This commit is contained in:
Randy Mackay 2014-10-31 20:40:24 +09:00
parent 8a61f5acd2
commit 5104d5f0fe
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
ArduCopter/sensors.pde
View File

@ -1,12 +1,5 @@
// -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*- // -*- tab-width: 4; Mode: C++; c-basic-offset: 4; indent-tabs-mode: nil -*-
#if CONFIG_SONAR == ENABLED
static void init_sonar(void)
{
sonar.init();
}
#endif
static void init_barometer(bool full_calibration) static void init_barometer(bool full_calibration)
{ {
gcs_send_text_P(SEVERITY_LOW, PSTR("Calibrating barometer")); gcs_send_text_P(SEVERITY_LOW, PSTR("Calibrating barometer"));
@ -41,6 +34,13 @@ static void read_barometer(void)
} }
} }
#if CONFIG_SONAR == ENABLED
static void init_sonar(void)
{
sonar.init();
}
#endif
// return sonar altitude in centimeters // return sonar altitude in centimeters
static int16_t read_sonar(void) static int16_t read_sonar(void)
{ {
@ -77,6 +77,7 @@ static int16_t read_sonar(void)
#endif #endif
} }
// initialise compass
static void init_compass() static void init_compass()
{ {
if (!compass.init() || !compass.read()) { if (!compass.init() || !compass.read()) {
@ -88,6 +89,7 @@ static void init_compass()
ahrs.set_compass(&compass); ahrs.set_compass(&compass);
} }
// initialise optical flow sensor
static void init_optflow() static void init_optflow()
{ {
#if OPTFLOW == ENABLED #if OPTFLOW == ENABLED