[paparazzi-commits] [6206] small modules fixes

[Martin Mueller]

Revision: 6206
          http://svn.sv.gnu.org/viewvc/?view=rev&root=paparazzi&revision=6206
Author:   mmm
Date:     2010-10-22 23:20:13 +0000 (Fri, 22 Oct 2010)
Log Message:
-----------
small modules fixes

Modified Paths:
--------------
    paparazzi3/trunk/conf/airframes/mm/fixed-wing/funjetmm.xml
    paparazzi3/trunk/conf/airframes/osam_xsens_twog.xml
    paparazzi3/trunk/conf/modules/alt_srf08.xml
    paparazzi3/trunk/conf/modules/baro_MS5534A.xml
    paparazzi3/trunk/conf/modules/mag_micromag_fw.xml
    paparazzi3/trunk/sw/airborne/modules/meteo/micromag_fw.c

Modified: paparazzi3/trunk/conf/airframes/mm/fixed-wing/funjetmm.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/mm/fixed-wing/funjetmm.xml  2010-10-22 
22:49:46 UTC (rev 6205)
+++ paparazzi3/trunk/conf/airframes/mm/fixed-wing/funjetmm.xml  2010-10-22 
23:20:13 UTC (rev 6206)
@@ -16,6 +16,7 @@
       <define name="ALT_KALMAN"/>
       <define name="WIND_INFO"/>
       <define name="WIND_INFO_RET"/>
+      <define name="USE_I2C0"/>
     </target>
 
     <target name="ap"                  board="tiny_2.11">
@@ -24,19 +25,19 @@
       <define name="ALT_KALMAN"/>
       <define name="WIND_INFO"/>
       <define name="WIND_INFO_RET"/>
+      <define name="USE_I2C0"/>
       <define name="SPI_MASTER"/>
       <define name="USE_MICROMAG_FW"/>
       <define name="MICROMAG_DRDY_VIC_SLOT" value="12"/>
       <define name="SSP_VIC_SLOT" value="11"/>
     </target>
 
+    <!-- RC -->
     <subsystem name="radio_control"    type="ppm"/>
-
     <!-- Communication -->
     <subsystem name="telemetry"        type="xbee_api">
       <param name="MODEM_BAUD"         value="B57600"/>
     </subsystem>
-
     <!-- Actuators are automatically chosen according to board-->
     <subsystem name="control"/>
     <!-- Sensors -->
@@ -44,7 +45,9 @@
     <subsystem name="gps"              type="ublox_lea5h">
       <param name="GPS_BAUD"           value="B38400"/>
     </subsystem>
+    <!-- Nav -->
     <subsystem name="navigation"/>
+    <!-- Interfaces -->
     <subsystem name="i2c"/>
     <subsystem name="spi"/>
   </firmware>
@@ -56,14 +59,12 @@
     <target name="setup_actuators"     board="tiny_2.11"/>
   </firmware>
 
-
   <!-- modules -->
   <modules>
+    <load name="alt_srf08.xml"/>
     <load name="mag_micromag_fw.xml"/>
-    <!--load name="alt_srf08.xml"/>
-    <load name="baro_MS5534A.xml"/>
     <load name="baro_bmp.xml"/>
-    <load name="baro_scp_i2c.xml"/>
+    <load name="baro_scp.xml"/>
     <load name="light_temt.xml"/>
     <load name="humid_hih.xml"/>
     <load name="temp_tmp102.xml"/>
@@ -71,6 +72,8 @@
     <load name="ir_mlx.xml"/>
     <load name="humid_dpicco.xml"/>
     <load name="humid_sht.xml"/>
+    <load name="baro_MS5534A.xml"/>
+    <!--load name="adc_generic.xml"/>
     <load name="baro_scp_i2c.xml"/-->
   </modules>
 

Modified: paparazzi3/trunk/conf/airframes/osam_xsens_twog.xml
===================================================================
--- paparazzi3/trunk/conf/airframes/osam_xsens_twog.xml 2010-10-22 22:49:46 UTC 
(rev 6205)
+++ paparazzi3/trunk/conf/airframes/osam_xsens_twog.xml 2010-10-22 23:20:13 UTC 
(rev 6206)
@@ -206,24 +206,4 @@
     <define name="DEFAULT_PITCH" value="0.5" unit="rad"/>
   </section>
  
