From 6bd17c7ba4e36d53702de95c460e89f27c4e88e8 Mon Sep 17 00:00:00 2001 From: Andreas Bircher Date: Thu, 16 Jun 2016 13:39:55 +0200 Subject: [PATCH] adding user info --- src/drivers/camera_trigger/camera_trigger.cpp | 2 ++ src/drivers/camera_trigger/interfaces/src/pwm.cpp | 5 +++++ src/drivers/camera_trigger/interfaces/src/pwm.h | 2 ++ src/drivers/camera_trigger/interfaces/src/relay.cpp | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/src/drivers/camera_trigger/camera_trigger.cpp b/src/drivers/camera_trigger/camera_trigger.cpp index 1f17877144..5b1a739620 100644 --- a/src/drivers/camera_trigger/camera_trigger.cpp +++ b/src/drivers/camera_trigger/camera_trigger.cpp @@ -482,9 +482,11 @@ int camera_trigger_main(int argc, char *argv[]) if (argc >= 3) { if (!strcmp(argv[2], "--relay")) { camera_trigger::g_camera_trigger = new CameraTrigger(CAMERA_INTERFACE_MODE_RELAY); + warnx("started with camera interface mode : relay"); } else if (!strcmp(argv[2], "--pwm")) { camera_trigger::g_camera_trigger = new CameraTrigger(CAMERA_INTERFACE_MODE_PWM); + warnx("started with camera interface mode : pwm"); } else { usage(); diff --git a/src/drivers/camera_trigger/interfaces/src/pwm.cpp b/src/drivers/camera_trigger/interfaces/src/pwm.cpp index cd92402643..c42faf79da 100644 --- a/src/drivers/camera_trigger/interfaces/src/pwm.cpp +++ b/src/drivers/camera_trigger/interfaces/src/pwm.cpp @@ -117,3 +117,8 @@ int CameraInterfacePWM::powerOff() return 0; } + +void CameraInterfaceRelay::info() +{ + warnx("PWM - camera triggering, pins 1-3 : %d,%d,%d", _pins[0], _pins[1], _pins[2]); +} diff --git a/src/drivers/camera_trigger/interfaces/src/pwm.h b/src/drivers/camera_trigger/interfaces/src/pwm.h index 0c9d3850c2..43182e2a9f 100644 --- a/src/drivers/camera_trigger/interfaces/src/pwm.h +++ b/src/drivers/camera_trigger/interfaces/src/pwm.h @@ -36,6 +36,8 @@ public: int powerOn(); int powerOff(); + void info(); + int _pins[6]; private: void setup(); diff --git a/src/drivers/camera_trigger/interfaces/src/relay.cpp b/src/drivers/camera_trigger/interfaces/src/relay.cpp index a8efb6d813..0922777f64 100644 --- a/src/drivers/camera_trigger/interfaces/src/relay.cpp +++ b/src/drivers/camera_trigger/interfaces/src/relay.cpp @@ -72,6 +72,6 @@ void CameraInterfaceRelay::trigger(bool enable) void CameraInterfaceRelay::info() { - warnx("pins 1-3 : %d,%d,%d polarity : %s", _pins[0], _pins[1], _pins[2], + warnx("Relay - camera triggering, pins 1-3 : %d,%d,%d polarity : %s", _pins[0], _pins[1], _pins[2], _polarity ? "ACTIVE_HIGH" : "ACTIVE_LOW"); }