From b12b4e1222a040be56d7d7006be8ff9af1c13378 Mon Sep 17 00:00:00 2001
From: DanielePettenuzzo <daniele@px4.io>
Date: Tue, 29 Jan 2019 22:54:37 +0100
Subject: [PATCH] fixes after rebase
---
boards/px4/fmu-v3/default.cmake | 1 +
boards/px4/fmu-v5/default.cmake | 1 +
src/drivers/camera_capture/camera_capture.hpp | 3 ++-
src/drivers/px4fmu/fmu.cpp | 1 -
4 files changed, 4 insertions(+), 2 deletions(-)
diff --git a/boards/px4/fmu-v3/default.cmake b/boards/px4/fmu-v3/default.cmake
index 1ea994365e..3e6eec6e9e 100644
--- a/boards/px4/fmu-v3/default.cmake
+++ b/boards/px4/fmu-v3/default.cmake
@@ -23,6 +23,7 @@ px4_add_board(
barometer # all available barometer drivers
batt_smbus
camera_trigger
+ camera_capture
differential_pressure # all available differential pressure drivers
distance_sensor # all available distance sensor drivers
gps
diff --git a/boards/px4/fmu-v5/default.cmake b/boards/px4/fmu-v5/default.cmake
index 3ee2532daa..d5bd745405 100644
--- a/boards/px4/fmu-v5/default.cmake
+++ b/boards/px4/fmu-v5/default.cmake
@@ -21,6 +21,7 @@ px4_add_board(
barometer # all available barometer drivers
batt_smbus
camera_trigger
+ camera_capture
differential_pressure # all available differential pressure drivers
distance_sensor # all available distance sensor drivers
gps
diff --git a/src/drivers/camera_capture/camera_capture.hpp b/src/drivers/camera_capture/camera_capture.hpp
index 33ca05d6e2..a21fa1f14b 100644
--- a/src/drivers/camera_capture/camera_capture.hpp
+++ b/src/drivers/camera_capture/camera_capture.hpp
@@ -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:
diff --git a/src/drivers/px4fmu/fmu.cpp b/src/drivers/px4fmu/fmu.cpp
index 120ef57ad5..fd03765d00 100644
--- a/src/drivers/px4fmu/fmu.cpp
+++ b/src/drivers/px4fmu/fmu.cpp
@@ -2543,7 +2543,6 @@ PX4FMU::fmu_new_mode(PortMode new_mode)
case PORT_PWM4CAP2:
/* select 4-pin PWM mode 2 capture */
servo_mode = PX4FMU::MODE_4PWM2CAP;
- mode_with_input = true;
break;
# endif
--
GitLab