From 22969c5e17df3cb9ec65c3966b3a1e8f3b544fbb Mon Sep 17 00:00:00 2001
From: Alessio Morale <alessiomorale@gmail.com>
Date: Thu, 18 Aug 2016 12:10:14 +0200
Subject: [PATCH] LP-385 - Implement camera trigger output handling

---
 flight/modules/Actuator/actuator.c           | 3 +++
 shared/uavobjectdefinition/cameradesired.xml | 1 +
 shared/uavobjectdefinition/hwsettings.xml    | 2 +-
 shared/uavobjectdefinition/mixersettings.xml | 1 +
 4 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/flight/modules/Actuator/actuator.c b/flight/modules/Actuator/actuator.c
index a2a66838f..c716bf5c2 100644
--- a/flight/modules/Actuator/actuator.c
+++ b/flight/modules/Actuator/actuator.c
@@ -471,6 +471,9 @@ static void actuatorTask(__attribute__((unused)) void *parameters)
                         case MIXERSETTINGS_MIXER1TYPE_CAMERAYAW:
                             status[ct] = cameraDesired.Yaw;
                             break;
+                        case MIXERSETTINGS_MIXER1TYPE_CAMERATRIGGER:
+                            status[ct] = cameraDesired.Trigger;
+                            break;
                         default:
                             break;
                         }
diff --git a/shared/uavobjectdefinition/cameradesired.xml b/shared/uavobjectdefinition/cameradesired.xml
index fe98c940d..41510047b 100644
--- a/shared/uavobjectdefinition/cameradesired.xml
+++ b/shared/uavobjectdefinition/cameradesired.xml
@@ -4,6 +4,7 @@
         <field name="RollOrServo1" units="" type="float" elements="1"/>
         <field name="PitchOrServo2" units="" type="float" elements="1"/>
         <field name="Yaw" units="" type="float" elements="1"/>
+        <field name="Trigger" units="" type="float" elements="1"/>
         <access gcs="readwrite" flight="readwrite"/>
         <telemetrygcs acked="false" updatemode="manual" period="0"/>
         <telemetryflight acked="false" updatemode="periodic" period="1000"/>
diff --git a/shared/uavobjectdefinition/hwsettings.xml b/shared/uavobjectdefinition/hwsettings.xml
index bbbbd5200..5d139d8b7 100644
--- a/shared/uavobjectdefinition/hwsettings.xml
+++ b/shared/uavobjectdefinition/hwsettings.xml
@@ -30,7 +30,7 @@
 		<field name="USB_HIDPort" units="function" type="enum" elements="1" options="USBTelemetry,RCTransmitter,Disabled" defaultvalue="USBTelemetry"/>
 		<field name="USB_VCPPort" units="function" type="enum" elements="1" options="USBTelemetry,ComBridge,DebugConsole,Disabled" defaultvalue="Disabled"/>
 
-		<field name="OptionalModules" units="" type="enum" elementnames="CameraStab,GPS,Fault,Altitude,Airspeed,TxPID,Battery,Overo,MagBaro,OsdHk,AutoTune" options="Disabled,Enabled" defaultvalue="Disabled"/>
+		<field name="OptionalModules" units="" type="enum" elementnames="CameraStab,CameraControl,GPS,Fault,Altitude,Airspeed,TxPID,Battery,Overo,MagBaro,OsdHk,AutoTune" options="Disabled,Enabled" defaultvalue="Disabled"/>
 		<field name="ADCRouting" units="" type="enum" elementnames="adc0,adc1,adc2,adc3,adc4,adc5,adc6,adc7" options="Disabled,BatteryVoltage,BatteryCurrent,AnalogAirspeed,Generic" defaultvalue="Disabled"/>
 		<field name="DSMxBind" units=""  type="uint8"  elements="1" defaultvalue="0"/>
 		<field name="WS2811LED_Out" units="" type="enum" elements="1" options="ServoOut1,ServoOut2,ServoOut3,ServoOut4,ServoOut5,ServoOut6,FlexiIOPin3,FlexiIOPin4,Disabled" defaultvalue="Disabled"
diff --git a/shared/uavobjectdefinition/mixersettings.xml b/shared/uavobjectdefinition/mixersettings.xml
index b9349b03a..d6160758d 100644
--- a/shared/uavobjectdefinition/mixersettings.xml
+++ b/shared/uavobjectdefinition/mixersettings.xml
@@ -32,6 +32,7 @@
 			<option>CameraRollOrServo1</option>
 			<option>CameraPitchOrServo2</option>
 			<option>CameraYaw</option>
+			<option>CameraTrigger</option>
 			<option>Accessory0</option>
 			<option>Accessory1</option>
 			<option>Accessory2</option>