Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-05-28 09:58:23 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

Merge branch 'cam' into dev

Browse Source 
resolved conflicts:
	conf/messages.xml
	sw/airborne/modules/digital_cam/dc.c
This commit is contained in:
Felix Ruess
2011-06-18 14:37:45 +02:00
parent 539a5bdacf 1e759c7f90
commit d0cc41cc8e
13 changed files with 926 additions and 183 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/modules/digital_cam.xml
+6 -7
View File
@@ -1,8 +1,8 @@
<!DOCTYPE module SYSTEM "./module.dtd">
<!--
<!--
// Use (parts of) the following section in airframe file to change
// Use (parts of) the following section in airframe file to change
<section name="DIGITAL_CAMERA" prefix="DC_">
@@ -13,9 +13,9 @@
<configure name="AUTOSHOOT_METER_GRID" value="50" unit="meter"/>
</section>
# ap.CFLAGS += -DGPS_TRIGGERED_FUNCTION="dc_shoot_on_gps"
# ap.CFLAGS += -DDC_GPS_TRIGGER_START=1
# ap.CFLAGS += -DDC_GPS_TRIGGER_STOP=3
# ap.CFLAGS += -DGPS_TRIGGERED_FUNCTION="dc_shoot_on_gps"
# ap.CFLAGS += -DDC_GPS_TRIGGER_START=1
# ap.CFLAGS += -DDC_GPS_TRIGGER_STOP=3
-->
@@ -33,10 +33,9 @@
<define name="DIGITAL_CAM" />
<file name="led_cam_ctrl.c"/>
<file name="dc.c"/>
<define name="SENSOR_SYNC_SEND" value="1" />
<define name="SENSOR_SYNC_SEND" value="1" />
</makefile>
</module>