mirror of https://github.com/ArduPilot/ardupilot
fixed two more CONFIG_HARDWARE #ifdef bugs
This commit is contained in:
parent
99395b919c
commit
4e4a4a685c
|
@ -161,7 +161,7 @@ static AP_Int8 *flight_modes = &g.flight_mode1;
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#if CONFIG_BARO == AP_BARO_BMP085
|
#if CONFIG_BARO == AP_BARO_BMP085
|
||||||
# if CONFIG_APM_HARDWARE == CONFIG_HARDWARE_APM2
|
# if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
|
||||||
AP_Baro_BMP085 barometer(true);
|
AP_Baro_BMP085 barometer(true);
|
||||||
# else
|
# else
|
||||||
AP_Baro_BMP085 barometer(false);
|
AP_Baro_BMP085 barometer(false);
|
||||||
|
|
|
@ -139,7 +139,7 @@ AP_Compass_HIL compass;
|
||||||
#else
|
#else
|
||||||
|
|
||||||
#if CONFIG_BARO == AP_BARO_BMP085
|
#if CONFIG_BARO == AP_BARO_BMP085
|
||||||
# if CONFIG_APM_HARDWARE == CONFIG_HARDWARE_APM2
|
# if CONFIG_APM_HARDWARE == APM_HARDWARE_APM2
|
||||||
static AP_Baro_BMP085 barometer(true);
|
static AP_Baro_BMP085 barometer(true);
|
||||||
# else
|
# else
|
||||||
static AP_Baro_BMP085 barometer(false);
|
static AP_Baro_BMP085 barometer(false);
|
||||||
|
|
Loading…
Reference in New Issue