- <!--<section name="SIMU">
-    <define name="YAW_RESPONSE_FACTOR" value="0.5"/>
- </section>
--->
- <!--makefile>
-
-# Maxstream
-ap.CFLAGS += -DDOWNLINK -DUSE_UART1 -DDOWNLINK_TRANSPORT=PprzTransport 
-DDOWNLINK_FBW_DEVICE=Uart1 -DDOWNLINK_AP_DEVICE=Uart1 -DPPRZ_UART=Uart1 
-DDATALINK=PPRZ -DUART1_BAUD=B38400
-ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c pprz_transport.c
-
-# Commented out the following two lines for adding stuffs about communication 
with Gumstix+MNAV Haiyang 20080507
-#ap.CFLAGS += -DGPS -DGPS_LED=2 -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 
-DUART1_BAUD=B38400
-#ap.srcs += gps_ubx.c gps.c latlong.c
-
-#ap.CFLAGS += -DINFRARED -DIMUIR 20080821
-ap.CFLAGS += -DINFRARED 
-ap.srcs += infrared.c estimator.c
-
-
-  </makefile-->
 </airframe>

Modified: paparazzi3/trunk/conf/modules/alt_srf08.xml
===================================================================
--- paparazzi3/trunk/conf/modules/alt_srf08.xml 2010-10-22 22:49:46 UTC (rev 
6205)
+++ paparazzi3/trunk/conf/modules/alt_srf08.xml 2010-10-22 23:20:13 UTC (rev 
6206)
@@ -9,7 +9,7 @@
   <!-- 65ms since initiate_ranging() (the spec ask for 65ms), 
        delay="4", 60Hz, 4x 16.7ms = 66.7ms -->
   <periodic fun="srf08_receive()" freq="1" delay="4"/>
-  <event fun="srf08_event"/>
+  <event fun="srf08_event()"/>
   <makefile>
     <file name="alt_srf08.c"/>
     <flag name="TELEMETER"/>

Modified: paparazzi3/trunk/conf/modules/baro_MS5534A.xml
===================================================================
--- paparazzi3/trunk/conf/modules/baro_MS5534A.xml      2010-10-22 22:49:46 UTC 
(rev 6205)
+++ paparazzi3/trunk/conf/modules/baro_MS5534A.xml      2010-10-22 23:20:13 UTC 
(rev 6206)
@@ -7,7 +7,7 @@
   <init fun="baro_MS5534A_init()"/>
   <periodic fun="baro_MS5534A_send()" freq="20"/>
   <event fun="baro_MS5534A_event()"/>
-  <makefile>
+  <makefile target="ap">
     <file name="baro_MS5534A.c"/>
     <flag name="USE_BARO_MS5534A"/>
     <flag name="USE_SPI_SLAVE0"/>

Modified: paparazzi3/trunk/conf/modules/mag_micromag_fw.xml
===================================================================
--- paparazzi3/trunk/conf/modules/mag_micromag_fw.xml   2010-10-22 22:49:46 UTC 
(rev 6205)
+++ paparazzi3/trunk/conf/modules/mag_micromag_fw.xml   2010-10-22 23:20:13 UTC 
(rev 6206)
@@ -8,7 +8,7 @@
   <init fun="micromag_init()"/>
   <periodic fun="micromag_periodic()" freq="60"/>
   <event fun="micromag_event()"/>
-  <makefile>
+  <makefile target="ap">
     <file_hw name="micromag_fw_hw.c"/>
     <file name="micromag_fw.c"/>
   </makefile>

Modified: paparazzi3/trunk/sw/airborne/modules/meteo/micromag_fw.c
===================================================================
--- paparazzi3/trunk/sw/airborne/modules/meteo/micromag_fw.c    2010-10-22 
22:49:46 UTC (rev 6205)
+++ paparazzi3/trunk/sw/airborne/modules/meteo/micromag_fw.c    2010-10-22 
23:20:13 UTC (rev 6206)
@@ -65,7 +65,7 @@
     MmReadRes();
   }
   else if (micromag_status ==  MM_DATA_AVAILABLE) {
-    micromag_status == MM_IDLE;
+    micromag_status = MM_IDLE;
   }
 }