Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[target] Clear some unused defitions #8517

Merged
merged 1 commit into from Nov 3, 2022
Merged

[target] Clear some unused defitions #8517

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 0 additions & 4 deletions src/main/target/AOCODARCF4V2/target.h
View file
Open in desktop
Expand Up @@ -31,10 +31,6 @@


// ******* GYRO and ACC ********
#define USE_EXTI
#define GYRO_INT_EXTI PC4
#define USE_MPU_DATA_READY_SIGNAL

#define USE_IMU_MPU6500
#define IMU_MPU6500_ALIGN CW0_DEG
#define MPU6500_SPI_BUS BUS_SPI1
Expand Down
6 changes: 3 additions & 3 deletions src/main/target/HAKRCF405D/target.c
View file
Open in desktop
Expand Up @@ -24,9 +24,9 @@
#include "drivers/pinio.h"
#include "drivers/sensor.h"

BUSDEV_REGISTER_SPI_TAG(busdev_bmi270, DEVHW_BMI270, BMI270_SPI_BUS, BMI270_CS_PIN, BMI270_EXTI_PIN, 0, DEVFLAGS_NONE, IMU_BMI270_ALIGN);
BUSDEV_REGISTER_SPI_TAG(busdev_icm42688, DEVHW_ICM42605, ICM42605_SPI_BUS, ICM42605_CS_PIN, ICM42605_EXTI_PIN, 0, DEVFLAGS_NONE, IMU_ICM42605_ALIGN);
BUSDEV_REGISTER_SPI_TAG(busdev_mpu6000, DEVHW_MPU6000, MPU6000_SPI_BUS, MPU6000_CS_PIN, MPU6000_EXTI_PIN, 0, DEVFLAGS_NONE, IMU_MPU6000_ALIGN);
BUSDEV_REGISTER_SPI_TAG(busdev_bmi270, DEVHW_BMI270, BMI270_SPI_BUS, BMI270_CS_PIN, NONE, 0, DEVFLAGS_NONE, IMU_BMI270_ALIGN);
BUSDEV_REGISTER_SPI_TAG(busdev_icm42688, DEVHW_ICM42605, ICM42605_SPI_BUS, ICM42605_CS_PIN, NONE, 0, DEVFLAGS_NONE, IMU_ICM42605_ALIGN);
BUSDEV_REGISTER_SPI_TAG(busdev_mpu6000, DEVHW_MPU6000, MPU6000_SPI_BUS, MPU6000_CS_PIN, NONE, 0, DEVFLAGS_NONE, IMU_MPU6000_ALIGN);


timerHardware_t timerHardware[] = {
Expand Down
9 changes: 1 addition & 8 deletions src/main/target/HAKRCF405D/target.h
View file
Open in desktop
Expand Up @@ -54,32 +54,25 @@
#define I2C1_SDA PB7

/*** IMU sensors ***/
#define USE_EXTI

#define GYRO_INT_EXTI PC3
#define USE_MPU_DATA_READY_SIGNAL

#define USE_TARGET_IMU_HARDWARE_DESCRIPTORS

// MPU6000
#define USE_IMU_MPU6000
#define IMU_MPU6000_ALIGN CW270_DEG
#define MPU6000_SPI_BUS BUS_SPI1
#define MPU6000_CS_PIN SPI1_NSS_PIN
#define MPU6000_EXTI_PIN GYRO_INT_EXTI

// ICM42605/ICM42688P
#define USE_IMU_ICM42605
#define IMU_ICM42605_ALIGN CW270_DEG
#define ICM42605_SPI_BUS BUS_SPI1
#define ICM42605_CS_PIN SPI1_NSS_PIN
#define ICM42605_EXTI_PIN GYRO_INT_EXTI

//BMI270
#define USE_IMU_BMI270
#define IMU_BMI270_ALIGN CW270_DEG
#define BMI270_SPI_BUS BUS_SPI1
#define BMI270_CS_PIN SPI1_NSS_PIN
#define BMI270_EXTI_PIN GYRO_INT_EXTI

/*** OSD ***/
#define USE_MAX7456
Expand Down
8 changes: 1 addition & 7 deletions src/main/target/HAKRCF411D/target.h
View file
Open in desktop
Expand Up @@ -47,30 +47,24 @@
#define I2C1_SDA PB9

/*** IMU sensors ***/
#define USE_EXTI

#define GYRO_INT_EXTI PA1
#define USE_MPU_DATA_READY_SIGNAL

// MPU6000
#define USE_IMU_MPU6000
#define IMU_MPU6000_ALIGN CW180_DEG
#define MPU6000_SPI_BUS BUS_SPI1
#define MPU6000_CS_PIN SPI1_NSS_PIN
#define MPU6000_EXTI_PIN GYRO_INT_EXTI

// ICM42605/ICM42688P
#define USE_IMU_ICM42605
#define IMU_ICM42605_ALIGN CW180_DEG
#define ICM42605_SPI_BUS BUS_SPI1
#define ICM42605_CS_PIN SPI1_NSS_PIN
#define ICM42605_EXTI_PIN GYRO_INT_EXTI

//BMI270
#define USE_IMU_BMI270
#define IMU_BMI270_ALIGN CW180_DEG
#define BMI270_SPI_BUS BUS_SPI1
#define BMI270_CS_PIN SPI1_NSS_PIN
#define BMI270_EXTI_PIN GYRO_INT_EXTI

/*** OSD ***/
#define USE_MAX7456
Expand Down
6 changes: 3 additions & 3 deletions src/main/target/HAKRCKD722/target.c
View file
Open in desktop
Expand Up @@ -25,9 +25,9 @@
#include "drivers/pinio.h"
#include "drivers/sensor.h"

BUSDEV_REGISTER_SPI_TAG(busdev_bmi270, DEVHW_BMI270, BMI270_SPI_BUS, BMI270_CS_PIN, BMI270_EXTI_PIN, 0, DEVFLAGS_NONE, IMU_BMI270_ALIGN);
BUSDEV_REGISTER_SPI_TAG(busdev_icm42688, DEVHW_ICM42605, ICM42605_SPI_BUS, ICM42605_CS_PIN, ICM42605_EXTI_PIN, 0, DEVFLAGS_NONE, IMU_ICM42605_ALIGN);
BUSDEV_REGISTER_SPI_TAG(busdev_mpu6000, DEVHW_MPU6000, MPU6000_SPI_BUS, MPU6000_CS_PIN, MPU6000_EXTI_PIN, 0, DEVFLAGS_NONE, IMU_MPU6000_ALIGN);
BUSDEV_REGISTER_SPI_TAG(busdev_bmi270, DEVHW_BMI270, BMI270_SPI_BUS, BMI270_CS_PIN, NONE, 0, DEVFLAGS_NONE, IMU_BMI270_ALIGN);
BUSDEV_REGISTER_SPI_TAG(busdev_icm42688, DEVHW_ICM42605, ICM42605_SPI_BUS, ICM42605_CS_PIN, NONE, 0, DEVFLAGS_NONE, IMU_ICM42605_ALIGN);
BUSDEV_REGISTER_SPI_TAG(busdev_mpu6000, DEVHW_MPU6000, MPU6000_SPI_BUS, MPU6000_CS_PIN, NONE, 0, DEVFLAGS_NONE, IMU_MPU6000_ALIGN);

timerHardware_t timerHardware[] = {
DEF_TIM(TIM9, CH2, PA3, TIM_USE_PPM, 0, 0), // PPM
Expand Down
6 changes: 0 additions & 6 deletions src/main/target/HAKRCKD722/target.h
View file
Open in desktop
Expand Up @@ -73,22 +73,16 @@
#define IMU_ICM42605_ALIGN CW180_DEG
#define ICM42605_SPI_BUS BUS_SPI1
#define ICM42605_CS_PIN PB2
#define ICM42605_EXTI_PIN PC4

#define USE_IMU_BMI270
#define IMU_BMI270_ALIGN CW180_DEG
#define BMI270_SPI_BUS BUS_SPI1
#define BMI270_CS_PIN PB2
#define BMI270_EXTI_PIN PC4

#define USE_IMU_MPU6000
#define IMU_MPU6000_ALIGN CW180_DEG
#define MPU6000_SPI_BUS BUS_SPI1
#define MPU6000_CS_PIN PB2
#define MPU6000_EXTI_PIN PC4

#define USE_EXTI
#define USE_MPU_DATA_READY_SIGNAL

/*** I2C (Baro & Mag) ***/
#define USE_I2C
Expand Down
5 changes: 0 additions & 5 deletions src/main/target/MAMBAF722_WING/target.h
View file
Open in desktop
Expand Up @@ -31,15 +31,10 @@
#define BEEPER_INVERTED

// ******* GYRO and ACC ********
#define USE_EXTI
#define GYRO_INT_EXTI PC4
#define USE_MPU_DATA_READY_SIGNAL

#define USE_IMU_ICM42605
#define IMU_ICM42605_ALIGN CW90_DEG
#define ICM42605_SPI_BUS BUS_SPI1
#define ICM42605_CS_PIN SPI1_NSS_PIN
#define ICM42605_EXTI_PIN GYRO_INT_EXTI

#define USE_I2C

Expand Down
2 changes: 1 addition & 1 deletion src/main/target/SPEEDYBEEF405V3/target.c
View file
Open in desktop
Expand Up @@ -32,7 +32,7 @@
#include "drivers/pinio.h"
#include "drivers/sensor.h"

BUSDEV_REGISTER_SPI_TAG(busdev_bmi270, DEVHW_BMI270, BMI270_SPI_BUS, BMI270_CS_PIN, BMI270_EXTI_PIN, 0, DEVFLAGS_NONE, IMU_BMI270_ALIGN);
BUSDEV_REGISTER_SPI_TAG(busdev_bmi270, DEVHW_BMI270, BMI270_SPI_BUS, BMI270_CS_PIN, NONE, 0, DEVFLAGS_NONE, IMU_BMI270_ALIGN);

timerHardware_t timerHardware[] = {
DEF_TIM(TIM4, CH1, PB6, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR, 0, 0), // S1
Expand Down
4 changes: 0 additions & 4 deletions src/main/target/SPEEDYBEEF405V3/target.h
View file
Open in desktop
Expand Up @@ -80,10 +80,6 @@
#define IMU_BMI270_ALIGN CW0_DEG
#define BMI270_SPI_BUS BUS_SPI1
#define BMI270_CS_PIN PA4
#define BMI270_EXTI_PIN PC4

#define USE_EXTI
#define USE_MPU_DATA_READY_SIGNAL

// *************** I2C(Baro & I2C) **************************
#define USE_I2C
Expand Down
2 changes: 0 additions & 2 deletions src/main/target/SPEEDYBEEF745AIO/target.h
View file
Open in desktop
Expand Up @@ -73,7 +73,6 @@

#define USE_IMU_MPU6000
#define IMU_MPU6000_ALIGN CW90_DEG
#define GYRO_INT_EXTI PE1
#define MPU6000_CS_PIN PE4
#define MPU6000_SPI_BUS BUS_SPI4

Expand All @@ -82,7 +81,6 @@
#define IMU_BMI270_ALIGN CW90_DEG
#define BMI270_SPI_BUS BUS_SPI4
#define BMI270_CS_PIN PE4
#define BMI270_EXTI_PIN GYRO_INT_EXTI

// *************** I2C(Baro & I2C) **************************
#define USE_I2C
Expand Down
20 changes: 2 additions & 18 deletions src/main/target/ZEEZF7/target.h
View file
Open in desktop
Expand Up @@ -47,9 +47,6 @@
#define USE_SPI

#ifdef ZEEZF7V3
#define USE_EXTI
#define USE_MPU_DATA_READY_SIGNAL
#define GYRO_INT_EXTI PC13

#define USE_SPI_DEVICE_3

Expand All @@ -64,15 +61,13 @@
#define IMU_ICM42605_ALIGN CW0_DEG
#define ICM42605_SPI_BUS BUS_SPI3
#define ICM42605_CS_PIN SPI3_NSS_PIN
#define ICM42605_EXTI_PIN GYRO_INT_EXTI

// *************** SPI3 IMU0 BMI270 **************
#define USE_IMU_BMI270

#define IMU_BMI270_ALIGN CW270_DEG
#define BMI270_SPI_BUS BUS_SPI3
#define BMI270_CS_PIN SPI3_NSS_PIN
#define BMI270_EXTI_PIN GYRO_INT_EXTI
#endif

#ifdef ZEEZF7V2
Expand All @@ -84,11 +79,7 @@

#define MPU6000_CS_PIN SPI1_NSS_PIN
#define MPU6000_SPI_BUS BUS_SPI1
#define GYRO_INT_EXTI PC4
#define IMU_MPU6000_ALIGN CW0_DEG

#define USE_EXTI
#define USE_MPU_DATA_READY_SIGNAL
#define USE_IMU_MPU6000
#endif

Expand All @@ -102,12 +93,8 @@

#define MPU6000_CS_PIN SPI2_NSS_PIN
#define MPU6000_SPI_BUS BUS_SPI2
#define GYRO_INT_EXTI PC9

#define IMU_MPU6000_ALIGN CW0_DEG_FLIP

#define USE_EXTI
#define USE_MPU_DATA_READY_SIGNAL
#define USE_IMU_MPU6000
#endif

Expand Down Expand Up @@ -175,10 +162,6 @@
#define USE_SDCARD_SPI
#endif

#define USE_FLASHFS
#define USE_FLASH_M25P16
#define USE_FLASH_W25N01G
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#endif

#ifdef ZEEZF7
Expand All @@ -194,11 +177,12 @@
#define W25N01G_SPI_BUS BUS_SPI1
#define W25N01G_CS_PIN SPI1_NSS_PIN

#endif

#define USE_FLASHFS
#define USE_FLASH_M25P16
#define USE_FLASH_W25N01G
#define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT
#endif

// *************** OSD *****************************
#define USE_MAX7456
Expand Down