From 2ec1e508d2ca82c54a1228f30fbbf78901d04f90 Mon Sep 17 00:00:00 2001
From: Kelly Steich <kelly.steich@wingtra.com>
Date: Fri, 10 Jun 2016 15:29:52 +0200
Subject: [PATCH] added setup method to constructor of camera interfaces

Conflicts:
	PX4/src/drivers/camera_trigger/interfaces/src/pwm.cpp
---
 .../camera_trigger/interfaces/src/camera_interface.h     | 9 ++++-----
 src/drivers/camera_trigger/interfaces/src/pwm.cpp        | 1 +
 src/drivers/camera_trigger/interfaces/src/pwm.h          | 3 +--
 src/drivers/camera_trigger/interfaces/src/relay.cpp      | 2 ++
 src/drivers/camera_trigger/interfaces/src/relay.h        | 5 +++--
 5 files changed, 11 insertions(+), 9 deletions(-)

diff --git a/src/drivers/camera_trigger/interfaces/src/camera_interface.h b/src/drivers/camera_trigger/interfaces/src/camera_interface.h
index 5554fc3d6c..e6b848884c 100644
--- a/src/drivers/camera_trigger/interfaces/src/camera_interface.h
+++ b/src/drivers/camera_trigger/interfaces/src/camera_interface.h
@@ -18,11 +18,6 @@ public:
 	 */
 	virtual ~CameraInterface();
 
-	/**
-	 * setup the interface
-	 */
-	virtual void setup() {};
-
 	/**
 	 * trigger the camera
 	 * @param trigger:
@@ -50,5 +45,9 @@ public:
 
 protected:
 
+	/**
+	 * setup the interface
+	 */
+	virtual void setup() {};
 
 };
diff --git a/src/drivers/camera_trigger/interfaces/src/pwm.cpp b/src/drivers/camera_trigger/interfaces/src/pwm.cpp
index c5df0e489e..4fcbcf8ac3 100644
--- a/src/drivers/camera_trigger/interfaces/src/pwm.cpp
+++ b/src/drivers/camera_trigger/interfaces/src/pwm.cpp
@@ -33,6 +33,7 @@ CameraInterfacePWM::CameraInterfacePWM():
 		pin_list /= 10;
 		i++;
 	}
+	setup();
 }
 
 CameraInterfacePWM::~CameraInterfacePWM()
diff --git a/src/drivers/camera_trigger/interfaces/src/pwm.h b/src/drivers/camera_trigger/interfaces/src/pwm.h
index 5dceba0a35..3eab5d8de2 100644
--- a/src/drivers/camera_trigger/interfaces/src/pwm.h
+++ b/src/drivers/camera_trigger/interfaces/src/pwm.h
@@ -31,8 +31,6 @@ public:
 	CameraInterfacePWM();
 	virtual ~CameraInterfacePWM();
 
-	void setup();
-
 	void trigger(bool enable);
 
 	int powerOn();
@@ -40,6 +38,7 @@ public:
 
 	int _pins[6];
 private:
+	void setup();
 
 	int _vehicle_status_sub;
 	struct vehicle_status_s _vehicle_status;
diff --git a/src/drivers/camera_trigger/interfaces/src/relay.cpp b/src/drivers/camera_trigger/interfaces/src/relay.cpp
index c07215bba5..a8efb6d813 100644
--- a/src/drivers/camera_trigger/interfaces/src/relay.cpp
+++ b/src/drivers/camera_trigger/interfaces/src/relay.cpp
@@ -34,6 +34,8 @@ CameraInterfaceRelay::CameraInterfaceRelay():
 		pin_list /= 10;
 		i++;
 	}
+
+	setup();
 }
 
 CameraInterfaceRelay::~CameraInterfaceRelay()
diff --git a/src/drivers/camera_trigger/interfaces/src/relay.h b/src/drivers/camera_trigger/interfaces/src/relay.h
index 371ae9511f..5a63251f48 100644
--- a/src/drivers/camera_trigger/interfaces/src/relay.h
+++ b/src/drivers/camera_trigger/interfaces/src/relay.h
@@ -19,8 +19,6 @@ public:
 	CameraInterfaceRelay();
 	virtual ~CameraInterfaceRelay();
 
-	void setup();
-
 	void trigger(bool enable);
 
 	void info();
@@ -29,6 +27,9 @@ public:
 	int _polarity;
 
 private:
+
+	void setup();
+
 	param_t _p_pin;
 	param_t _p_polarity;