From 2b838f57043725f33a38db886719f0ededbbae5b Mon Sep 17 00:00:00 2001
From: Mohammed Kabir <kabir@uasys.io>
Date: Mon, 3 Apr 2017 17:28:43 +0200
Subject: [PATCH] camera_trigger : rename relay to gpio

---
 src/drivers/camera_trigger/CMakeLists.txt       |  2 +-
 src/drivers/camera_trigger/camera_trigger.cpp   | 10 +++++-----
 .../interfaces/src/{relay.cpp => gpio.cpp}      | 17 +++++++++--------
 .../interfaces/src/{relay.h => gpio.h}          |  6 +++---
 4 files changed, 18 insertions(+), 17 deletions(-)
 rename src/drivers/camera_trigger/interfaces/src/{relay.cpp => gpio.cpp} (75%)
 rename src/drivers/camera_trigger/interfaces/src/{relay.h => gpio.h} (84%)

diff --git a/src/drivers/camera_trigger/CMakeLists.txt b/src/drivers/camera_trigger/CMakeLists.txt
index 6149223f82..47211aded7 100644
--- a/src/drivers/camera_trigger/CMakeLists.txt
+++ b/src/drivers/camera_trigger/CMakeLists.txt
@@ -39,7 +39,7 @@ px4_add_module(
 		camera_trigger.cpp
                 interfaces/src/camera_interface.cpp
                 interfaces/src/pwm.cpp
-                interfaces/src/relay.cpp
+                interfaces/src/gpio.cpp
 	DEPENDS
 		platforms__common
 	)
diff --git a/src/drivers/camera_trigger/camera_trigger.cpp b/src/drivers/camera_trigger/camera_trigger.cpp
index cd56c1930a..f3c60da611 100644
--- a/src/drivers/camera_trigger/camera_trigger.cpp
+++ b/src/drivers/camera_trigger/camera_trigger.cpp
@@ -67,7 +67,7 @@
 
 #include "interfaces/src/camera_interface.h"
 #include "interfaces/src/pwm.h"
-#include "interfaces/src/relay.h"
+#include "interfaces/src/gpio.h"
 
 #define TRIGGER_PIN_DEFAULT 1
 
@@ -75,7 +75,7 @@ extern "C" __EXPORT int camera_trigger_main(int argc, char *argv[]);
 
 typedef enum : int32_t {
 	CAMERA_INTERFACE_MODE_NONE = 0,
-	CAMERA_INTERFACE_MODE_RELAY,
+	CAMERA_INTERFACE_MODE_GPIO,
 	CAMERA_INTERFACE_MODE_SEAGULL_MAP2_PWM,
 	CAMERA_INTERFACE_MODE_MAVLINK
 } camera_interface_mode_t;
@@ -224,7 +224,7 @@ CameraTrigger::CameraTrigger() :
 	_vcommand_sub(-1),
 	_vlposition_sub(-1),
 	_trigger_pub(nullptr),
-	_camera_interface_mode(CAMERA_INTERFACE_MODE_RELAY),
+	_camera_interface_mode(CAMERA_INTERFACE_MODE_GPIO),
 	_camera_interface(nullptr)
 {
 	//Initiate Camera interface basedon camera_interface_mode
@@ -252,8 +252,8 @@ CameraTrigger::CameraTrigger() :
 	switch (_camera_interface_mode) {
 #ifdef __PX4_NUTTX
 
-	case CAMERA_INTERFACE_MODE_RELAY:
-		_camera_interface = new CameraInterfaceRelay();
+	case CAMERA_INTERFACE_MODE_GPIO:
+		_camera_interface = new CameraInterfaceGPIO();
 		break;
 
 	case CAMERA_INTERFACE_MODE_SEAGULL_MAP2_PWM:
diff --git a/src/drivers/camera_trigger/interfaces/src/relay.cpp b/src/drivers/camera_trigger/interfaces/src/gpio.cpp
similarity index 75%
rename from src/drivers/camera_trigger/interfaces/src/relay.cpp
rename to src/drivers/camera_trigger/interfaces/src/gpio.cpp
index 42352d99b1..b4d5bc7543 100644
--- a/src/drivers/camera_trigger/interfaces/src/relay.cpp
+++ b/src/drivers/camera_trigger/interfaces/src/gpio.cpp
@@ -1,9 +1,9 @@
 #ifdef __PX4_NUTTX
-#include "relay.h"
+#include "gpio.h"
 
-constexpr uint32_t CameraInterfaceRelay::_gpios[6];
+constexpr uint32_t CameraInterfaceGPIO::_gpios[6];
 
-CameraInterfaceRelay::CameraInterfaceRelay():
+CameraInterfaceGPIO::CameraInterfaceGPIO():
 	CameraInterface(),
 	_pins{},
 	_polarity(0)
@@ -39,11 +39,11 @@ CameraInterfaceRelay::CameraInterfaceRelay():
 	setup();
 }
 
-CameraInterfaceRelay::~CameraInterfaceRelay()
+CameraInterfaceGPIO::~CameraInterfaceGPIO()
 {
 }
 
-void CameraInterfaceRelay::setup()
+void CameraInterfaceGPIO::setup()
 {
 	for (unsigned i = 0; i < sizeof(_pins) / sizeof(_pins[0]); i++) {
 		px4_arch_configgpio(_gpios[_pins[i]]);
@@ -51,7 +51,7 @@ void CameraInterfaceRelay::setup()
 	}
 }
 
-void CameraInterfaceRelay::trigger(bool enable)
+void CameraInterfaceGPIO::trigger(bool enable)
 {
 	if (enable) {
 		for (unsigned i = 0; i < sizeof(_pins) / sizeof(_pins[0]); i++) {
@@ -71,9 +71,10 @@ void CameraInterfaceRelay::trigger(bool enable)
 	}
 }
 
-void CameraInterfaceRelay::info()
+void CameraInterfaceGPIO::info()
 {
-	warnx("Relay - camera triggering, pins 1-3 : %d,%d,%d polarity : %s", _pins[0], _pins[1], _pins[2],
+	warnx("GPIO trigger mode, AUX pin state 1-6 : [%d][%d][%d][%d][%d][%d], polarity : %s",
+	      _pins[0], _pins[1], _pins[2], _pins[3], _pins[4], _pins[5],
 	      _polarity ? "ACTIVE_HIGH" : "ACTIVE_LOW");
 }
 
diff --git a/src/drivers/camera_trigger/interfaces/src/relay.h b/src/drivers/camera_trigger/interfaces/src/gpio.h
similarity index 84%
rename from src/drivers/camera_trigger/interfaces/src/relay.h
rename to src/drivers/camera_trigger/interfaces/src/gpio.h
index ea65555f61..16691d35cf 100644
--- a/src/drivers/camera_trigger/interfaces/src/relay.h
+++ b/src/drivers/camera_trigger/interfaces/src/gpio.h
@@ -15,11 +15,11 @@
 #include "camera_interface.h"
 
 
-class CameraInterfaceRelay : public CameraInterface
+class CameraInterfaceGPIO : public CameraInterface
 {
 public:
-	CameraInterfaceRelay();
-	virtual ~CameraInterfaceRelay();
+	CameraInterfaceGPIO();
+	virtual ~CameraInterfaceGPIO();
 
 	void trigger(bool enable);