Mirrors_Framework/paparazzi
1
0
Fork 0
mirror of https://github.com/paparazzi/paparazzi.git synced 2026-06-04 13:55:40 +08:00
Code Issues Actions 30 Packages Projects Releases Wiki Activity

Trivial name changes

Browse Source
This commit is contained in:
kevindehecker
2016-03-30 16:52:07 +02:00
parent 7eb1e00c54
commit 7c3ecd27ae
2 changed files with 20 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files
conf/firmwares/subsystems/shared/imu_px4fmu_v2.4.makefile
+16 -17
View File
@@ -7,43 +7,42 @@
include $(CFG_SHARED)/spi_master.makefile include $(CFG_SHARED)/spi_master.makefile
IMU_PX4FMU_CFLAGS += -DIMU_TYPE_H=\"imu/imu_px4fmu_v2.4.h\" IMU_PX4FMU_CFLAGS += -DIMU_TYPE_H=\"imu/imu_px4fmu_v2.4.h\"
IMU_CFLAGS = -DIMU_TYPE_H=\"imu/imu_px4fmu_v2.4.h\" IMU_PX4FMU_SRCS = $(SRC_SUBSYSTEMS)/imu.c
IMU_SRCS = $(SRC_SUBSYSTEMS)/imu.c IMU_PX4FMU_SRCS += $(SRC_SUBSYSTEMS)/imu/imu_px4fmu_v2.4.c
IMU_SRCS += $(SRC_SUBSYSTEMS)/imu/imu_px4fmu_v2.4.c
#L3GD20 gyro #L3GD20 gyro
IMU_SRCS += peripherals/l3gd20_spi.c IMU_PX4FMU_SRCS += peripherals/l3gd20_spi.c
#LSM303D accelero + magneto #LSM303D accelero + magneto
IMU_SRCS += peripherals/lsm303dlhc_spi.c IMU_PX4FMU_SRCS += peripherals/lsm303dlhc_spi.c
# for fixedwing firmware and ap only # for fixedwing firmware and ap only
ifeq ($(TARGET), ap) ifeq ($(TARGET), ap)
IMU_CFLAGS += -DUSE_IMU IMU_PX4FMU_CFLAGS += -DUSE_IMU
endif endif
# set default SPI device # set default SPI device
IMU_SPI_DEV ?= spi1 IMU_PX4FMU_SPI_DEV ?= spi1
# convert spix to upper/lower case # convert spix to upper/lower case
IMU_SPI_DEV_UPPER=$(shell echo $(IMU_SPI_DEV) | tr a-z A-Z) IMU_PX4FMU_SPI_DEV_UPPER=$(shell echo $(IMU_PX4FMU_SPI_DEV) | tr a-z A-Z)
IMU_SPI_DEV_LOWER=$(shell echo $(IMU_SPI_DEV) | tr A-Z a-z) IMU_PX4FMU_SPI_DEV_LOWER=$(shell echo $(IMU_PX4FMU_SPI_DEV) | tr A-Z a-z)
IMU_CFLAGS += -DIMU_SPI_DEV=$(IMU_SPI_DEV_LOWER) IMU_PX4FMU_CFLAGS += -DIMU_PX4FMU_SPI_DEV=$(IMU_PX4FMU_SPI_DEV_LOWER)
IMU_CFLAGS += -DUSE_$(IMU_SPI_DEV_UPPER) IMU_PX4FMU_CFLAGS += -DUSE_$(IMU_PX4FMU_SPI_DEV_UPPER)
#********** L3GD20 *********** #********** L3GD20 ***********
IMU_L3G_SPI_SLAVE_IDX ?= SPI_SLAVE0 IMU_L3G_SPI_SLAVE_IDX ?= SPI_SLAVE0
IMU_CFLAGS += -DIMU_L3G_SPI_SLAVE_IDX=$(IMU_L3G_SPI_SLAVE_IDX) IMU_PX4FMU_CFLAGS += -DIMU_L3G_SPI_SLAVE_IDX=$(IMU_L3G_SPI_SLAVE_IDX)
IMU_CFLAGS += -DUSE_$(IMU_L3G_SPI_SLAVE_IDX) IMU_PX4FMU_CFLAGS += -DUSE_$(IMU_L3G_SPI_SLAVE_IDX)
#********** LSM303dlhc *********** #********** LSM303dlhc ***********
IMU_LSM_SPI_SLAVE_IDX ?= SPI_SLAVE1 IMU_LSM_SPI_SLAVE_IDX ?= SPI_SLAVE1
IMU_CFLAGS += -DIMU_LSM_SPI_SLAVE_IDX=$(IMU_LSM_SPI_SLAVE_IDX) IMU_PX4FMU_CFLAGS += -DIMU_LSM_SPI_SLAVE_IDX=$(IMU_LSM_SPI_SLAVE_IDX)
IMU_CFLAGS += -DUSE_$(IMU_LSM_SPI_SLAVE_IDX) IMU_PX4FMU_CFLAGS += -DUSE_$(IMU_LSM_SPI_SLAVE_IDX)
# add it for all targets except sim, fbw and nps # add it for all targets except sim, fbw and nps
ifeq (,$(findstring $(TARGET),sim fbw nps)) ifeq (,$(findstring $(TARGET),sim fbw nps))
$(TARGET).CFLAGS += $(IMU_CFLAGS) $(TARGET).CFLAGS += $(IMU_PX4FMU_CFLAGS)
$(TARGET).srcs += $(IMU_SRCS) $(TARGET).srcs += $(IMU_PX4FMU_SRCS)
endif endif
# #
sw/airborne/subsystems/imu/imu_px4fmu_v2.4.c
+4 -4
View File
@@ -36,7 +36,7 @@
/* SPI defaults set in subsystem makefile, can be configured from airframe file */ /* SPI defaults set in subsystem makefile, can be configured from airframe file */
PRINT_CONFIG_VAR(IMU_LSM_SPI_SLAVE_IDX) PRINT_CONFIG_VAR(IMU_LSM_SPI_SLAVE_IDX)
PRINT_CONFIG_VAR(IMU_L3G_SPI_SLAVE_IDX) PRINT_CONFIG_VAR(IMU_L3G_SPI_SLAVE_IDX)
PRINT_CONFIG_VAR(IMU_SPI_DEV) PRINT_CONFIG_VAR(IMU_PX4FMU_SPI_DEV)
struct ImuPX4 imu_px4; struct ImuPX4 imu_px4;
@@ -45,12 +45,12 @@ void imu_impl_init(void)
/* L3GD20 gyro init */ /* L3GD20 gyro init */
/* initialize gyro and set default options */ /* initialize gyro and set default options */
l3gd20_spi_init(&imu_px4.l3g, &IMU_SPI_DEV, IMU_L3G_SPI_SLAVE_IDX); l3gd20_spi_init(&imu_px4.l3g, &IMU_PX4FMU_SPI_DEV, IMU_L3G_SPI_SLAVE_IDX);
/* LSM303dlhc acc + magneto init */ /* LSM303dlhc acc + magneto init */
lsm303dlhc_spi_init(&imu_px4.lsm_acc, &IMU_SPI_DEV, IMU_LSM_SPI_SLAVE_IDX, LSM_TARGET_ACC); lsm303dlhc_spi_init(&imu_px4.lsm_acc, &IMU_PX4FMU_SPI_DEV, IMU_LSM_SPI_SLAVE_IDX, LSM_TARGET_ACC);
#if !MODULE_HMC58XX_UPDATE_AHRS #if !MODULE_HMC58XX_UPDATE_AHRS
lsm303dlhc_spi_init(&imu_px4.lsm_mag, &IMU_SPI_DEV, IMU_LSM_SPI_SLAVE_IDX, LSM_TARGET_MAG); lsm303dlhc_spi_init(&imu_px4.lsm_mag, &IMU_PX4FMU_SPI_DEV, IMU_LSM_SPI_SLAVE_IDX, LSM_TARGET_MAG);
#endif #endif
} }