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

AP_Airspeed: enabled PX4 library for VR boards

Browse Source
This commit is contained in:
LukeMike 2014-12-30 22:11:27 +01:00 committed by Andrew Tridgell
parent 903f5d2211
commit 61f4239e47
2 changed files with 9 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
libraries/AP_Airspeed/AP_Airspeed.cpp
View File

@ -41,16 +41,6 @@ extern const AP_HAL::HAL& hal;
#include <systemlib/airspeed.h> #include <systemlib/airspeed.h>
#include <drivers/drv_airspeed.h> #include <drivers/drv_airspeed.h>
#include <uORB/topics/differential_pressure.h> #include <uORB/topics/differential_pressure.h>
#ifdef CONFIG_ARCH_BOARD_PX4FMU_V1
#define ARSPD_DEFAULT_PIN 11
#else
#define ARSPD_DEFAULT_PIN 15
#endif
#elif CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE
#define ARSPD_DEFAULT_PIN 16
#elif CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#define ARSPD_DEFAULT_PIN AP_AIRSPEED_I2C_PIN
#elif CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN
#if defined(CONFIG_ARCH_BOARD_VRBRAIN_V40) #if defined(CONFIG_ARCH_BOARD_VRBRAIN_V40)
#define ARSPD_DEFAULT_PIN 0 #define ARSPD_DEFAULT_PIN 0
#elif defined(CONFIG_ARCH_BOARD_VRBRAIN_V45) #elif defined(CONFIG_ARCH_BOARD_VRBRAIN_V45)
@ -67,7 +57,15 @@ extern const AP_HAL::HAL& hal;
#define ARSPD_DEFAULT_PIN 0 #define ARSPD_DEFAULT_PIN 0
#elif defined(CONFIG_ARCH_BOARD_VRHERO_V10) #elif defined(CONFIG_ARCH_BOARD_VRHERO_V10)
#define ARSPD_DEFAULT_PIN 0 #define ARSPD_DEFAULT_PIN 0
#elif defined(CONFIG_ARCH_BOARD_PX4FMU_V1)
#define ARSPD_DEFAULT_PIN 11
#else
#define ARSPD_DEFAULT_PIN 15
#endif #endif
#elif CONFIG_HAL_BOARD == HAL_BOARD_FLYMAPLE
#define ARSPD_DEFAULT_PIN 16
#elif CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#define ARSPD_DEFAULT_PIN AP_AIRSPEED_I2C_PIN
#elif CONFIG_HAL_BOARD == HAL_BOARD_LINUX #elif CONFIG_HAL_BOARD == HAL_BOARD_LINUX
#define ARSPD_DEFAULT_PIN AP_AIRSPEED_I2C_PIN #define ARSPD_DEFAULT_PIN AP_AIRSPEED_I2C_PIN
#else #else

2
libraries/AP_Airspeed/AP_Airspeed_PX4.cpp
View File

@ -20,7 +20,7 @@
#include <AP_HAL.h> #include <AP_HAL.h>
#if CONFIG_HAL_BOARD == HAL_BOARD_PX4 #if CONFIG_HAL_BOARD == HAL_BOARD_PX4 || CONFIG_HAL_BOARD == HAL_BOARD_VRBRAIN
#include <AP_Airspeed_PX4.h> #include <AP_Airspeed_PX4.h>
#include <drivers/drv_airspeed.h> #include <drivers/drv_airspeed.h>