move snav to subsystems/navigation

This commit is contained in:
Felix Ruess
2010-11-20 14:27:06 +01:00
parent c34a790dec
commit 8127955e57
15 changed files with 16 additions and 16 deletions
+2 -2
View File
@@ -209,7 +209,7 @@ ap.CFLAGS += -DINFRARED -DALT_KALMAN
ap.srcs += infrared.c estimator.c
ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM
ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c snav.c
ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c subsystems/navigation/snav.c
ap.CFLAGS += -DGYRO -DADXRS150
@@ -228,7 +228,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
# Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c snav.c
sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c subsystems/navigation/snav.c
</makefile>
</airframe>
+2 -2
View File
@@ -227,7 +227,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
ap.srcs += subsystems/navigation/nav_line.c
# chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c
ap.srcs += subsystems/navigation/nav_survey_rectangle.c snav.c
ap.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/snav.c
ap.srcs += light.c
ap.CFLAGS += -DUSE_LIGHT
@@ -246,7 +246,7 @@ sim.CFLAGS += -DBOARD_CONFIG=\"classix.h\" -DAGR_CLIMB -DLOITER_TRIM
#sim.srcs += traffic_info.c
#sim.srcs += subsystems/navigation/nav_line.c chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c bomb.c subsystems/navigation/nav_survey_rectangle.c
sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c light.c snav.c
sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c light.c subsystems/navigation/snav.c
sim.CFLAGS += -DUSE_LIGHT
sim.CFLAGS += -DUSE_ADC_GENERIC