Browse Source

AP_HAL_Linux: BBBmini remove onboard OpticalFlow

master
mirkix 8 years ago committed by Lucas De Marchi
parent
commit
9e1345453f
  1. 3
      libraries/AP_HAL_Linux/Flow_PX4.cpp
  2. 3
      libraries/AP_HAL_Linux/HAL_Linux_Class.cpp
  3. 6
      libraries/AP_HAL_Linux/OpticalFlow_Onboard.cpp
  4. 3
      libraries/AP_HAL_Linux/VideoIn.cpp

3
libraries/AP_HAL_Linux/Flow_PX4.cpp

@ -38,8 +38,7 @@ @@ -38,8 +38,7 @@
****************************************************************************/
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP ||\
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE ||\
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE
#include "Flow_PX4.h"
#include <cmath>

3
libraries/AP_HAL_Linux/HAL_Linux_Class.cpp

@ -225,8 +225,7 @@ static Empty::RCOutput rcoutDriver; @@ -225,8 +225,7 @@ static Empty::RCOutput rcoutDriver;
static Scheduler schedulerInstance;
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP ||\
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE ||\
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE
static OpticalFlow_Onboard opticalFlow;
#else
static Empty::OpticalFlow opticalFlow;

6
libraries/AP_HAL_Linux/OpticalFlow_Onboard.cpp

@ -15,8 +15,7 @@ @@ -15,8 +15,7 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP ||\
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE ||\
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE
#include "OpticalFlow_Onboard.h"
#include <fcntl.h>
@ -93,8 +92,7 @@ void OpticalFlow_Onboard::init() @@ -93,8 +92,7 @@ void OpticalFlow_Onboard::init()
AP_HAL::panic("OpticalFlow_Onboard: couldn't set subdev fmt\n");
}
_format = V4L2_PIX_FMT_NV12;
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE ||\
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI
#elif CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE
std::vector<uint32_t> pixel_formats;
_videoin->get_pixel_formats(&pixel_formats);

3
libraries/AP_HAL_Linux/VideoIn.cpp

@ -19,8 +19,7 @@ @@ -19,8 +19,7 @@
#include <AP_HAL/AP_HAL.h>
#if CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BEBOP ||\
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE ||\
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_BBBMINI
CONFIG_HAL_BOARD_SUBTYPE == HAL_BOARD_SUBTYPE_LINUX_MINLURE
#include "VideoIn.h"
#include <errno.h>

Loading…
Cancel
Save