Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 22:17:01 +08:00
Code Issues Actions 27 Packages Projects Releases Wiki Activity

Merge branch 'master' of github.com:paparazzi/paparazzi into fastperiodic

Browse Source
This commit is contained in:
Christophe De Wagter
2010-12-23 23:27:01 +01:00
parent 4576ef2576 6021335e70
commit 231bcccfe6
11 changed files with 28 additions and 25 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/easy_glider_example.xml
+7 -3
View File
@@ -168,9 +168,6 @@
<!-- Actuators are automatically chosen according to board -->
<subsystem name="control"/>
<!-- Sensors -->
<subsystem name="adc" type="generic">
<configure name="ADC_GENERIC1" value="ADC_7"/> <!-- current sensor -->
</subsystem>
<subsystem name="attitude" type="infrared"/>
<subsystem name="gps" type="ublox_lea4p"/>
<subsystem name="navigation"/>
@@ -181,4 +178,11 @@
<target name="setup_actuators" board="tiny_0.99" />
</firmware>
<modules>
<load name="adc_generic.xml">
<define name="ADC_CHANNEL_GENERIC1" value="ADC_7"/> <!-- current sensor -->
<define name="USE_ADC_7"/>
</load>
</modules>
</airframe>
conf/airframes/mentor_tum.xml
+3 -3
View File
@@ -35,9 +35,9 @@
<modules main_freq="60">
<load name="servo_switch.xml">
<param name="SERVO_SWITCH_ON_VALUE" value="1100"/>
<param name="SERVO_SWITCH_OFF_VALUE" value="1900"/>
<param name="SERVO_SWITCH_SERVO" value="SERVO_SWITCH"/>
<define name="SERVO_SWITCH_ON_VALUE" value="1100"/>
<define name="SERVO_SWITCH_OFF_VALUE" value="1900"/>
<define name="SERVO_SWITCH_SERVO" value="SERVO_SWITCH"/>
</load>
<load name="sys_mon.xml"/>
</modules>
conf/modules/adc_generic.xml
+3 -4
View File
@@ -2,8 +2,9 @@
<!--
Generic ADC module
@param ADC_CHANNEL_GENERIC1 on which ADC input 1 is measured
@param ADC_CHANNEL_GENERIC2 on which ADC input 2 is measured
@define ADC_CHANNEL_GENERIC1 on which ADC input 1 is measured
@define ADC_CHANNEL_GENERIC2 on which ADC input 2 is measured
@define USE_ADC_x with x as the number of the ADC input (once for every ADC channel you want to use)
-->
<module name="adc_generic" dir="adcs">
@@ -14,8 +15,6 @@
<periodic fun="adc_generic_periodic()" freq="4"/>
<makefile target="ap">
<file name="adc_generic.c"/>
<define name="USE_$(ADC_CHANNEL_GENERIC1)"/>
<define name="USE_$(ADC_CHANNEL_GENERIC2)"/>
</makefile>
</module>
conf/modules/airspeed_adc.xml
+3 -3
View File
@@ -2,9 +2,9 @@
<!--
Airspeed ADC module
@param ADC_AIRSPEED on which ADC the sensor is connected
@param AIRSPEED_SCALE/AIRSPEED_QUADRATIC_SCALE scale factor, quadratic is used if defined
@param AIRSPEED_BIAS offset on ADC
@configure ADC_AIRSPEED on which ADC the sensor is connected
@define AIRSPEED_SCALE/AIRSPEED_QUADRATIC_SCALE scale factor, quadratic is used if defined
@define AIRSPEED_BIAS offset on ADC
-->
<module name="airspeed_adc" dir="sensors">
conf/modules/airspeed_ets.xml
+3 -3
View File
@@ -2,9 +2,9 @@
<!--
Airspeed ETS module (I2C)
@param AIRSPEED_ETS_SCALE scale factor (default 1.8)
@param AIRSPEED_ETS_OFFSET offset (default 0)
@param AIRSPEED_ETS_I2C_DEV i2c device (default i2c0)
@define AIRSPEED_ETS_SCALE scale factor (default 1.8)
@define AIRSPEED_ETS_OFFSET offset (default 0)
@define AIRSPEED_ETS_I2C_DEV i2c device (default i2c0)
@define USE_AIRSPEED to use the data for airspeed control loop
@define SENSOR_SYNC_SEND to transmit the data as it is acquired
-->
conf/modules/baro_bmp.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<!--
Bosch BMP085 pressure sensor
@param BMP_I2C_DEV i2c device (default i2c0)
@define BMP_I2C_DEV i2c device (default i2c0)
@define SENSOR_SYNC_SEND to transmit the data as it is acquired
-->
conf/modules/baro_ets.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<!--
Baro ETS module (I2C)
@param BARO_ETS_I2C_DEV i2c device (default i2c0)
@define BARO_ETS_I2C_DEV i2c device (default i2c0)
-->
<module name="baro_ets" dir="sensors">
conf/modules/baro_scp_i2c.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<!--
VTI SCP1000 pressure sensor (I2C)
@param SCP_I2C_DEV i2c device (default i2c0)
@define SCP_I2C_DEV i2c device (default i2c0)
@define SENSOR_SYNC_SEND to transmit the data as it is acquired
-->
conf/modules/humid_sht_i2c.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<!--
Sensirion SHT25 humidity sensor (I2C)
@param SCP_I2C_DEV i2c device (default i2c0)
@define SCP_I2C_DEV i2c device (default i2c0)
-->
<module name="humid_sht_i2c" dir="meteo">
conf/modules/servo_switch.xml
+3 -3
View File
@@ -10,9 +10,9 @@
<!-- these parameters should be set for that module in the airframe file unless you want the defaults
Servo value in usec
<param name="SERVO_SWITCH_ON_VALUE" value="2000"/>
<param name="SERVO_SWITCH_OFF_VALUE" value="1000"/>
<param name="SERVO_SWITCH_SERVO" value="SERVO_SWITCH"/>
<define name="SERVO_SWITCH_ON_VALUE" value="2000"/>
<define name="SERVO_SWITCH_OFF_VALUE" value="1000"/>
<define name="SERVO_SWITCH_SERVO" value="SERVO_SWITCH"/>
-->
<file name="servo_switch.c"/>
conf/modules/temp_temod.xml
+2 -2
View File
@@ -2,8 +2,8 @@
<!--
Hygrosens TEMOD-I2C-Rx temperature sensor
@param SCP_I2C_DEV i2c device (default i2c0)
@param TEMOD_TYPE device type (default TEMOD_I2C_R1)
@define SCP_I2C_DEV i2c device (default i2c0)
@define TEMOD_TYPE device type (default TEMOD_I2C_R1)
-->
<module name="temp_temod" dir="meteo">