Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 2 additions & 7 deletions src/main/target/BLADE_F4/target.h
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

#pragma once

#define TARGET_BOARD_IDENTIFIER "RUSH"
#define TARGET_BOARD_IDENTIFIER "BLF4"
#define USBD_PRODUCT_STRING "BLADE_F4"

#define USE_TARGET_CONFIG
Expand All @@ -44,11 +44,6 @@
#define SPI2_FLASH_PIN PA15


#define USE_SPI_DEVICE_3
#define SPI3_SCK_PIN PC10
#define SPI3_MISO_PIN PC11
#define SPI3_MOSI_PIN PB5

#define USE_I2C
#define USE_I2C_DEVICE_1
#define I2C1_SCL PB8
Expand Down Expand Up @@ -158,7 +153,7 @@
#define CURRENT_METER_SCALE 250


#define DEFAULT_FEATURES (FEATURE_TX_PROF_SEL | FEATURE_OSD | FEATURE_CURRENT_METER | FEATURE_VBAT | FEATURE_TELEMETRY | FEATURE_SOFTSERIAL )
#define DEFAULT_FEATURES (FEATURE_TX_PROF_SEL | FEATURE_OSD | FEATURE_CURRENT_METER | FEATURE_VBAT | FEATURE_TELEMETRY)

/*** Timer/PWM output ***/
#define USE_SERIAL_4WAY_BLHELI_INTERFACE
Expand Down
11 changes: 0 additions & 11 deletions src/main/target/BLADE_PRO_H7/target.c
Original file line number Diff line number Diff line change
Expand Up @@ -36,11 +36,6 @@ BUSDEV_REGISTER_SPI_TAG(busdev_bmi270_1, DEVHW_BMI270, BMI270_SPI_BUS_1, B
BUSDEV_REGISTER_SPI_TAG(busdev_bmi270_2, DEVHW_BMI270, BMI270_SPI_BUS_2, BMI270_CS_PIN_2, BMI270_EXTI_PIN_2, DEVFLAGS_NONE, 1, IMU_BMI270_ALIGN_2);

timerHardware_t timerHardware[] = {
// DEF_TIM(TIM3, CH3, PB0, TIM_USE_OUTPUT_AUTO, 0, 0), // S1
// DEF_TIM(TIM3, CH4, PB1, TIM_USE_OUTPUT_AUTO, 0, 1), // S2
// DEF_TIM(TIM5, CH1, PA0, TIM_USE_OUTPUT_AUTO, 0, 2), // S3
// DEF_TIM(TIM5, CH2, PA1, TIM_USE_OUTPUT_AUTO, 0, 3), // S4

DEF_TIM(TIM3, CH4, PB1, TIM_USE_OUTPUT_AUTO, 0, 0), // S2
DEF_TIM(TIM3, CH3, PB0, TIM_USE_OUTPUT_AUTO, 0, 1), // S1
DEF_TIM(TIM5, CH2, PA1, TIM_USE_OUTPUT_AUTO, 0, 2), // S4
Expand All @@ -56,12 +51,6 @@ timerHardware_t timerHardware[] = {
DEF_TIM(TIM4, CH4, PD15, TIM_USE_OUTPUT_AUTO, 0, 0), // S10 DMA_NONE
DEF_TIM(TIM4, CH3, PD14, TIM_USE_OUTPUT_AUTO, 0, 0), // S9


// DEF_TIM(TIM4, CH3, PD14, TIM_USE_OUTPUT_AUTO, 0, 0), // S9
// DEF_TIM(TIM4, CH4, PD15, TIM_USE_OUTPUT_AUTO, 0, 0), // S10 DMA_NONE
// DEF_TIM(TIM15, CH1, PE5, TIM_USE_OUTPUT_AUTO, 0, 0), // S11
// DEF_TIM(TIM15, CH2, PE6, TIM_USE_OUTPUT_AUTO, 0, 0), // S12 DMA_NONE

DEF_TIM(TIM1, CH1, PA8, TIM_USE_LED, 0, 9), // LED_2812
DEF_TIM(TIM2, CH1, PA15, TIM_USE_BEEPER, 0, 0), // BEEPER PWM

Expand Down
10 changes: 5 additions & 5 deletions src/main/target/BLADE_PRO_H7/target.h
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

#pragma once

#define TARGET_BOARD_IDENTIFIER "RUSH"
#define TARGET_BOARD_IDENTIFIER "BLPH"
#define USBD_PRODUCT_STRING "BLADE_PRO_H7"

#define USE_TARGET_CONFIG
Expand Down Expand Up @@ -76,21 +76,21 @@
// MPU6000
#define USE_IMU_MPU6000
#define IMU_MPU6000_ALIGN_2 CW270_DEG
#define MPU6000_SPI_BUS_2 BUS_SPI1
#define MPU6000_SPI_BUS_2 BUS_SPI4
#define MPU6000_CS_PIN_2 SPI4_NSS_PIN
#define MPU6000_EXTI_PIN_2 SPI4_EXTI_PIN

// ICM42605/ICM42688P
#define USE_IMU_ICM42605
#define IMU_ICM42605_ALIGN_2 CW270_DEG
#define ICM42605_SPI_BUS_2 BUS_SPI1
#define ICM42605_SPI_BUS_2 BUS_SPI4
#define ICM42605_CS_PIN_2 SPI4_NSS_PIN
#define ICM42605_EXTI_PIN_2 SPI4_EXTI_PIN

//BMI270
#define USE_IMU_BMI270
#define IMU_BMI270_ALIGN_2 CW270_DEG
#define BMI270_SPI_BUS_2 BUS_SPI1
#define BMI270_SPI_BUS_2 BUS_SPI4
#define BMI270_CS_PIN_2 SPI4_NSS_PIN
#define BMI270_EXTI_PIN_2 SPI4_EXTI_PIN

Expand Down Expand Up @@ -228,6 +228,6 @@
#define TARGET_IO_PORTD 0xffff
#define TARGET_IO_PORTE 0xffff

#define MAX_PWM_OUTPUT_PORTS 15
#define MAX_PWM_OUTPUT_PORTS 13
#define USE_DSHOT
#define USE_ESC_SENSOR