fix discsurvey paths

This commit is contained in:
Felix Ruess
2010-11-20 14:21:52 +01:00
parent 1d66b2d092
commit d872c7047a
6 changed files with 8 additions and 8 deletions
+2 -2
View File
@@ -271,7 +271,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
ap.CFLAGS += -DGYRO -DADXRS150
ap.srcs += gyro.c subsystems/navigation/nav_line.c
ap.srcs += subsystems/navigation/nav_survey_rectangle.c
# chemotaxis.c anemotaxis.c discsurvey.c
# chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c
########## Barometer (SPI)
#ap.CFLAGS += -DUSE_SPI -DSPI_MASTER -DUSE_SPI_SLAVE0 -DUSE_BARO_MS5534A
@@ -307,7 +307,7 @@ sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_re
# -DENOSE
#sim.srcs += i2c.c $(SRC_ARCH)/i2c_hw.c
#sim.CFLAGS += -DUSE_I2C -DUSE_I2C0
# chemotaxis.c anemotaxis.c discsurvey.c $(SRC_ARCH)/sim_enose.c chemo_detect.c
# chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c $(SRC_ARCH)/sim_enose.c chemo_detect.c
#sim.CFLAGS += -DDIGITAL_CAM -DPOWER_SWITCH_LED=4
#sim.srcs += dc.c
+2 -2
View File
@@ -225,7 +225,7 @@ ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM -DWIND_INFO
ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
ap.srcs += subsystems/navigation/nav_line.c
# chemotaxis.c anemotaxis.c discsurvey.c
# chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c
ap.srcs += subsystems/navigation/nav_survey_rectangle.c snav.c
@@ -244,7 +244,7 @@ test.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_tran
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
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 discsurvey.c bomb.c subsystems/navigation/nav_survey_rectangle.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.CFLAGS += -DUSE_LIGHT
+1 -1
View File
@@ -245,7 +245,7 @@ include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"classix.h\" -DAGR_CLIMB -DLOITER_TRIM
#sim.srcs += traffic_info.c
sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c dc.c
# chemotaxis.c anemotaxis.c discsurvey.c bomb.c subsystems/navigation/nav_survey_rectangle.c
# chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c bomb.c subsystems/navigation/nav_survey_rectangle.c
</makefile>
@@ -9,7 +9,7 @@ $(TARGET).srcs += $(SRC_FIXEDWING)/traffic_info.c
$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/nav_survey_rectangle.c $(SRC_FIXEDWING)/subsystems/navigation/nav_line.c
$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/nav_cube.c
$(TARGET).srcs += $(SRC_FIXEDWING)/discsurvey.c
$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/discsurvey.c
$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/OSAMNav.c
$(TARGET).srcs += $(SRC_FIXEDWING)/snav.c
+1 -1
View File
@@ -5,7 +5,7 @@
#include "chemo_detect.h"
#include "anemotaxis.h"
#include "chemotaxis.h"
#include "discsurvey.h"
#include "subsystems/navigation/discsurvey.h"
#include "subsystems/navigation/nav_line.h"
#include "bomb.h"
#include "datalink.h"
@@ -1,4 +1,4 @@
#include "discsurvey.h"
#include "subsystems/navigation/discsurvey.h"
#include "airframe.h"
#include "estimator.h"