Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-01-03 14:38:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

ArduPlane: Rename APM_BMP085 classes to AP_Baro_BMP085 classes

Browse Source
This commit is contained in:
Pat Hickey 2011-11-26 21:51:47 -08:00 committed by Pat Hickey
parent fdffd69257
commit 04ea979331
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
ArduPlane/ArduPlane.pde
View File

@ -35,7 +35,7 @@ version 2.1 of the License, or (at your option) any later version.
#include <AP_ADC.h> // ArduPilot Mega Analog to Digital Converter Library #include <AP_ADC.h> // ArduPilot Mega Analog to Digital Converter Library
#include <AP_AnalogSource.h>// ArduPilot Mega polymorphic analog getter #include <AP_AnalogSource.h>// ArduPilot Mega polymorphic analog getter
#include <AP_PeriodicProcess.h> // ArduPilot Mega TimerProcess and TimerAperiodicProcess #include <AP_PeriodicProcess.h> // ArduPilot Mega TimerProcess and TimerAperiodicProcess
#include <APM_BMP085.h> // ArduPilot Mega BMP085 Library #include <AP_Baro.h> // ArduPilot barometer library
#include <AP_Compass.h> // ArduPilot Mega Magnetometer Library #include <AP_Compass.h> // ArduPilot Mega Magnetometer Library
#include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library #include <AP_Math.h> // ArduPilot Mega Vector/Matrix math Library
#include <AP_InertialSensor.h> // Inertial Sensor (uncalibated IMU) Library #include <AP_InertialSensor.h> // Inertial Sensor (uncalibated IMU) Library
@ -134,10 +134,10 @@ static AP_Int8 *flight_modes = &g.flight_mode1;
static AP_ADC_ADS7844 adc; static AP_ADC_ADS7844 adc;
#ifdef DESKTOP_BUILD #ifdef DESKTOP_BUILD
APM_BMP085_HIL_Class barometer; AP_Baro_BMP085_HIL barometer;
AP_Compass_HIL compass; AP_Compass_HIL compass;
#else #else
static APM_BMP085_Class barometer; static AP_Baro_BMP085 barometer;
static AP_Compass_HMC5843 compass(Parameters::k_param_compass); static AP_Compass_HMC5843 compass(Parameters::k_param_compass);
#endif #endif
@ -179,7 +179,7 @@ AP_TimerProcess timer_scheduler;
#elif HIL_MODE == HIL_MODE_SENSORS #elif HIL_MODE == HIL_MODE_SENSORS
// sensor emulators // sensor emulators
AP_ADC_HIL adc; AP_ADC_HIL adc;
APM_BMP085_HIL_Class barometer; AP_Baro_BMP085_HIL barometer;
AP_Compass_HIL compass; AP_Compass_HIL compass;
AP_GPS_HIL g_gps_driver(NULL); AP_GPS_HIL g_gps_driver(NULL);
AP_InertialSensor_Oilpan ins( &adc ); AP_InertialSensor_Oilpan ins( &adc );