rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-01-30 15:52:12 +01:00
Code Issues Releases Activity

LP-385 - Implement camera trigger output handling

Browse Source
This commit is contained in:
Alessio Morale 2016-08-18 12:10:14 +02:00
parent 19fa385f28
commit 22969c5e17
4 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flight/modules/Actuator/actuator.c
View File

@ -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;
}

1
shared/uavobjectdefinition/cameradesired.xml
View File

@ -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"/>

2
shared/uavobjectdefinition/hwsettings.xml
View File

@ -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"

1
shared/uavobjectdefinition/mixersettings.xml
View File

@ -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>