add tcas section

This commit is contained in:
Gautier Hattenberger
2008-07-30 16:47:23 +00:00
parent 5e6cbe8408
commit 2d4aed11d7
3 changed files with 41 additions and 9 deletions
+13 -3
View File
@@ -93,7 +93,7 @@
<!-- <define name="NO_XBEE_API_INIT" value="TRUE"/> -->
<define name="ALT_KALMAN_ENABLED" value="TRUE"/>
<define name="TRIGGER_DELAY" value="1."/>
<define name="DEFAULT_CIRCLE_RADIUS" value="50."/>
<define name="DEFAULT_CIRCLE_RADIUS" value="40."/>
</section>
<section name="VERTICAL CONTROL" prefix="V_CTL_">
@@ -157,6 +157,13 @@
<define name="MODE" value="0"/> <!-- mode 0 = global, 1 = local -->
</section>
<section name="TCAS" prefix="TCAS_">
<define name="TAU_TA" value="10." unit="s"/> <!-- traffic advisory -->
<define name="TAU_RA" value="6." unit="s"/> <!-- resolution advisory -->
<define name="ALIM" value="15." unit="m"/> <!-- altitude limitation -->
<define name="DT_MAX" value="2000" unit="ms"/> <!-- lost comm or timeout -->
</section>
<section name="AGGRESSIVE" prefix="AGR_">
<define name="BLEND_START" value="20"/><!-- Altitude Error to Initiate Aggressive Climb CANNOT BE ZERO!!-->
<define name="BLEND_END" value="10"/><!-- Altitude Error to Blend Aggressive to Regular Climb Modes CANNOT BE ZERO!!-->
@@ -231,6 +238,9 @@ ap.srcs += traffic_info.c formation.c snav.c
# external module
ap.srcs += external.c
# tcas
ap.CFLAGS += -DTCAS
ap.srcs += tcas.c
# Harware In The Loop
@@ -239,8 +249,8 @@ ap.srcs += external.c
# Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DCONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DFORMATION -DTRAFFIC_INFO
sim.srcs += nav_survey_rectangle.c nav_line.c external.c traffic_info.c formation.c snav.c
sim.CFLAGS += -DCONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DFORMATION -DTRAFFIC_INFO -DTCAS
sim.srcs += nav_survey_rectangle.c nav_line.c external.c traffic_info.c formation.c snav.c tcas.c
</makefile>
</airframe>
+14 -3
View File
@@ -94,7 +94,7 @@
<!-- <define name="NO_XBEE_API_INIT" value="TRUE"/>-->
<define name="ALT_KALMAN_ENABLED" value="TRUE"/>
<define name="TRIGGER_DELAY" value="1."/>
<define name="DEFAULT_CIRCLE_RADIUS" value="50."/>
<define name="DEFAULT_CIRCLE_RADIUS" value="40."/>
</section>
<section name="VERTICAL CONTROL" prefix="V_CTL_">
@@ -158,6 +158,13 @@
<define name="MODE" value="0"/> <!-- mode 0 = global, 1 = local -->
</section>
<section name="TCAS" prefix="TCAS_">
<define name="TAU_TA" value="10." unit="s"/> <!-- traffic advisory -->
<define name="TAU_RA" value="6." unit="s"/> <!-- resolution advisory -->
<define name="ALIM" value="15." unit="m"/> <!-- altitude limitation -->
<define name="DT_MAX" value="2000" unit="ms"/> <!-- lost comm or timeout -->
</section>
<section name="AGGRESSIVE" prefix="AGR_">
<define name="BLEND_START" value="20"/><!-- Altitude Error to Initiate Aggressive Climb CANNOT BE ZERO!!-->
<define name="BLEND_END" value="10"/><!-- Altitude Error to Blend Aggressive to Regular Climb Modes CANNOT BE ZERO!!-->
@@ -228,6 +235,10 @@ ap.srcs += traffic_info.c formation.c snav.c
# external module
ap.srcs += external.c
# tcas
ap.CFLAGS += -DTCAS
ap.srcs += tcas.c
# Harware In The Loop
@@ -236,8 +247,8 @@ ap.srcs += external.c
# Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DCONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DFORMATION -DTRAFFIC_INFO
sim.srcs += nav_survey_rectangle.c nav_line.c external.c traffic_info.c formation.c snav.c
sim.CFLAGS += -DCONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DFORMATION -DTRAFFIC_INFO -DTCAS
sim.srcs += nav_survey_rectangle.c nav_line.c external.c traffic_info.c formation.c snav.c tcas.c
</makefile>
</airframe>
+14 -3
View File
@@ -94,7 +94,7 @@
<!-- <define name="NO_XBEE_API_INIT" value="TRUE"/> -->
<define name="ALT_KALMAN_ENABLED" value="TRUE"/>
<define name="TRIGGER_DELAY" value="1."/>
<define name="DEFAULT_CIRCLE_RADIUS" value="50."/>
<define name="DEFAULT_CIRCLE_RADIUS" value="40."/>
</section>
<section name="VERTICAL CONTROL" prefix="V_CTL_">
@@ -158,6 +158,13 @@
<define name="MODE" value="0"/> <!-- mode 0 = global, 1 = local -->
</section>
<section name="TCAS" prefix="TCAS_">
<define name="TAU_TA" value="10." unit="s"/> <!-- traffic advisory -->
<define name="TAU_RA" value="6." unit="s"/> <!-- resolution advisory -->
<define name="ALIM" value="15." unit="m"/> <!-- altitude limitation -->
<define name="DT_MAX" value="2000" unit="ms"/> <!-- lost comm or timeout -->
</section>
<section name="AGGRESSIVE" prefix="AGR_">
<define name="BLEND_START" value="20"/><!-- Altitude Error to Initiate Aggressive Climb CANNOT BE ZERO!!-->
<define name="BLEND_END" value="10"/><!-- Altitude Error to Blend Aggressive to Regular Climb Modes CANNOT BE ZERO!!-->
@@ -228,6 +235,10 @@ ap.srcs += traffic_info.c formation.c snav.c
# external module
ap.srcs += external.c
# tcas
ap.CFLAGS += -DTCAS
ap.srcs += tcas.c
# Harware In The Loop
@@ -236,8 +247,8 @@ ap.srcs += external.c
# Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DCONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DFORMATION -DTRAFFIC_INFO
sim.srcs += nav_survey_rectangle.c nav_line.c external.c traffic_info.c formation.c snav.c
sim.CFLAGS += -DCONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DFORMATION -DTRAFFIC_INFO -DTCAS
sim.srcs += nav_survey_rectangle.c nav_line.c external.c traffic_info.c formation.c snav.c tcas.c
</makefile>
</airframe>