[conf] vivify fix digital_cam_uart missing settings

This commit is contained in:
dewagter
2014-12-22 20:07:13 +01:00
parent 6fb99284d7
commit ce7fd2e86a
4 changed files with 26 additions and 6 deletions
@@ -18,7 +18,7 @@
telemetry="telemetry/default_fixedwing_imu_9k6.xml"
flight_plan="flight_plans/OpenUAS/openuas_obc2014_kingaroy.xml"
settings="settings/control/ctl_energy.xml [settings/estimation/ins_neutrals.xml] settings/estimation/ac_char.xml settings/fixedwing_basic.xml"
settings_modules="modules/air_data.xml modules/gps_ubx_ucenter.xml modules/airspeed_adc.xml modules/tune_airspeed.xml modules/photogrammetry_calculator.xml modules/nav_survey_poly_osam.xml modules/nav_smooth.xml"
settings_modules="modules/air_data.xml modules/gps_ubx_ucenter.xml modules/airspeed_adc.xml modules/tune_airspeed.xml modules/photogrammetry_calculator.xml modules/digital_cam_uart.xml modules/nav_survey_poly_osam.xml modules/nav_smooth.xml"
gui_color="#fffffac7c07a"
/>
</conf>
@@ -225,10 +225,10 @@
<!-- <load name="nav_catapult.xml"/> -->
<!-- <load name="geo_mag.xml"/> --> <!-- simplify the setup of magneto in various part of the world TODO needs fixing now aircarft in flight (strange)rule-->
<!-- CDW: load name="TICKET.xml">
<load name="digital_cam_uart.xml">
<define name="DC_AUTOSHOOT_QUARTERSEC_PERIOD" value="22" unit="quarter_second"/>
<configure name="CAMERA_PORT" value="UART5"/>
</load -->
</load>
<load name="baro_sim.xml"/>
<!-- Navigation modules-->
@@ -244,7 +244,7 @@
<define name="CLIMB_TIME" value="3" unit="s"/>
</load>
<!-- needed to be able to survey an aerea -->
<!-- needed to be able to survey an area -->
<load name="nav_survey_polygon.xml"/>
<load name="nav_survey_poly_osam.xml"/>
+20 -2
View File
@@ -10,13 +10,31 @@
</doc>
<settings>
<dl_settings name="control">
<dl_settings name="dc">
<dl_setting max="255" min="0" step="1" module="digital_cam/dc" var="0" handler="send_command" shortname="Shutter">
<strip_button name="Photo" icon="digital-camera.png" value="32" group="maindc"/>
</dl_setting>
<dl_setting max="3" min="0" step="1" var="dc_autoshoot" values="STOP|PERIODIC|DISTANCE|EXT_TRIG">
<strip_button name="Start Autoshoot" icon="on.png" value="1" group="dcauto"/>
<strip_button name="Stop Autoshoot" icon="off.png" value="0" group="dcauto"/>
</dl_setting>
<dl_setting max="255" min="1" step="1" var="dc_autoshoot_quartersec_period" shortname="Periodic" param="DC_AUTOSHOOT_QUARTERSEC_PERIOD" unit="quarter-sec"/>
<dl_setting max="255" min="0" step="1" var="dc_distance_interval" shortname="dist" param="DC_AUTOSHOOT_DISTANCE_INTERVAL" unit="meter"/>
<dl_setting max="250" min="0" step="5" module="digital_cam/dc" var="dc_survey_interval" handler="Survey" shortname="Survey-Interval"/>
<dl_setting max="90" min="5" step="5" module="digital_cam/dc" var="dc_circle_interval" handler="Circle" shortname="Circle-Interval"/>
<dl_setting max="1" min="0" step="1" var="dc_cam_tracing" shortname="Cam-Tracing"/>
</dl_settings>
<dl_settings name="tb">
<dl_setting max="2" min="0" step="1" var="ticket_thumbnails" shortname="thumbs">
<dl_setting max="2" min="0" step="1" var="digital_cam_uart_thumbnails" shortname="thumbs">
<strip_button name="DL Thumbs High" icon="on.png" value="2" group="ticket"/>
<strip_button name="DL Thumbs Low" icon="on.png" value="1" group="ticket"/>
<strip_button name="DL Thumbs STOP" icon="off.png" value="0" group="ticket"/>
</dl_setting>
<dl_setting max="2" min="0" step="1" var="ticket_status" shortname="status" />
<dl_setting max="2" min="0" step="1" var="digital_cam_uart_status" shortname="status" />
</dl_settings>
</dl_settings>
</settings>
@@ -4,6 +4,7 @@
<process name="Ap">
<mode name="default">
<message name="AIRSPEED" period="1.4"/>
<message name="AMSL" period="1.4"/>
<message name="ALIVE" period="5"/>
<message name="GPS" period="0.5"/>
<message name="NAVIGATION" period="1."/>
@@ -30,6 +31,7 @@
<message name="IMU_MAG" period="1.9"/>
<message name="COMMANDS" period="5"/>
<message name="FBW_STATUS" period="2"/>
<message name="PAYLOAD" period=".2"/>
</mode>
<mode name="minimal">
<message name="ALIVE" period="5"/>