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

[conf] remove some now obsolete flags

Browse Source
This commit is contained in:
Felix Ruess
2013-10-23 22:47:24 +02:00
parent 3717ead582
commit 0bcdaeaaa6
9 changed files with 6 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/firmwares/subsystems/fixedwing/ahrs_gx3.makefile
+1 -2
View File
@@ -9,7 +9,6 @@ AHRS_ALIGNER_LED ?= none
AHRS_CFLAGS = -DUSE_AHRS AHRS_CFLAGS = -DUSE_AHRS
AHRS_CFLAGS += -DUSE_IMU AHRS_CFLAGS += -DUSE_IMU
AHRS_CFLAGS += -DUSE_IMU_FLOAT AHRS_CFLAGS += -DUSE_IMU_FLOAT
AHRS_CFLAGS += -DUSE_GX3
#fixedwings #fixedwings
AHRS_CFLAGS += -DAHRS_UPDATE_FW_ESTIMATOR AHRS_CFLAGS += -DAHRS_UPDATE_FW_ESTIMATOR
@@ -26,7 +25,7 @@ AHRS_SRCS += subsystems/ahrs/ahrs_gx3.c
GX3_PORT_LOWER=$(shell echo $(GX3_PORT) | tr A-Z a-z) GX3_PORT_LOWER=$(shell echo $(GX3_PORT) | tr A-Z a-z)
AHRS_CFLAGS += -DUSE_$(GX3_PORT) -D$(GX3_PORT)_BAUD=$(GX3_BAUD) AHRS_CFLAGS += -DUSE_$(GX3_PORT) -D$(GX3_PORT)_BAUD=$(GX3_BAUD)
AHRS_CFLAGS += -DUSE_GX3 -DGX3_PORT=$(GX3_PORT_LOWER) AHRS_CFLAGS += -DGX3_PORT=$(GX3_PORT_LOWER)
ap.CFLAGS += $(AHRS_CFLAGS) ap.CFLAGS += $(AHRS_CFLAGS)
ap.srcs += $(AHRS_SRCS) ap.srcs += $(AHRS_SRCS)
conf/firmwares/subsystems/fixedwing/ahrs_int_cmpl_euler.makefile
+1 -1
View File
@@ -4,7 +4,7 @@
USE_MAGNETOMETER ?= 1 USE_MAGNETOMETER ?= 1
AHRS_ALIGNER_LED ?= none AHRS_ALIGNER_LED ?= none
AHRS_CFLAGS = -DUSE_AHRS -DAHRS_UPDATE_FW_ESTIMATOR -DUSE_AHRS_CMPL_EULER AHRS_CFLAGS = -DUSE_AHRS -DAHRS_UPDATE_FW_ESTIMATOR
AHRS_CFLAGS += -DUSE_AHRS_ALIGNER AHRS_CFLAGS += -DUSE_AHRS_ALIGNER
ifneq ($(USE_MAGNETOMETER),0) ifneq ($(USE_MAGNETOMETER),0)
conf/firmwares/subsystems/rotorcraft/ahrs_ardrone2.makefile
+1 -1
View File
@@ -3,7 +3,7 @@
# Fixed point complementary filter using euler angles for attitude estimation # Fixed point complementary filter using euler angles for attitude estimation
# #
AHRS_CFLAGS = -DUSE_AHRS -DUSE_AHRS_ARDRONE2 AHRS_CFLAGS = -DUSE_AHRS
AHRS_CFLAGS += -DAHRS_TYPE_H=\"subsystems/ahrs/ahrs_ardrone2.h\" AHRS_CFLAGS += -DAHRS_TYPE_H=\"subsystems/ahrs/ahrs_ardrone2.h\"
AHRS_SRCS += subsystems/ahrs.c AHRS_SRCS += subsystems/ahrs.c
conf/firmwares/subsystems/rotorcraft/ahrs_gx3.makefile
+1 -2
View File
@@ -9,7 +9,6 @@ AHRS_CFLAGS = -DUSE_AHRS
AHRS_CFLAGS += -DAHRS_FLOAT AHRS_CFLAGS += -DAHRS_FLOAT
AHRS_CFLAGS += -DUSE_IMU AHRS_CFLAGS += -DUSE_IMU
AHRS_CFLAGS += -DUSE_IMU_FLOAT AHRS_CFLAGS += -DUSE_IMU_FLOAT
AHRS_CFLAGS += -DUSE_GX3
ifneq ($(AHRS_ALIGNER_LED),none) ifneq ($(AHRS_ALIGNER_LED),none)
AHRS_CFLAGS += -DAHRS_ALIGNER_LED=$(AHRS_ALIGNER_LED) AHRS_CFLAGS += -DAHRS_ALIGNER_LED=$(AHRS_ALIGNER_LED)
@@ -22,7 +21,7 @@ AHRS_SRCS += subsystems/ahrs/ahrs_gx3.c
GX3_PORT_LOWER=$(shell echo $(GX3_PORT) | tr A-Z a-z) GX3_PORT_LOWER=$(shell echo $(GX3_PORT) | tr A-Z a-z)
AHRS_CFLAGS += -DUSE_$(GX3_PORT) -D$(GX3_PORT)_BAUD=$(GX3_BAUD) AHRS_CFLAGS += -DUSE_$(GX3_PORT) -D$(GX3_PORT)_BAUD=$(GX3_BAUD)
AHRS_CFLAGS += -DUSE_GX3 -DGX3_PORT=$(GX3_PORT_LOWER) AHRS_CFLAGS += -DGX3_PORT=$(GX3_PORT_LOWER)
ap.CFLAGS += $(AHRS_CFLAGS) ap.CFLAGS += $(AHRS_CFLAGS)
ap.srcs += $(AHRS_SRCS) ap.srcs += $(AHRS_SRCS)
conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_euler.makefile
+1 -1
View File
@@ -6,7 +6,7 @@
USE_MAGNETOMETER ?= 1 USE_MAGNETOMETER ?= 1
AHRS_ALIGNER_LED ?= none AHRS_ALIGNER_LED ?= none
AHRS_CFLAGS = -DUSE_AHRS -DUSE_AHRS_CMPL_EULER AHRS_CFLAGS = -DUSE_AHRS
AHRS_CFLAGS += -DUSE_AHRS_ALIGNER AHRS_CFLAGS += -DUSE_AHRS_ALIGNER
ifneq ($(USE_MAGNETOMETER),0) ifneq ($(USE_MAGNETOMETER),0)
conf/firmwares/subsystems/rotorcraft/ahrs_int_cmpl_quat.makefile
+1 -1
View File
@@ -7,7 +7,7 @@
USE_MAGNETOMETER ?= 1 USE_MAGNETOMETER ?= 1
AHRS_CFLAGS = -DUSE_AHRS -DUSE_AHRS_CMPL_QUAT AHRS_CFLAGS = -DUSE_AHRS
AHRS_CFLAGS += -DUSE_AHRS_ALIGNER AHRS_CFLAGS += -DUSE_AHRS_ALIGNER
ifneq ($(USE_MAGNETOMETER),0) ifneq ($(USE_MAGNETOMETER),0)
conf/firmwares/subsystems/rotorcraft/stabilization_float_quat.makefile
-1
View File
@@ -1,5 +1,4 @@
STAB_ATT_CFLAGS = -DSTABILIZATION_ATTITUDE_TYPE_FLOAT STAB_ATT_CFLAGS = -DSTABILIZATION_ATTITUDE_TYPE_FLOAT
STAB_ATT_CFLAGS += -DSTABILIZATION_ATTITUDE_TYPE_QUAT
STAB_ATT_CFLAGS += -DSTABILIZATION_ATTITUDE_TYPE_H=\"stabilization/stabilization_attitude_quat_float.h\" STAB_ATT_CFLAGS += -DSTABILIZATION_ATTITUDE_TYPE_H=\"stabilization/stabilization_attitude_quat_float.h\"
STAB_ATT_SRCS = $(SRC_FIRMWARE)/stabilization/stabilization_attitude_ref_quat_float.c STAB_ATT_SRCS = $(SRC_FIRMWARE)/stabilization/stabilization_attitude_ref_quat_float.c
STAB_ATT_SRCS += $(SRC_FIRMWARE)/stabilization/stabilization_attitude_quat_float.c STAB_ATT_SRCS += $(SRC_FIRMWARE)/stabilization/stabilization_attitude_quat_float.c
conf/firmwares/subsystems/rotorcraft/stabilization_int_quat.makefile
-1
View File
@@ -1,5 +1,4 @@
STAB_ATT_CFLAGS = -DSTABILIZATION_ATTITUDE_TYPE_INT STAB_ATT_CFLAGS = -DSTABILIZATION_ATTITUDE_TYPE_INT
STAB_ATT_CFLAGS += -DSTABILIZATION_ATTITUDE_TYPE_QUAT
STAB_ATT_CFLAGS += -DSTABILIZATION_ATTITUDE_TYPE_H=\"stabilization/stabilization_attitude_quat_int.h\" STAB_ATT_CFLAGS += -DSTABILIZATION_ATTITUDE_TYPE_H=\"stabilization/stabilization_attitude_quat_int.h\"
STAB_ATT_SRCS = $(SRC_FIRMWARE)/stabilization/stabilization_attitude_ref_quat_int.c STAB_ATT_SRCS = $(SRC_FIRMWARE)/stabilization/stabilization_attitude_ref_quat_int.c
STAB_ATT_SRCS += $(SRC_FIRMWARE)/stabilization/stabilization_attitude_quat_int.c STAB_ATT_SRCS += $(SRC_FIRMWARE)/stabilization/stabilization_attitude_quat_int.c
conf/modules/rotorcraft_cam.xml
-1
View File
@@ -26,7 +26,6 @@
<periodic fun="rotorcraft_cam_periodic()" freq="10."/> <periodic fun="rotorcraft_cam_periodic()" freq="10."/>
<datalink message="ROTORCRAFT_CAM_STICK" fun="ROTORCRAFT_CAM_STICK_PARSE(dl_buffer)"/> <datalink message="ROTORCRAFT_CAM_STICK" fun="ROTORCRAFT_CAM_STICK_PARSE(dl_buffer)"/>
<makefile> <makefile>
<define name="USE_CAM"/>
<file name="rotorcraft_cam.c"/> <file name="rotorcraft_cam.c"/>
</makefile> </makefile>
</module> </module>