Merge remote-tracking branch 'paparazzi/master' into umarim

This commit is contained in:
Gautier Hattenberger
2011-08-17 11:57:43 +02:00
249 changed files with 6530 additions and 2230 deletions
+24
View File
@@ -0,0 +1,24 @@
<!DOCTYPE module SYSTEM "module.dtd">
<!--
Angle of Attack ADC module
-->
<module name="AOA_adc" dir="sensors">
<header>
<file name="AOA_adc.h"/>
</header>
<init fun="AOA_adc_init()"/>
<periodic fun="AOA_adc_update()" freq="60."/>
<makefile>
<file name="AOA_adc.c"/>
</makefile>
<makefile target="ap">
<define name="ADC_CHANNEL_AOA" value="$(ADC_AOA)"/>
<define name="USE_$(ADC_AOA)"/>
</makefile>
</module>
+25
View File
@@ -0,0 +1,25 @@
<!DOCTYPE module SYSTEM "module.dtd">
<!--
Airspeed AMSYS module (I2C)
@param AIRSPEED_AMSYS_SCALE scale factor (default 1.8)
@param AIRSPEED_AMSYS_OFFSET offset (default 0)
@param AIRSPEED_AMSYS_I2C_DEV i2c device (default i2c0)
@flag USE_AIRSPEED to use the data for airspeed control loop
@flag SENSOR_SYNC_SEND to transmit the data as it is acquired
-->
<module name="airspeed_amsys" dir="sensors">
<header>
<file name="airspeed_amsys.h"/>
</header>
<init fun="airspeed_amsys_init()"/>
<periodic fun="airspeed_amsys_read_periodic()" freq="10."/>
<event fun="AirspeedAmsysEvent()"/>
<makefile>
<file name="airspeed_amsys.c"/>
</makefile>
</module>
+21
View File
@@ -0,0 +1,21 @@
<!DOCTYPE module SYSTEM "module.dtd">
<!--
Baro ETS module (I2C)
@param BARO_ETS_I2C_DEV i2c device (default i2c0)
-->
<module name="baro_amsys" dir="sensors">
<header>
<file name="baro_amsys.h"/>
</header>
<init fun="baro_amsys_init()"/>
<periodic fun="baro_amsys_read_periodic()" freq="10."/>
<event fun="BaroAmsysEvent()"/>
<makefile>
<file name="baro_amsys.c"/>
</makefile>
</module>
+13
View File
@@ -0,0 +1,13 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="cam_segment" dir="cam_control">
<!--depend require="cam_point.xml"/-->
<header>
<file name="cam_segment.h"/>
</header>
<init fun="cam_segment_init()"/>
<periodic fun="cam_segment_periodic()" stop="cam_segment_stop()" freq="10." autorun="FALSE"/>
<makefile>
<file name="cam_segment.c"/>
</makefile>
</module>
+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>
+14
View File
@@ -0,0 +1,14 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="flight_benchmark" dir="benchmark">
<header>
<file name="flight_benchmark.h"/>
</header>
<init fun="flight_benchmark_init()"/>
<periodic fun="flight_benchmark_periodic()" freq="1" autorun="TRUE"/>
<makefile target="ap">
<file name="flight_benchmark.c"/>
</makefile>
</module>
+14
View File
@@ -0,0 +1,14 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="geiger_counter" dir="meteo">
<header>
<file name="geiger_counter.h"/>
</header>
<init fun="geiger_counter_init()"/>
<periodic fun="geiger_counter_periodic()" freq="1"/>
<event fun="geiger_counter_event()"/>
<makefile target="ap">
<file name="geiger_counter.c"/>
</makefile>
</module>
+13
View File
@@ -0,0 +1,13 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="humdid_pcap01" dir="meteo">
<header>
<file name="humid_pcap01.h"/>
</header>
<init fun="pcap01_init()"/>
<periodic fun="pcap01_periodic()" freq="3"/>
<event fun="pcap01_event()"/>
<makefile target="ap">
<file name="humid_pcap01.c"/>
</makefile>
</module>
+3 -3
View File
@@ -9,11 +9,11 @@
<header>
<file name="humid_sht_i2c.h"/>
</header>
<init fun="humid_sht_init()"/>
<periodic fun="humid_sht_periodic()" freq="4" delay="0"/>
<init fun="humid_sht_init_i2c()"/>
<periodic fun="humid_sht_periodic_i2c()" freq="4" delay="0"/>
<periodic fun="humid_sht_p_temp()" freq="4" delay="6"/>
<periodic fun="humid_sht_p_humid()" freq="4" delay="9"/>
<event fun="humid_sht_event()"/>
<event fun="humid_sht_event_i2c()"/>
<makefile target="ap">
<file name="humid_sht_i2c.c"/>
</makefile>
+25
View File
@@ -0,0 +1,25 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="imu_aspirin_i2c" dir="sensors">
<!-- <depend conflict="ins" -->
<header>
<file name="imu_ppzuav.h"/>
</header>
<!-- default imu stuff -->
<init fun="imu_impl_init()"/>
<periodic fun="imu_periodic()" freq="60"/>
<!-- ImuEvent called directly from main_ap -->
<!-- extras to become a usefull module -->
<periodic fun="ppzuavimu_module_downlink_raw()" freq="5"/>
<event fun="ppzuavimu_module_event()"/>
<makefile>
<file name="imu_ppzuav.c"/>
<define name="PPZUAVIMU_I2C_DEVICE" value="i2c0" />
<define name="USE_I2C" />
<define name="USE_I2C0" />
<define name="ASPIRIN_IMU" />
</makefile>
</module>
+24
View File
@@ -0,0 +1,24 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="imu_ppzuav" dir="sensors">
<!-- <depend conflict="ins" -->
<header>
<file name="imu_ppzuav.h"/>
</header>
<!-- default imu stuff -->
<init fun="imu_impl_init()"/>
<periodic fun="imu_periodic()" freq="60"/>
<!-- ImuEvent called directly from main_ap -->
<!-- extras to become a usefull module -->
<periodic fun="ppzuavimu_module_downlink_raw()" freq="5"/>
<event fun="ppzuavimu_module_event()"/>
<makefile target="ap">
<file name="imu_ppzuav.c"/>
<define name="PPZUAVIMU_I2C_DEVICE" value="i2c0" />
<define name="USE_I2C" />
<define name="USE_I2C0" />
</makefile>
</module>
+4 -1
View File
@@ -1,5 +1,8 @@
<!DOCTYPE module SYSTEM "module.dtd">
<!-- optional flags:
- USE_HIGH_ACCEL_FLAG: will disable accelerometers on high acceleration detection (low speed, high thrust)
- ARDUIMU_SYNC_SEND: downlink imu gyro and accels
-->
<module name="ins_ArduIMU" dir="ins">
<header>
<file name="ins_arduimu_basic.h"/>
+3 -14
View File
@@ -6,20 +6,9 @@
<file name="ins_ppzuavimu.h"/>
</header>
<!-- default imu stuff -->
<init fun="imu_impl_init()"/>
<periodic fun="imu_periodic()" freq="60"/>
<!-- ImuEvent called directly from main_ap -->
<!-- extras to become a usefull module -->
<periodic fun="ppzuavimu_module_downlink_raw()" freq="5"/>
<event fun="ppzuavimu_module_event()"/>
<makefile>
<file name="ins_ppzuavimu.c"/>
<define name="PPZUAVIMU_I2C_DEVICE" value="i2c0" />
<define name="USE_I2C" />
<define name="USE_I2C0" />
<define name="ASPIRIN_IMU" />
<raw>
$(error The ins_aspirin_via_i2c module has been renamed, please replace the name="ins_aspirin_via_i2c.xml" with name="imu_aspirin_i2c.xml" in the load tag of your airframe file modules section.)
</raw>
</makefile>
</module>
+2 -1
View File
@@ -11,9 +11,10 @@
<makefile>
<define name="AHRS_TYPE_H" value="\\\"modules/ins/ins_module.h\\\""/>
<define name="AHRS_TRIGGERED_ATTITUDE_LOOP" />
<define name="USE_SPI" />
<define name="INS_LINK" value="SpiSlave"/>
<define name="USE_USB_HIGH_PCLK" />
<file name="ins_chimu_spi.c"/>
<file name="imu_chimu.c"/>
</makefile>
+7 -1
View File
@@ -1,5 +1,11 @@
<!DOCTYPE module SYSTEM "module.dtd">
<!--
For older CHIMU v1.0 you should define CHIMU_BIG_ENDIAN
-->
<module name="ins">
<!-- <depend conflict="ins" -->
<header>
@@ -11,7 +17,7 @@
<makefile>
<define name="AHRS_TYPE_H" value="\\\"modules/ins/ins_module.h\\\""/>
<define name="AHRS_TRIGGERED_ATTITUDE_LOOP" />
<define name="USE_UART$(CHIMU_UART_NR)"/>
<define name="INS_LINK" value="Uart$(CHIMU_UART_NR)"/>
<define name="UART$(CHIMU_UART_NR)_BAUD" value="B115200"/>
+5 -16
View File
@@ -1,24 +1,13 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="ins_ppzuavimu" dir="ins">
<!-- <depend conflict="ins" -->
<header>
<file name="ins_ppzuavimu.h"/>
<file name="imu_ppzuav.h"/>
</header>
<!-- default imu stuff -->
<init fun="imu_impl_init()"/>
<periodic fun="imu_periodic()" freq="60"/>
<!-- ImuEvent called directly from main_ap -->
<!-- extras to become a usefull module -->
<periodic fun="ppzuavimu_module_downlink_raw()" freq="5"/>
<event fun="ppzuavimu_module_event()"/>
<makefile>
<file name="ins_ppzuavimu.c"/>
<define name="PPZUAVIMU_I2C_DEVICE" value="i2c0" />
<define name="USE_I2C" />
<define name="USE_I2C0" />
<makefile target="ap">
<raw>
$(error The ins_ppzuavimu module has been renamed, please replace the name="ins_ppzuavimu.xml" with name="imu_ppzuav.xml" in the load tag of your airframe file modules section.)
</raw>
</makefile>
</module>
+17
View File
@@ -0,0 +1,17 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="light_solar" dir="meteo">
<header>
<file name="light_solar.h"/>
</header>
<init fun="light_solar_init()"/>
<periodic fun="light_solar_periodic()" freq="60"/>
<makefile target="ap">
<file name="light_solar.c"/>
<define name="ADC_CHANNEL_LIGHT_SOLAR_UP" value="ADC_1"/>
<define name="USE_ADC_1"/>
<define name="ADC_CHANNEL_LIGHT_SOLAR_DN" value="ADC_2"/>
<define name="USE_ADC_2"/>
</makefile>
</module>
@@ -0,0 +1,16 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="cartography">
<header>
<file name="photogrammetry_calculator.h"/>
</header>
<init fun="init_photogrammetry_calculator()"/>
<!--
<periodic fun="periodic_1Hz_demo()" freq="1." start="start_demo()" stop="stop_demo()" autorun="TRUE"/>
-->
<makefile>
<define name="photogrammetry_calculator_LED" value="2"/>
<file name="photogrammetry_calculator.c"/>
</makefile>
</module>
+17
View File
@@ -0,0 +1,17 @@
<!DOCTYPE module SYSTEM "module.dtd">
<module name="temp_tcouple_adc" dir="meteo">
<header>
<file name="temp_tcouple_adc.h"/>
</header>
<init fun="temp_tcouple_adc_init()"/>
<periodic fun="temp_tcouple_adc_periodic()" freq="60"/>
<makefile target="ap">
<file name="temp_tcouple_adc.c"/>
<define name="ADC_CHANNEL_TEMP_REF" value="ADC_4"/>
<define name="USE_ADC_4"/>
<define name="ADC_CHANNEL_TEMP_VAL" value="ADC_3"/>
<define name="USE_ADC_3"/>
</makefile>
</module>