fixes after rebase

This commit is contained in:
DanielePettenuzzo
2019-02-10 18:07:44 -05:00
committed by Daniel Agar
parent 15abb159a8
commit b12b4e1222
4 changed files with 4 additions and 2 deletions
@@ -55,7 +55,6 @@
#include <px4_workqueue.h>
#include <drivers/drv_hrt.h>
#include <drivers/drv_gpio.h>
#include <drivers/drv_pwm_output.h>
#include <drivers/drv_input_capture.h>
#include <drivers/device/ringbuffer.h>
@@ -65,6 +64,8 @@
#include <uORB/topics/vehicle_command.h>
#include <uORB/topics/vehicle_command_ack.h>
#define PX4FMU_DEVICE_PATH "/dev/px4fmu"
class CameraCapture
{
public: