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

move bomb to subsystems/navigation

Browse Source
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
Download Patch File Download Diff File Expand all files Collapse all files
conf/airframes/ENAC/fixed-wing/drops.xml
+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>
conf/airframes/ENAC/fixed-wing/slayer2.xml
+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
conf/airframes/TUDelft/Trip50B.xml
+1 -1
View File
@@ -311,7 +311,7 @@ sim.CFLAGS += -DUSE_JOYSTICK
sim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL
# -DTEST_CAM
sim.srcs += cam.c point.c
sim.srcs += bomb.c
sim.srcs += subsystems/navigation/bomb.c
conf/airframes/TUDelft/holiday50.xml
+2 -2
View File
@@ -301,7 +301,7 @@ ap.srcs += cam.c point.c
# traffic_info.c
ap.CFLAGS += -DWIND_INFO -DSTRONG_WIND
ap.srcs += bomb.c
ap.srcs += subsystems/navigation/bomb.c
# Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
@@ -314,7 +314,7 @@ sim.CFLAGS += -DUSE_MODULES
sim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH_ROLL
# -DTEST_CAM
sim.srcs += cam.c point.c
sim.srcs += bomb.c
sim.srcs += subsystems/navigation/bomb.c
</makefile>
</airframe>
conf/airframes/mm/extra/press_t.xml
+1 -1
View File
@@ -280,7 +280,7 @@ ap.CFLAGS += -DUSE_BARO_SCP
ap.srcs += joystick.c
ap.CFLAGS += -DUSE_JOYSTICK
ap.srcs += bomb.c
ap.srcs += subsystems/navigation/bomb.c
ap.srcs += subsystems/navigation/snav.c
conf/airframes/mm/fixed-wing/drops.xml
+2 -2
View File
@@ -283,7 +283,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
@@ -299,7 +299,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-->
conf/airframes/mm/fixed-wing/funjetgfi3.xml
+1 -1
View File
@@ -235,7 +235,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c latlong.c subsystems/navigatio
#ap.CFLAGS += -DGYRO -DADXRS150
#ap.srcs += gyro.c
#ap.srcs += bomb.c
#ap.srcs += subsystems/navigation/bomb.c
#ap.srcs += traffic_info.c
ap.srcs += i2c.c arm7/i2c_hw.c dpicco.c
conf/airframes/mm/fixed-wing/funjetmm2.xml
+2 -2
View File
@@ -254,7 +254,7 @@ ap.srcs += subsystems/navigation/nav_survey_rectangle.c
ap.srcs += humid_sht.c
ap.CFLAGS += -DUSE_HUMID_SHT -DDAT_PIN=30 -DSCK_PIN=4
ap.srcs += bomb.c
ap.srcs += subsystems/navigation/bomb.c
ap.srcs += subsystems/navigation/snav.c
@@ -267,7 +267,7 @@ include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
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>
conf/airframes/mm/fixed-wing/twinstarmm.xml
+2 -2
View File
@@ -240,7 +240,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 += bomb.c
ap.srcs += subsystems/navigation/bomb.c
ap.srcs += subsystems/navigation/snav.c
@@ -253,7 +253,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>
conf/airframes/mm/hangar/black_one.xml
+2 -2
View File
@@ -252,7 +252,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
ap.CFLAGS += -DGYRO -DADXRS150
ap.srcs += gyro.c
ap.srcs += bomb.c
ap.srcs += subsystems/navigation/bomb.c
#Cap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM
#Cap.srcs += traffic_info.c point.c cam.c
@@ -271,7 +271,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 -DH_CTL_RATE_LOOP -DLOITER_TRIM -DIR_360
sim.srcs += bomb.c
sim.srcs += subsystems/navigation/bomb.c
#Csim.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM
#Csim.srcs += traffic_info.c point.c
conf/airframes/mm/hangar/glass_one1.xml
+1 -1
View File
@@ -261,7 +261,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
# Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM
sim.srcs += 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
conf/airframes/mm/hangar/glass_one2.xml
+1 -1
View File
@@ -232,7 +232,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
# Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM
sim.srcs += 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
conf/airframes/mm/hangar/glass_one3.xml
+1 -1
View File
@@ -259,7 +259,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
# Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM
sim.srcs += 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
conf/airframes/mm/hangar/mac06a.xml
+2 -2
View File
@@ -238,7 +238,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
ap.CFLAGS += -DGYRO -DADXRS150
ap.srcs += gyro.c
ap.srcs += bomb.c
ap.srcs += subsystems/navigation/bomb.c
@@ -250,7 +250,7 @@ ap.srcs += bomb.c
# Config for SITL simulation
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.srcs += bomb.c
sim.srcs += subsystems/navigation/bomb.c
</makefile>
</airframe>
conf/airframes/mm/hangar/red_one.xml
+2 -2
View File
@@ -265,7 +265,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c latlong.c subsystems/navigatio
ap.CFLAGS += -DGYRO -DADXRS150
ap.srcs += gyro.c
ap.srcs += bomb.c
ap.srcs += subsystems/navigation/bomb.c
ap.CFLAGS += -DCAM -DMOBILE_CAM -DPOINT_CAM -DPOINT_CAM_PITCH
ap.srcs += traffic_info.c point.c cam.c subsystems/navigation/nav_line.c
@@ -288,7 +288,7 @@ ap.CFLAGS += -DUSE_CURRENT
# Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny_1_1.h\" -DAGR_CLIMB -DH_CTL_RATE_LOOP -DLOITER_TRIM
sim.srcs += 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.srcs += traffic_info.c point.c cam.c subsystems/navigation/nav_line.c
conf/airframes/obsolete/microjet6.xml
+1 -1
View File
@@ -254,7 +254,7 @@ ap.srcs += subsystems/navigation/nav_line.c
# Config for SITL simulation
include $(PAPARAZZI_SRC)/conf/autopilot/sitl.makefile
sim.CFLAGS += -DBOARD_CONFIG=\"tiny.h\" -DAGR_CLIMB -DLOITER_TRIM -DALT_KALMAN -DUSE_BARO_MS5534A
sim.srcs += subsystems/navigation/nav_survey_rectangle.c $(SRC_ARCH)/sim_baro.c bomb.c subsystems/navigation/nav_line.c
sim.srcs += subsystems/navigation/nav_survey_rectangle.c $(SRC_ARCH)/sim_baro.c subsystems/navigation/bomb.c subsystems/navigation/nav_line.c
</makefile>
</airframe>
conf/airframes/obsolete/slayer1.xml
+2 -2
View File
@@ -229,7 +229,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
ap.srcs += subsystems/navigation/nav_line.c subsystems/navigation/nav_survey_rectangle.c
ap.CFLAGS += -DGYRO -DIDG300
ap.srcs += gyro.c bomb.c
ap.srcs += gyro.c subsystems/navigation/bomb.c
# Video switch
ap.CFLAGS += -DLIGHT_PIN_1=3 -DUSE_GPIO
@@ -244,7 +244,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 -DH_CTL_RATE_LOOP -DLOITER_TRIM -DALT_KALMAN
sim.srcs += bomb.c subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c
sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c subsystems/navigation/nav_line.c
</makefile>
</airframe>
conf/airframes/obsolete/storm1.xml
+2 -2
View File
@@ -275,7 +275,7 @@ ap.srcs += subsystems/nav.c fw_h_ctl.c fw_v_ctl.c
# ap.srcs += gyro.c
ap.srcs += traffic_info.c subsystems/navigation/nav_survey_rectangle.c
ap.srcs += bomb.c
ap.srcs += subsystems/navigation/bomb.c
# Hack to use the same tuning file than slayer1
ap.CFLAGS += -DUSE_GPIO
@@ -291,7 +291,7 @@ ap.srcs += $(SRC_ARCH)/gpio.c
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.srcs += traffic_info.c
sim.srcs += bomb.c subsystems/navigation/nav_survey_rectangle.c
sim.srcs += subsystems/navigation/bomb.c subsystems/navigation/nav_survey_rectangle.c
</makefile>
</airframe>
conf/airframes/obsolete/twinjet1.xml
+1 -1
View File
@@ -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 subsystems/navigation/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 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.CFLAGS += -DUSE_LIGHT
conf/airframes/obsolete/twinstar6.xml
+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 subsystems/navigation/discsurvey.c 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
</makefile>
conf/autopilot/subsystems/fixedwing/navigation_bomb.makefile
+1 -1
View File
@@ -3,5 +3,5 @@
#add these to all targets
$(TARGET).srcs += $(SRC_FIXEDWING)/bomb.c
$(TARGET).srcs += $(SRC_FIXEDWING)/subsystems/navigation/bomb.c
conf/flight_plans/IS.xml
+1 -1
View File
@@ -7,7 +7,7 @@
#include "chemotaxis.h"
#include "subsystems/navigation/discsurvey.h"
#include "subsystems/navigation/nav_line.h"
#include "bomb.h"
#include "subsystems/navigation/bomb.h"
#include "datalink.h"
</header>
<waypoints>
conf/flight_plans/grosslobke_demo.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<flight_plan alt="170" ground_alt="68" lat0="52.26483" lon0="9.99394" max_dist_from_home="1500" name="Gross Lobke Demo" qfu="270" security_height="60">
<header>
#include "bomb.h"
#include "subsystems/navigation/bomb.h"
#include "subsystems/navigation/nav_line.h"
#include "datalink.h"
</header>
conf/flight_plans/mav06.xml
+1 -1
View File
@@ -1,6 +1,6 @@
<flight_plan alt="100" ground_alt="59" lat0="30.6478" lon0="-86.3253" max_dist_from_home="1500" name="MAV06" qfu="90" security_height="25">
<header>
#include "bomb.h"
#include "subsystems/navigation/bomb.h"
#include "subsystems/navigation/nav_line.h"
</header>
<waypoints>
conf/flight_plans/mav07.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<flight_plan alt="225" ground_alt="175" lat0="43.53900" lon0="1.24500" max_dist_from_home="1500" name="MAV07" qfu="0" security_height="25">
<header>
#include "bomb.h"
#include "subsystems/navigation/bomb.h"
#include "datalink.h"
</header>
<waypoints>
conf/flight_plans/slayer_training.xml
+1 -1
View File
@@ -2,7 +2,7 @@
<flight_plan alt="75" ground_alt="0" lat0="43.4622" lon0="1.2729" max_dist_from_home="800" name="Versatile" qfu="270" security_height="25">
<header>
#include "bomb.h"
#include "subsystems/navigation/bomb.h"
</header>
<waypoints>
<waypoint name="HOME" x="0" y="0"/>
sw/airborne/bomb.c → sw/airborne/subsystems/navigation/bomb.c
+1 -1
View File
@@ -24,7 +24,7 @@
#include "estimator.h"
#include "subsystems/nav.h"
#include "bomb.h"
#include "subsystems/navigation/bomb.h"
#include "flight_plan.h"
#include "airframe.h"
#include "inter_mcu.h"
sw/airborne/bomb.h → sw/airborne/subsystems/navigation/bomb.h
View File