move bomb to subsystems/navigation

This commit is contained in:
Felix Ruess
2010-11-20 14:30:01 +01:00
parent 8127955e57
commit 41c086954e
28 changed files with 37 additions and 37 deletions
+2 -2
View File
@@ -261,7 +261,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl_a.c fw_v_ctl.c
ap.srcs += subsystems/navigation/nav_line.c
ap.srcs += subsystems/navigation/nav_survey_rectangle.c
ap.srcs += bomb.c
ap.srcs += subsystems/navigation/bomb.c
ap.srcs += subsystems/navigation/snav.c
@@ -274,7 +274,7 @@ sim.srcs = latlong.c radio_control.c downlink.c commands.c gps.c inter_mcu.c inf
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c
sim.srcs += bomb.c
sim.srcs += subsystems/navigation/bomb.c
</makefile>
</airframe>
+1 -1
View File
@@ -247,7 +247,7 @@ ap.CFLAGS += -DLED_3_BANK=0 -DLED_3_PIN=10 -DPOWER_SWITCH_LED=3
ap.CFLAGS += -DGYRO -DADXRS150
# -DIDG300
ap.srcs += gyro.c
# ap.srcs += bomb.c
# ap.srcs += subsystems/navigation/bomb.c
# Hack to use the same tuning file than slayer1
ap.CFLAGS += -DUSE_GPIO