Mirror/ardupilot
5
0
Fork 0
mirror of https://github.com/ArduPilot/ardupilot synced 2025-02-07 00:13:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

AP_Airspeed: remove checks for HAL_BOARD_APM2 and HAL_BOARD_APM1

Browse Source
This commit is contained in:
Lucas De Marchi 2015-11-03 11:46:29 -02:00 committed by Andrew Tridgell
parent 124937ab61
commit 221d822573
4 changed files with 1 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
libraries/AP_Airspeed/AP_Airspeed.cpp
View File

@ -26,12 +26,7 @@
extern const AP_HAL::HAL& hal; extern const AP_HAL::HAL& hal;
#if CONFIG_HAL_BOARD == HAL_BOARD_APM1 #if CONFIG_HAL_BOARD == HAL_BOARD_SITL
#include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h>
#define ARSPD_DEFAULT_PIN 64
#elif CONFIG_HAL_BOARD == HAL_BOARD_APM2
#define ARSPD_DEFAULT_PIN 0
#elif CONFIG_HAL_BOARD == HAL_BOARD_SITL
#define ARSPD_DEFAULT_PIN 1 #define ARSPD_DEFAULT_PIN 1
#elif CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN #elif CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN
#include <sys/stat.h> #include <sys/stat.h>

10
libraries/AP_Airspeed/AP_Airspeed_analog.cpp
View File

@ -30,18 +30,8 @@ extern const AP_HAL::HAL& hal;
// scaling for 3DR analog airspeed sensor // scaling for 3DR analog airspeed sensor
#define VOLTS_TO_PASCAL 819 #define VOLTS_TO_PASCAL 819
#if CONFIG_HAL_BOARD == HAL_BOARD_APM1
extern AP_ADC_ADS7844 apm1_adc;
#endif
bool AP_Airspeed_Analog::init() bool AP_Airspeed_Analog::init()
{ {
#if CONFIG_HAL_BOARD == HAL_BOARD_APM1
if (_pin == 64) {
_source = new AP_ADC_AnalogSource( &apm1_adc, 7, 1.0f);
return true;
}
#endif
_source = hal.analogin->channel(_pin); _source = hal.analogin->channel(_pin);
return true; return true;
} }

2
libraries/AP_Airspeed/Airspeed_Calibration.cpp
View File

@ -37,8 +37,6 @@ void Airspeed_Calibration::init(float initial_ratio)
/* /*
update the state of the airspeed calibration - needs to be called update the state of the airspeed calibration - needs to be called
once a second once a second
On an AVR2560 this costs 1.9 milliseconds per call
*/ */
float Airspeed_Calibration::update(float airspeed, const Vector3f &vg) float Airspeed_Calibration::update(float airspeed, const Vector3f &vg)
{ {

4
libraries/AP_Airspeed/examples/Airspeed/Airspeed.cpp
View File

@ -24,10 +24,6 @@
#include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h> #include <AP_ADC_AnalogSource/AP_ADC_AnalogSource.h>
#include <AP_Airspeed/AP_Airspeed.h> #include <AP_Airspeed/AP_Airspeed.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_APM1
AP_ADC_ADS7844 apm1_adc;
#endif
const AP_HAL::HAL& hal = AP_HAL::get_HAL(); const AP_HAL::HAL& hal = AP_HAL::get_HAL();
static AP_Vehicle::FixedWing aparm; static AP_Vehicle::FixedWing aparm;