[paparazzi-commits] [6198] Digital Cam Module

[Christophe De Wagter]

Revision: 6198
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6198
Author:   dewagter
Date:     2010-10-21 20:21:37 +0000 (Thu, 21 Oct 2010)
Log Message:
-----------
Digital Cam Module

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/TUDelft/holiday50.xml
    paparazzi3/trunk/conf/settings/dc.xml
    paparazzi3/trunk/sw/airborne/modules/digital_cam/dc.c
    paparazzi3/trunk/sw/airborne/modules/digital_cam/dc.h

Modified: paparazzi3/trunk/conf/airframes/TUDelft/holiday50.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/TUDelft/holiday50.xml       2010-10-21 
19:14:39 UTC (rev 6197)
+++ paparazzi3/trunk/conf/airframes/TUDelft/holiday50.xml       2010-10-21 
20:21:37 UTC (rev 6198)
@@ -3,7 +3,7 @@
 <airframe name="Holiday 50 Delft Tiny 1.1">
 
   <modules>
-    <load name="opticflow.xml"/>
+    <load name="./TUDelft/opticflow.xml"/>
   </modules>
 
 <!-- commands section -->

Modified: paparazzi3/trunk/conf/settings/dc.xml
===================================================================
--- paparazzi3/trunk/conf/settings/dc.xml       2010-10-21 19:14:39 UTC (rev 
6197)
+++ paparazzi3/trunk/conf/settings/dc.xml       2010-10-21 20:21:37 UTC (rev 
6198)
@@ -3,16 +3,16 @@
 <settings>
   <dl_settings>
     <dl_settings NAME="DC">
-      <dl_setting MAX="1" MIN="1" STEP="1" VAR="dc_timer" module="dc" 
handler="Shutter" shortname="Shutter">
+      <dl_setting MAX="1" MIN="1" STEP="1" VAR="dc_timer" 
module="digital_cam/dc" handler="Shutter" shortname="Shutter">
        <strip_button name="Photo" icon="digital-camera.png" value="1"/>
       </dl_setting>
-      <dl_setting MAX="1" MIN="1" STEP="1" VAR="dc_timer" module="dc" 
handler="Zoom" shortname="Zoom">
+      <dl_setting MAX="1" MIN="1" STEP="1" VAR="dc_timer" handler="Zoom" 
shortname="Zoom">
        <strip_button name="Zoom" icon="zoom.png" value="1"/>
       </dl_setting>
-      <dl_setting MAX="60" MIN="0" STEP="1" VAR="dc_periodic_shutter" 
module="dc" handler="Periodic" shortname="Periodic"/>
+      <dl_setting MAX="60" MIN="0" STEP="1" VAR="dc_periodic_shutter" 
handler="Periodic" shortname="Periodic"/>
       <dl_setting MAX="5" MIN="0" STEP="1" VAR="dc_utm_threshold" 
shortname="UTM%"/>
 
-      <dl_setting MAX="1" MIN="0" STEP="1" VAR="dc_shoot" module="dc">
+      <dl_setting MAX="1" MIN="0" STEP="1" VAR="dc_shoot" >
        <strip_button name="Start Autoshoot" icon="on.png" value="1"/>
        <strip_button name="Stop Autoshoot" icon="off.png" value="0"/>
       </dl_setting>

Modified: paparazzi3/trunk/sw/airborne/modules/digital_cam/dc.c
===================================================================
--- paparazzi3/trunk/sw/airborne/modules/digital_cam/dc.c       2010-10-21 
19:14:39 UTC (rev 6197)
+++ paparazzi3/trunk/sw/airborne/modules/digital_cam/dc.c       2010-10-21 
20:21:37 UTC (rev 6198)
@@ -17,7 +17,7 @@
 #include "downlink.h"
 
 
-static void dc_send_shot_position(void)
+void dc_send_shot_position(void)
 {
       int16_t phi = DegOfRad(estimator_phi*10.0f);
       int16_t theta = DegOfRad(estimator_theta*10.0f);

Modified: paparazzi3/trunk/sw/airborne/modules/digital_cam/dc.h
===================================================================
--- paparazzi3/trunk/sw/airborne/modules/digital_cam/dc.h       2010-10-21 
19:14:39 UTC (rev 6197)
+++ paparazzi3/trunk/sw/airborne/modules/digital_cam/dc.h       2010-10-21 
20:21:37 UTC (rev 6198)
@@ -109,7 +109,7 @@
 #define DC_GPS_TRIGGER_STOP 3
 #endif
 
-static void dc_send_shot_position(void);
+void dc_send_shot_position(void);
 
 static inline void dc_shoot_on_gps( void ) {
   static uint8_t gps_msg_counter = 0;