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

This commit is contained in:
Felix Ruess
2011-07-27 08:07:10 +02:00
36 changed files with 1280 additions and 112 deletions
+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>
+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>
+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>