Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 22:05:14 +08:00
Code Issues Actions 29 Packages Projects Releases Wiki Activity

move traffic info into subsystems/navigation

Browse Source
This commit is contained in:
Felix Ruess
2010-11-23 00:09:58 +01:00
parent 441921e70c
commit 13780c00c9
38 changed files with 50 additions and 50 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/ENAC/fixed-wing/slayer2.xml
+1 -1
View File
@@ -238,7 +238,7 @@ ap.CFLAGS += -DINFRARED -DALT_KALMAN
ap.srcs += infrared.c estimator.c ap.srcs += infrared.c estimator.c
ap.CFLAGS += -DNAV -DAGR_CLIMB -DLOITER_TRIM 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 traffic_info.c subsystems/navigation/nav_line.c ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/traffic_info.c subsystems/navigation/nav_line.c
# Camera power switch on ADC_7 pin # Camera power switch on ADC_7 pin
ap.CFLAGS += -DLED_3_BANK=0 -DLED_3_PIN=10 -DPOWER_SWITCH_LED=3 ap.CFLAGS += -DLED_3_BANK=0 -DLED_3_PIN=10 -DPOWER_SWITCH_LED=3
conf/airframes/Poine/antenna.xml
+1 -1
View File
@@ -34,7 +34,7 @@ ant.srcs += downlink.c pprz_transport.c
ant.CFLAGS += -DDOWNLINK_AP_DEVICE=Uart0 -DAP ant.CFLAGS += -DDOWNLINK_AP_DEVICE=Uart0 -DAP
ant.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0 ant.CFLAGS += -DDATALINK=PPRZ -DPPRZ_UART=Uart0
ant.srcs += datalink.c ant.srcs += datalink.c
ant.srcs += traffic_info.c ant.srcs += subsystems/navigation/traffic_info.c
ant.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B9600 ant.CFLAGS += -DGPS -DUBX -DUSE_UART1 -DGPS_LINK=Uart1 -DUART1_BAUD=B9600
ant.srcs += estimator.c gps_ubx.c gps.c ant.srcs += estimator.c gps_ubx.c gps.c
conf/airframes/Poine/easy_glider1.xml
+1 -1
View File
@@ -208,7 +208,7 @@ ap.srcs += adc_generic.c
# Config for SITL simulation # Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN 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 traffic_info.c sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c subsystems/navigation/traffic_info.c
</makefile> </makefile>
</airframe> </airframe>
conf/airframes/TUDelft/holiday50.xml
+3 -3
View File
@@ -292,13 +292,13 @@ ap.srcs += gyro.c
ap.CFLAGS += -DUSE_MODULES ap.CFLAGS += -DUSE_MODULES
ap.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c ap.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c
ap.srcs += traffic_info.c ap.srcs += subsystems/navigation/traffic_info.c
# camera control # camera control
ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL
# -DTEST_CAM # -DTEST_CAM
ap.srcs += cam.c point.c ap.srcs += cam.c point.c
# traffic_info.c # subsystems/navigation/traffic_info.c
ap.CFLAGS += -DWIND_INFO -DSTRONG_WIND ap.CFLAGS += -DWIND_INFO -DSTRONG_WIND
ap.srcs += subsystems/navigation/bomb.c ap.srcs += subsystems/navigation/bomb.c
@@ -308,7 +308,7 @@ include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DWIND_INFO -DSTRONG_WIND sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DWIND_INFO -DSTRONG_WIND
sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c
sim.CFLAGS += -DTUNE_AGRESSIVE_CLIMB sim.CFLAGS += -DTUNE_AGRESSIVE_CLIMB
# traffic_info.c # subsystems/navigation/traffic_info.c
sim.CFLAGS += -DUSE_MODULES sim.CFLAGS += -DUSE_MODULES
sim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL sim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL
conf/airframes/hitl_usb.xml
+1 -1
View File
@@ -157,7 +157,7 @@ sim.ARCHDIR = $(ARCH)
sim.CFLAGS += -DSITL -DAP -DFBW -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED sim.CFLAGS += -DSITL -DAP -DFBW -DINTER_MCU -DDOWNLINK -DDOWNLINK_TRANSPORT=IvyTransport -DINFRARED -DNAV -DLED
sim.srcs = latlong.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c subsystems/nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c sim.srcs = latlong.c downlink.c commands.c gps.c inter_mcu.c infrared.c fw_h_ctl.c fw_v_ctl.c subsystems/nav.c estimator.c sys_time.c main_fbw.c main_ap.c datalink.c $(SRC_ARCH)/ppm_hw.c $(SRC_ARCH)/sim_gps.c $(SRC_ARCH)/sim_ir.c $(SRC_ARCH)/sim_ap.c $(SRC_ARCH)/ivy_transport.c $(SRC_ARCH)/sim_adc_generic.c $(SRC_ARCH)/led_hw.c
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN 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 traffic_info.c sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c subsystems/navigation/traffic_info.c
</makefile> </makefile>
</airframe> </airframe>
conf/airframes/mm/fixed-wing/funjetgfi3.xml
+1 -1
View File
@@ -236,7 +236,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c latlong.c subsystems/navigatio
#ap.srcs += gyro.c #ap.srcs += gyro.c
#ap.srcs += subsystems/navigation/bomb.c #ap.srcs += subsystems/navigation/bomb.c
#ap.srcs += traffic_info.c #ap.srcs += subsystems/navigation/traffic_info.c
ap.srcs += i2c.c arm7/i2c_hw.c dpicco.c ap.srcs += i2c.c arm7/i2c_hw.c dpicco.c
ap.CFLAGS += -DDPICCO ap.CFLAGS += -DDPICCO
conf/airframes/mm/hangar/black_one.xml
+2 -2
View File
@@ -255,7 +255,7 @@ ap.srcs += gyro.c
ap.srcs += subsystems/navigation/bomb.c ap.srcs += subsystems/navigation/bomb.c
#Cap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM #Cap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM
#Cap.srcs += traffic_info.c point.c cam.c #Cap.srcs += subsystems/navigation/traffic_info.c point.c cam.c
# Video switch # Video switch
@@ -274,7 +274,7 @@ sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_T
sim.srcs += subsystems/navigation/bomb.c sim.srcs += subsystems/navigation/bomb.c
#Csim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM #Csim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM
#Csim.srcs += traffic_info.c point.c #Csim.srcs += subsystems/navigation/traffic_info.c point.c
</makefile> </makefile>
conf/airframes/mm/hangar/glass_one1.xml
+2 -2
View File
@@ -247,7 +247,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c latlong.c subsystems/navigatio
#ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH #ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH
#ap.srcs += point.c cam.c #ap.srcs += point.c cam.c
ap.srcs += traffic_info.c subsystems/navigation/nav_line.c ap.srcs += subsystems/navigation/traffic_info.c subsystems/navigation/nav_line.c
# Video switch # Video switch
ap.CFLAGS += -DUSE_GPIO ap.CFLAGS += -DUSE_GPIO
@@ -263,7 +263,7 @@ include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM
sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
sim.srcs += traffic_info.c subsystems/navigation/nav_line.c sim.srcs += subsystems/navigation/traffic_info.c subsystems/navigation/nav_line.c
</makefile> </makefile>
conf/airframes/mm/hangar/glass_one2.xml
+2 -2
View File
@@ -218,7 +218,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c latlong.c subsystems/navigatio
#ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH #ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH
#ap.srcs += point.c cam.c #ap.srcs += point.c cam.c
ap.srcs += traffic_info.c subsystems/navigation/nav_line.c ap.srcs += subsystems/navigation/traffic_info.c subsystems/navigation/nav_line.c
# Video switch # Video switch
ap.CFLAGS += -DUSE_GPIO ap.CFLAGS += -DUSE_GPIO
@@ -234,7 +234,7 @@ include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM
sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
sim.srcs += traffic_info.c subsystems/navigation/nav_line.c sim.srcs += subsystems/navigation/traffic_info.c subsystems/navigation/nav_line.c
</makefile> </makefile>
conf/airframes/mm/hangar/glass_one3.xml
+2 -2
View File
@@ -245,7 +245,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c latlong.c subsystems/navigatio
#ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH #ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH
#ap.srcs += point.c cam.c #ap.srcs += point.c cam.c
ap.srcs += traffic_info.c subsystems/navigation/nav_line.c ap.srcs += subsystems/navigation/traffic_info.c subsystems/navigation/nav_line.c
# Video switch # Video switch
ap.CFLAGS += -DUSE_GPIO ap.CFLAGS += -DUSE_GPIO
@@ -261,7 +261,7 @@ include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM
sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
sim.srcs += traffic_info.c subsystems/navigation/nav_line.c sim.srcs += subsystems/navigation/traffic_info.c subsystems/navigation/nav_line.c
</makefile> </makefile>
conf/airframes/mm/hangar/red_one.xml
+2 -2
View File
@@ -268,7 +268,7 @@ ap.srcs += gyro.c
ap.srcs += subsystems/navigation/bomb.c ap.srcs += subsystems/navigation/bomb.c
ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH
ap.srcs += traffic_info.c point.c cam.c subsystems/navigation/nav_line.c ap.srcs += subsystems/navigation/traffic_info.c point.c cam.c subsystems/navigation/nav_line.c
ap.CFLAGS += -DUSE_SPI -DSPI_MASTER -DUSE_SPI_SLAVE0 -DUSE_BARO_MS5534A ap.CFLAGS += -DUSE_SPI -DSPI_MASTER -DUSE_SPI_SLAVE0 -DUSE_BARO_MS5534A
ap.srcs += spi.c $(SRC_ARCH)/spi_hw.c $(SRC_ARCH)/baro_MS5534A.c ap.srcs += spi.c $(SRC_ARCH)/spi_hw.c $(SRC_ARCH)/baro_MS5534A.c
@@ -291,7 +291,7 @@ sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOIT
sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
sim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH sim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH
sim.srcs += traffic_info.c point.c cam.c subsystems/navigation/nav_line.c sim.srcs += subsystems/navigation/traffic_info.c point.c cam.c subsystems/navigation/nav_line.c
</makefile> </makefile>
conf/airframes/obsolete/microjet5.xml
+1 -1
View File
@@ -211,6 +211,6 @@ ap.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rec
# Config for SITL simulation # Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DTRAFFIC_INFO sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DTRAFFIC_INFO
sim.srcs += subsystems/navigation/nav_survey_rectangle.c traffic_info.c subsystems/navigation/nav_line.c sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/traffic_info.c subsystems/navigation/nav_line.c
</makefile> </makefile>
</airframe> </airframe>
conf/airframes/obsolete/microjet5_tp_auto.xml
+1 -1
View File
@@ -227,7 +227,7 @@ ap.srcs += gyro.c
# Config for SITL simulation # Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\"
sim.srcs += subsystems/navigation/nav_survey_rectangle.c traffic_info.c subsystems/navigation/nav_line.c sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/traffic_info.c subsystems/navigation/nav_line.c
sim.CFLAGS += -DGYRO -DADXRS150 sim.CFLAGS += -DGYRO -DADXRS150
sim.srcs += gyro.c sim.srcs += gyro.c
conf/airframes/obsolete/microjetII.xml
+2 -2
View File
@@ -227,7 +227,7 @@ ap.CFLAGS += -DGYRO -DADXRS150
ap.srcs += gyro.c ap.srcs += gyro.c
ap.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c ap.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c
ap.srcs += traffic_info.c ap.srcs += subsystems/navigation/traffic_info.c
ap.srcs += light.c ap.srcs += light.c
ap.CFLAGS += -DUSE_LIGHT ap.CFLAGS += -DUSE_LIGHT
@@ -236,7 +236,7 @@ ap.CFLAGS += -DUSE_LIGHT
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN 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 sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c
sim.srcs += traffic_info.c sim.srcs += subsystems/navigation/traffic_info.c
sim.srcs += light.c sim.srcs += light.c
conf/airframes/obsolete/microjetIII.xml
+2 -2
View File
@@ -218,7 +218,7 @@ ap.CFLAGS += -DGYRO -DADXRS150
ap.srcs += gyro.c ap.srcs += gyro.c
ap.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c ap.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c
ap.srcs += traffic_info.c ap.srcs += subsystems/navigation/traffic_info.c
# PID sensor # PID sensor
ap.CFLAGS += -DUSE_ADC_6 -DUSE_ADC_GENERIC -DADC_CHANNEL_GENERIC1=ADC_6 -DADC_CHANNEL_GENERIC_NB_SAMPLES=16 ap.CFLAGS += -DUSE_ADC_6 -DUSE_ADC_GENERIC -DADC_CHANNEL_GENERIC1=ADC_6 -DADC_CHANNEL_GENERIC_NB_SAMPLES=16
@@ -228,7 +228,7 @@ ap.srcs += adc_generic.c
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN
# -DESTIMATOR_COMP_FILTER # -DESTIMATOR_COMP_FILTER
sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c traffic_info.c sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c subsystems/navigation/traffic_info.c
</makefile> </makefile>
</airframe> </airframe>
conf/airframes/obsolete/slicer1.xml
+2 -2
View File
@@ -227,14 +227,14 @@ ap.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rec
ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL
# -DTEST_CAM # -DTEST_CAM
ap.srcs += cam.c point.c ap.srcs += cam.c point.c
# traffic_info.c # subsystems/navigation/traffic_info.c
# Config for SITL simulation # Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN 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 sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c
sim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL sim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL
sim.srcs += cam.c point.c traffic_info.c sim.srcs += cam.c point.c subsystems/navigation/traffic_info.c
</makefile> </makefile>
</airframe> </airframe>
conf/airframes/obsolete/spirit.xml
+1 -1
View File
@@ -231,7 +231,7 @@ ap.srcs += adc_generic.c
# Config for SITL simulation # Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN 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 traffic_info.c sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c subsystems/navigation/traffic_info.c
ap.CFLAGS += -DUSE_SPI -DSPI_MASTER -DUSE_SPI_SLAVE0 -DUSE_BARO_MS5534A ap.CFLAGS += -DUSE_SPI -DSPI_MASTER -DUSE_SPI_SLAVE0 -DUSE_BARO_MS5534A
ap.srcs += spi.c $(SRC_ARCH)/spi_hw.c $(SRC_ARCH)/baro_MS5534A.c ap.srcs += spi.c $(SRC_ARCH)/spi_hw.c $(SRC_ARCH)/baro_MS5534A.c
conf/airframes/obsolete/spirit_proto.xml
+1 -1
View File
@@ -218,7 +218,7 @@ ap.srcs += adc_generic.c
# Config for SITL simulation # Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN 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 traffic_info.c sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c subsystems/navigation/traffic_info.c
ap.CFLAGS += -DUSE_SPI -DSPI_MASTER -DUSE_SPI_SLAVE0 -DUSE_BARO_MS5534A ap.CFLAGS += -DUSE_SPI -DSPI_MASTER -DUSE_SPI_SLAVE0 -DUSE_BARO_MS5534A
ap.srcs += spi.c $(SRC_ARCH)/spi_hw.c $(SRC_ARCH)/baro_MS5534A.c ap.srcs += spi.c $(SRC_ARCH)/spi_hw.c $(SRC_ARCH)/baro_MS5534A.c
conf/airframes/obsolete/storm1.xml
+2 -2
View File
@@ -274,7 +274,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
# ap.CFLAGS += -DGYRO -DADXRS150 # ap.CFLAGS += -DGYRO -DADXRS150
# ap.srcs += gyro.c # ap.srcs += gyro.c
ap.srcs += traffic_info.c subsystems/navigation/nav_survey_rectangle.c ap.srcs += subsystems/navigation/traffic_info.c subsystems/navigation/nav_survey_rectangle.c
ap.srcs += subsystems/navigation/bomb.c ap.srcs += subsystems/navigation/bomb.c
# Hack to use the same tuning file than slayer1 # Hack to use the same tuning file than slayer1
@@ -290,7 +290,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
# Config for SITL simulation # Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM -DALT_KALMAN -DIR_360 sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM -DALT_KALMAN -DIR_360
sim.srcs += traffic_info.c sim.srcs += subsystems/navigation/traffic_info.c
sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
</makefile> </makefile>
conf/airframes/obsolete/twinjet1.xml
+2 -2
View File
@@ -197,7 +197,7 @@ ap.CFLAGS += -DAP -DRADIO_CONTROL_AUTO1 -DBOARD_CONFIG=\"classix.h\" -DLED -DTIM
ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c main_ap.c main.c ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c main_ap.c main.c
#ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600 #ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=XBeeTransport -DDOWNLINK_AP_DEVICE=Uart0 -DXBEE_UART=Uart0 -DDATALINK=XBEE -DUART0_BAUD=B9600
#ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c traffic_info.c xbee.c #ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c subsystems/navigation/traffic_info.c xbee.c
ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600 ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c pprz_transport.c ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c pprz_transport.c
@@ -243,7 +243,7 @@ test.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_tran
# Config for SITL simulation # Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"classix.h\" -DAGR_CLIMB -DLOITER_TRIM sim.CFLAGS += -DBOARD_CONFIG=\"classix.h\" -DAGR_CLIMB -DLOITER_TRIM
#sim.srcs += traffic_info.c #sim.srcs += subsystems/navigation/traffic_info.c
#sim.srcs += subsystems/navigation/nav_line.c chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c #sim.srcs += subsystems/navigation/nav_line.c chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c light.c subsystems/navigation/snav.c sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c light.c subsystems/navigation/snav.c
conf/airframes/obsolete/twinstar1.xml
+1 -1
View File
@@ -185,7 +185,7 @@ ap.CFLAGS += -DUSE_UART0 -DDOWNLINK -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLIN
ap.EXTRA_SRCS += pprz_transport.c downlink.c ap.EXTRA_SRCS += pprz_transport.c downlink.c
# Datalink (on uart0) used to emulate sensors (infrared and gps) # Datalink (on uart0) used to emulate sensors (infrared and gps)
ap.EXTRA_SRCS += traffic_info.c datalink.c ap.EXTRA_SRCS += subsystems/navigation/traffic_info.c datalink.c
ap.CFLAGS += -DDATALINK -DPPRZ_INPUT -DPPRZ_UART=Uart0 ap.CFLAGS += -DDATALINK -DPPRZ_INPUT -DPPRZ_UART=Uart0
# Config for SITL simulation # Config for SITL simulation
conf/airframes/obsolete/twinstar6.xml
+2 -2
View File
@@ -205,7 +205,7 @@ ap.CFLAGS += -DAP -DRADIO_CONTROL_AUTO1 -DBOARD_CONFIG=\"classix.h\" -DLED -DTIM
ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c main_ap.c main.c ap.srcs = sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c main_ap.c main.c
ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600 ap.CFLAGS += -DDOWNLINK -DUSE_UART0 -DDOWNLINK_TRANSPORT=PprzTransport -DDOWNLINK_AP_DEVICE=Uart0 -DPPRZ_UART=Uart0 -DDATALINK=PPRZ -DUART0_BAUD=B57600
ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c traffic_info.c pprz_transport.c ap.srcs += downlink.c $(SRC_ARCH)/uart_hw.c datalink.c subsystems/navigation/traffic_info.c pprz_transport.c
ap.CFLAGS += -DINTER_MCU -DMCU_SPI_LINK -DUSE_SPI -DSPI_MASTER ap.CFLAGS += -DINTER_MCU -DMCU_SPI_LINK -DUSE_SPI -DSPI_MASTER
ap.srcs += inter_mcu.c link_mcu.c spi.c $(SRC_ARCH)/spi_hw.c ap.srcs += inter_mcu.c link_mcu.c spi.c $(SRC_ARCH)/spi_hw.c
@@ -243,7 +243,7 @@ test.srcs += sys_time.c $(SRC_ARCH)/sys_time_hw.c $(SRC_ARCH)/armVIC.c pprz_tran
# Config for SITL simulation # Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"classix.h\" -DAGR_CLIMB -DLOITER_TRIM sim.CFLAGS += -DBOARD_CONFIG=\"classix.h\" -DAGR_CLIMB -DLOITER_TRIM
#sim.srcs += traffic_info.c #sim.srcs += subsystems/navigation/traffic_info.c
sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c dc.c sim.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c dc.c
# chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c # chemotaxis.c anemotaxis.c subsystems/navigation/discsurvey.c subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
conf/airframes/tiny_hitl.xml
+1 -1
View File
@@ -206,7 +206,7 @@ ap.CFLAGS += -DHITL -UGPS_CONFIGURE -UUART0_BAUD -DUART0_BAUD=B57600
# Config for SITL simulation # Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN 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 traffic_info.c sim.srcs += subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c subsystems/navigation/traffic_info.c
</makefile> </makefile>
</airframe> </airframe>
conf/autopilot/subsystems/fixedwing/navigation.makefile
+1 -1
View File
@@ -5,7 +5,7 @@
$(TARGET).CFLAGS += -DNAV $(TARGET).CFLAGS += -DNAV
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c $(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c
$(TARGET).srcs += $(SRC_FIXEDWING)/traffic_info.c $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/traffic_info.c
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c $(SRC_SUBSYSTEMS)/navigation/nav_line.c $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c $(SRC_SUBSYSTEMS)/navigation/nav_line.c
conf/autopilot/subsystems/fixedwing/navigation_extra.makefile
+1 -1
View File
@@ -5,7 +5,7 @@
$(TARGET).CFLAGS += -DNAV $(TARGET).CFLAGS += -DNAV
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c $(TARGET).srcs += $(SRC_SUBSYSTEMS)/nav.c
$(TARGET).srcs += $(SRC_FIXEDWING)/traffic_info.c $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/traffic_info.c
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c $(SRC_SUBSYSTEMS)/navigation/nav_line.c $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_survey_rectangle.c $(SRC_SUBSYSTEMS)/navigation/nav_line.c
$(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_cube.c $(TARGET).srcs += $(SRC_SUBSYSTEMS)/navigation/nav_cube.c
sw/airborne/arch/avr/ant_tracker.c
+1 -1
View File
@@ -1,6 +1,6 @@
#include "ant_tracker.h" #include "ant_tracker.h"
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
uint8_t ant_track_mode; uint8_t ant_track_mode;
float ant_track_azim; float ant_track_azim;
sw/airborne/arch/sim/jsbsim_hw.h
+1 -1
View File
@@ -33,7 +33,7 @@
#include "firmwares/fixedwing/autopilot.h" #include "firmwares/fixedwing/autopilot.h"
#include "estimator.h" #include "estimator.h"
#include "gps.h" #include "gps.h"
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
#include "flight_plan.h" #include "flight_plan.h"
#include "airframe.h" #include "airframe.h"
#include "settings.h" #include "settings.h"
sw/airborne/arch/sim/sim_ap.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "autopilot.h" #include "autopilot.h"
#include "estimator.h" #include "estimator.h"
#include "gps.h" #include "gps.h"
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
#include "flight_plan.h" #include "flight_plan.h"
#include "settings.h" #include "settings.h"
#include "subsystems/nav.h" #include "subsystems/nav.h"
sw/airborne/arch/sim/sim_jsbsim.c
+1 -1
View File
@@ -12,7 +12,7 @@
#include "autopilot.h" #include "autopilot.h"
#include "estimator.h" #include "estimator.h"
#include "gps.h" #include "gps.h"
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
#include "flight_plan.h" #include "flight_plan.h"
#include "settings.h" #include "settings.h"
#include "subsystems/nav.h" #include "subsystems/nav.h"
sw/airborne/datalink.c
+1 -1
View File
@@ -36,7 +36,7 @@
#include "modules.h" #include "modules.h"
#ifdef TRAFFIC_INFO #ifdef TRAFFIC_INFO
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
#endif // TRAFFIC_INFO #endif // TRAFFIC_INFO
#ifdef USE_JOYSTICK #ifdef USE_JOYSTICK
sw/airborne/firmwares/fixedwing/main_ap.c
+1 -1
View File
@@ -73,7 +73,7 @@
#endif #endif
#ifdef TRAFFIC_INFO #ifdef TRAFFIC_INFO
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
#endif #endif
#ifdef USE_USB_SERIAL #ifdef USE_USB_SERIAL
sw/airborne/modules/cam_control/cam.c
+1 -1
View File
@@ -32,7 +32,7 @@
#include "autopilot.h" #include "autopilot.h"
#include "flight_plan.h" #include "flight_plan.h"
#include "estimator.h" #include "estimator.h"
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
#ifdef POINT_CAM #ifdef POINT_CAM
#include "point.h" #include "point.h"
#endif // POINT_CAM #endif // POINT_CAM
sw/airborne/modules/multi/formation.h
+1 -1
View File
@@ -8,7 +8,7 @@
#define FORMATION_H #define FORMATION_H
#include "subsystems/nav.h" #include "subsystems/nav.h"
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
#define FORM_MODE_GLOBAL 0 #define FORM_MODE_GLOBAL 0
#define FORM_MODE_COURSE 1 #define FORM_MODE_COURSE 1
sw/airborne/modules/multi/potential.h
+1 -1
View File
@@ -8,7 +8,7 @@
#define POTENTIAL_H #define POTENTIAL_H
#include "subsystems/nav.h" #include "subsystems/nav.h"
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
struct force_ { struct force_ {
float east; float east;
sw/airborne/modules/multi/tcas.h
+1 -1
View File
@@ -31,7 +31,7 @@
#define TCAS_H #define TCAS_H
#include "std.h" #include "std.h"
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
extern float tcas_alt_setpoint; extern float tcas_alt_setpoint;
extern float tcas_tau_ta, tcas_tau_ra, tcas_dmod, tcas_alim; extern float tcas_tau_ta, tcas_tau_ra, tcas_dmod, tcas_alim;
sw/airborne/subsystems/nav.c
+1 -1
View File
@@ -37,7 +37,7 @@
#include "firmwares/fixedwing/guidance/guidance_v.h" #include "firmwares/fixedwing/guidance/guidance_v.h"
#include "firmwares/fixedwing/autopilot.h" #include "firmwares/fixedwing/autopilot.h"
#include "inter_mcu.h" #include "inter_mcu.h"
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
#include "latlong.h" #include "latlong.h"
#define RCLost() bit_is_set(fbw_state->status, RADIO_REALLY_LOST) #define RCLost() bit_is_set(fbw_state->status, RADIO_REALLY_LOST)
sw/airborne/traffic_info.c → sw/airborne/subsystems/navigation/traffic_info.c
+1 -1
View File
@@ -27,7 +27,7 @@
*/ */
#include <inttypes.h> #include <inttypes.h>
#include "traffic_info.h" #include "subsystems/navigation/traffic_info.h"
#include "airframe.h" #include "airframe.h"
uint8_t acs_idx; uint8_t acs_idx;
sw/airborne/traffic_info.h → sw/airborne/subsystems/navigation/traffic_info.h
View File