From 110b069b82139dcd145eb491ca2ed1d9401de593 Mon Sep 17 00:00:00 2001 From: Ray Morris Date: Sun, 19 Oct 2025 21:52:36 -0500 Subject: [PATCH] blueberryF435wing initial fixes --- src/main/target/BLUEBERRYF435WING/target.c | 24 +++++++++------------- src/main/target/BLUEBERRYF435WING/target.h | 23 +++++---------------- 2 files changed, 15 insertions(+), 32 deletions(-) diff --git a/src/main/target/BLUEBERRYF435WING/target.c b/src/main/target/BLUEBERRYF435WING/target.c index db0983b73f5..9c05660c1eb 100644 --- a/src/main/target/BLUEBERRYF435WING/target.c +++ b/src/main/target/BLUEBERRYF435WING/target.c @@ -25,27 +25,23 @@ #include "drivers/timer.h" timerHardware_t timerHardware[] = { - - // DEF_TIM(TMR1, CH3, PA10, TIM_USE_OUTPUT_AUTO, 0,2), // motor1 UART1 - // DEF_TIM(TMR1, CH2, PA9, TIM_USE_OUTPUT_AUTO, 0,9), // motor2 - UART1 - DEF_TIM(TMR3, CH4, PB1, TIM_USE_OUTPUT_AUTO, 0,3), // PWM 1 - DEF_TIM(TMR3, CH3, PB0, TIM_USE_OUTPUT_AUTO, 0,8), // PWM -2 + DEF_TIM(TMR3, CH4, PB1, TIM_USE_OUTPUT_AUTO, 0,0), // PWM 1 + DEF_TIM(TMR3, CH3, PB0, TIM_USE_OUTPUT_AUTO, 0,1), // PWM 2 - DEF_TIM(TMR2, CH4, PA3, TIM_USE_OUTPUT_AUTO, 0,1), // PWM 3 - DEF_TIM(TMR2, CH3, PA2, TIM_USE_OUTPUT_AUTO, 0,11), // PWM -4 + DEF_TIM(TMR2, CH4, PA3, TIM_USE_OUTPUT_AUTO, 0,2), // PWM 3 + DEF_TIM(TMR2, CH3, PA2, TIM_USE_OUTPUT_AUTO, 0,3), // PWM 4 - DEF_TIM(TMR2, CH1, PA15, TIM_USE_OUTPUT_AUTO, 0,12), // PWM -5 + DEF_TIM(TMR2, CH1, PA15, TIM_USE_OUTPUT_AUTO, 0,4), // PWM 5 - DEF_TIM(TMR4, CH4, PB9, TIM_USE_OUTPUT_AUTO, 0,13), // PWM 6 UART5 - DEF_TIM(TMR4, CH3, PB8, TIM_USE_OUTPUT_AUTO, 0,12), // PWM -7 UART5 + DEF_TIM(TMR4, CH4, PB9, TIM_USE_OUTPUT_AUTO, 0,5), // PWM 6 UART5 + DEF_TIM(TMR4, CH3, PB8, TIM_USE_OUTPUT_AUTO, 0,6), // PWM 7 UART5 - DEF_TIM(TMR4, CH2, PB7, TIM_USE_OUTPUT_AUTO, 0,10), // PWM -8 - DEF_TIM(TMR4, CH1, PB6, TIM_USE_OUTPUT_AUTO, 0,0), // PWM 9 + DEF_TIM(TMR4, CH2, PB7, TIM_USE_OUTPUT_AUTO, 0,8), // PWM 8, DMA 7 may be used by ADC + DEF_TIM(TMR4, CH1, PB6, TIM_USE_OUTPUT_AUTO, 0,9), // PWM 9 - DEF_TIM(TMR1, CH1, PA8, TIM_USE_LED, 0,2), //WS2812 // PWM1 - LED MCO1 DMA1 CH2 + DEF_TIM(TMR1, CH1, PA8, TIM_USE_LED, 0,10), //WS2812 // PWM1 - LED MCO1 DMA1 CH2 - //DEF_TIM(TMR5, CH2, PA1, TIM_USE_LED, 0,6), // PWM1 - LED MCO1 DMA1 CH2 }; diff --git a/src/main/target/BLUEBERRYF435WING/target.h b/src/main/target/BLUEBERRYF435WING/target.h index c59da791b11..1dbfedf8a6b 100644 --- a/src/main/target/BLUEBERRYF435WING/target.h +++ b/src/main/target/BLUEBERRYF435WING/target.h @@ -99,14 +99,6 @@ #define USE_MAG_ALL #define DEFAULT_I2C_BUS BUS_I2C2 -// temperature sensors -//#define TEMPERATURE_I2C_BUS BUS_I2C1 -// air speed sensors -//#define PITOT_I2C_BUS BUS_I2C1 -// ranger sensors -//#define USE_RANGEFINDER -//#define RANGEFINDER_I2C_BUS BUS_I2C1 - // *************** OSD ***************************** #define USE_SPI_DEVICE_2 #define SPI2_SCK_PIN PB13 @@ -151,10 +143,6 @@ #define UART3_RX_PIN PB11 #define UART3_TX_PIN PB10 -// #define USE_UART5 -// #define UART5_RX_PIN PB8 //GPS -// #define UART5_TX_PIN PB9 - #define USE_UART7 //SBUS #define UART7_RX_PIN PB3 #define UART7_TX_PIN PB4 @@ -172,16 +160,15 @@ #define ADC1_DMA_STREAM DMA2_CHANNEL1 #define ADC_CHANNEL_1_PIN PA0 #define ADC_CHANNEL_2_PIN PA1 -//#define ADC_CHANNEL_3_PIN PB0 #define VBAT_ADC_CHANNEL ADC_CHN_1 #define CURRENT_METER_ADC_CHANNEL ADC_CHN_2 -//#define RSSI_ADC_CHANNEL ADC_CHN_3 - #define VBAT_SCALE_DEFAULT 1100 - #define CURRENT_METER_SCALE 300 + +#define VBAT_SCALE_DEFAULT 1100 +#define CURRENT_METER_SCALE 300 #define DEFAULT_FEATURES (FEATURE_TX_PROF_SEL | FEATURE_CURRENT_METER | FEATURE_TELEMETRY| FEATURE_VBAT | FEATURE_OSD ) - #define USE_LED_STRIP - #define WS2811_PIN PA8 //TIM1_CH1 +#define USE_LED_STRIP +#define WS2811_PIN PA8 //TIM1_CH1 #define USE_SERIAL_4WAY_BLHELI_INTERFACE