mirror of
https://github.com/paparazzi/paparazzi.git
synced 2026-06-05 15:30:08 +08:00
move snav to subsystems/navigation
This commit is contained in:
@@ -263,7 +263,7 @@ ap.srcs += subsystems/navigation/nav_survey_rectangle.c
|
||||
|
||||
ap.srcs += bomb.c
|
||||
|
||||
ap.srcs += snav.c
|
||||
ap.srcs += subsystems/navigation/snav.c
|
||||
|
||||
# Config for SITL simulation
|
||||
# include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
|
||||
|
||||
@@ -282,7 +282,7 @@ ap.CFLAGS += -DUSE_JOYSTICK
|
||||
|
||||
ap.srcs += bomb.c
|
||||
|
||||
ap.srcs += snav.c
|
||||
ap.srcs += subsystems/navigation/snav.c
|
||||
|
||||
# distance sensor
|
||||
ap.CFLAGS += -DUSE_ADC_3 -DUSE_ADC_GENERIC -DADC_CHANNEL_GENERIC1=ADC_3 -DADC_CHANNEL_GENERIC_NB_SAMPLES=16
|
||||
|
||||
@@ -285,7 +285,7 @@ ap.srcs += subsystems/navigation/nav_survey_rectangle.c
|
||||
|
||||
ap.srcs += bomb.c
|
||||
|
||||
ap.srcs += snav.c
|
||||
ap.srcs += subsystems/navigation/snav.c
|
||||
|
||||
# Config for SITL simulation
|
||||
# include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
|
||||
|
||||
@@ -256,7 +256,7 @@ ap.CFLAGS += -DUSE_HUMID_SHT -DDAT_PIN=30 -DSCK_PIN=4
|
||||
|
||||
ap.srcs += bomb.c
|
||||
|
||||
ap.srcs += snav.c
|
||||
ap.srcs += subsystems/navigation/snav.c
|
||||
|
||||
# distance sensor
|
||||
ap.CFLAGS += -DUSE_ADC_3 -DUSE_ADC_GENERIC -DADC_CHANNEL_GENERIC1=ADC_3 -DADC_CHANNEL_GENERIC_NB_SAMPLES=16
|
||||
|
||||
@@ -219,7 +219,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
|
||||
ap.srcs += subsystems/navigation/nav_line.c
|
||||
ap.srcs += subsystems/navigation/nav_survey_rectangle.c
|
||||
|
||||
ap.srcs += snav.c
|
||||
ap.srcs += subsystems/navigation/snav.c
|
||||
|
||||
# Config for SITL simulation
|
||||
# include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
|
||||
|
||||
@@ -264,7 +264,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
|
||||
|
||||
ap.srcs += subsystems/navigation/nav_line.c
|
||||
ap.srcs += subsystems/navigation/nav_survey_rectangle.c
|
||||
ap.srcs += snav.c
|
||||
ap.srcs += subsystems/navigation/snav.c
|
||||
|
||||
ap.CFLAGS += -DGYRO -DADXRS150
|
||||
ap.srcs += gyro.c
|
||||
|
||||
@@ -278,7 +278,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
|
||||
|
||||
ap.srcs += subsystems/navigation/nav_line.c
|
||||
ap.srcs += subsystems/navigation/nav_survey_rectangle.c
|
||||
ap.srcs += snav.c
|
||||
ap.srcs += subsystems/navigation/snav.c
|
||||
|
||||
ap.CFLAGS += -DGYRO -DADXRS150
|
||||
ap.srcs += gyro.c
|
||||
|
||||
@@ -242,7 +242,7 @@ ap.srcs += subsystems/navigation/nav_survey_rectangle.c
|
||||
|
||||
ap.srcs += bomb.c
|
||||
|
||||
ap.srcs += snav.c
|
||||
ap.srcs += subsystems/navigation/snav.c
|
||||
|
||||
# Config for SITL simulation
|
||||
# include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
|
||||
|
||||
@@ -243,7 +243,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 += snav.c
|
||||
ap.srcs += subsystems/navigation/snav.c
|
||||
|
||||
# Config for SITL simulation
|
||||
sim.ARCHDIR = $(ARCHI)
|
||||
|
||||
@@ -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>
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -11,5 +11,5 @@ $(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/nav_survey_rectangle.c
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/nav_cube.c
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/discsurvey.c
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/OSAMNav.c
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/snav.c
|
||||
$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/snav.c
|
||||
|
||||
|
||||
@@ -4,7 +4,7 @@
|
||||
<header>
|
||||
#include "subsystems/navigation/nav_line.h"
|
||||
#include "datalink.h"
|
||||
#include "snav.h"
|
||||
#include "subsystems/navigation/snav.h"
|
||||
</header>
|
||||
<waypoints>
|
||||
<waypoint name="HOME" x="0" y="0"/>
|
||||
|
||||
@@ -3,7 +3,7 @@
|
||||
|
||||
#include <math.h>
|
||||
#include "airframe.h"
|
||||
#include "snav.h"
|
||||
#include "subsystems/navigation/snav.h"
|
||||
#include "estimator.h"
|
||||
#include "subsystems/nav.h"
|
||||
#include "gps.h"
|
||||
Reference in New Issue
Block a user