From b38040bd8299e00d395887c579da0e693ca21bc5 Mon Sep 17 00:00:00 2001 From: nerdCopter <56646290+nerdCopter@users.noreply.github.com> Date: Thu, 20 Jul 2023 09:56:43 -0500 Subject: [PATCH] [target] DIAT_MAMBAF405_2022B - MPU6000, MPU6500, ICM42688P PR cleanup --- src/main/target/DIAT_MAMBAF405_2022B/target.c | 67 ------------------- src/main/target/DIAT_MAMBAF405_2022B/target.h | 43 ++++-------- 2 files changed, 13 insertions(+), 97 deletions(-) diff --git a/src/main/target/DIAT_MAMBAF405_2022B/target.c b/src/main/target/DIAT_MAMBAF405_2022B/target.c index e915da33aa..37e46483ec 100644 --- a/src/main/target/DIAT_MAMBAF405_2022B/target.c +++ b/src/main/target/DIAT_MAMBAF405_2022B/target.c @@ -38,71 +38,4 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0 ), // M6 }; -// TIM_USE options: -// TIM_USE_ANY -// TIM_USE_BEEPER -// TIM_USE_LED -// TIM_USE_MOTOR -// TIM_USE_NONE -// TIM_USE_PPM -// TIM_USE_PWM -// TIM_USE_SERVO -// TIM_USE_TRANSPONDER - -// config.h timers -// #define MOTOR1_PIN PA9 -// #define MOTOR2_PIN PA8 -// #define MOTOR3_PIN PC9 -// #define MOTOR4_PIN PC8 -// #define MOTOR5_PIN PB0 -// #define MOTOR6_PIN PB1 -// #define TIMER_PIN_MAPPING \ -// TIMER_PIN_MAP( 0, PB9 , 2, -1) \ -// TIMER_PIN_MAP( 1, PA9 , 1, 0) \ -// TIMER_PIN_MAP( 2, PA8 , 1, 0) \ -// TIMER_PIN_MAP( 3, PC9 , 2, 0) \ -// TIMER_PIN_MAP( 4, PC8 , 2, 0) \ -// TIMER_PIN_MAP( 5, PB0 , 2, 0) \ -// TIMER_PIN_MAP( 6, PB1 , 2, 0) \ -// TIMER_PIN_MAP( 7, PB8 , 1, 0) \ -// TIMER_PIN_MAP( 8, PB3 , 1, 0) - -// unified timers -//# timer -// timer B09 AF3 -// # pin B09: TIM11 CH1 (AF3) -// timer A09 AF1 -// # pin A09: TIM1 CH2 (AF1) -// timer A08 AF1 -// # pin A08: TIM1 CH1 (AF1) -// timer C09 AF3 -// # pin C09: TIM8 CH4 (AF3) -// timer C08 AF3 -// # pin C08: TIM8 CH3 (AF3) -// timer B00 AF2 -// # pin B00: TIM3 CH3 (AF2) -// timer B01 AF2 -// # pin B01: TIM3 CH4 (AF2) -// timer B08 AF2 -// # pin B08: TIM4 CH3 (AF2) -// timer B03 AF1 -// # pin B03: TIM2 CH2 (AF1) -// dma pin A09 0 -// # pin A09: DMA2 Stream 6 Channel 0 -// dma pin A08 0 -// # pin A08: DMA2 Stream 6 Channel 0 -// dma pin C09 0 -// # pin C09: DMA2 Stream 7 Channel 7 -// dma pin C08 0 -// # pin C08: DMA2 Stream 2 Channel 0 -// dma pin B00 0 -// # pin B00: DMA1 Stream 7 Channel 5 -// dma pin B01 0 -// # pin B01: DMA1 Stream 2 Channel 5 -// dma pin B08 0 -// # pin B08: DMA1 Stream 7 Channel 2 -// dma pin B03 0 -// # pin B03: DMA1 Stream 6 Channel 3 - // notice - this file was programmatically generated and may be incomplete. -// recommend converting timers from unified-target; however, unified-targets will be sunsetted. diff --git a/src/main/target/DIAT_MAMBAF405_2022B/target.h b/src/main/target/DIAT_MAMBAF405_2022B/target.h index 51317f99dc..2e8faaa864 100644 --- a/src/main/target/DIAT_MAMBAF405_2022B/target.h +++ b/src/main/target/DIAT_MAMBAF405_2022B/target.h @@ -70,37 +70,25 @@ #define SPI3_MISO_PIN PC11 #define SPI3_MOSI_PIN PB5 -#define GYRO_1_ALIGN CW270_DEG -#define ACC_1_ALIGN CW270_DEG -#define GYRO_1_CS_PIN PA4 -#define GYRO_1_EXTI_PIN PC4 -// notice - GYRO_1_EXTI_PIN and MPU_INT_EXTI may be used interchangeably; there is no other [gyroModel]_EXTI_PIN -#define GYRO_1_SPI_INSTANCE SPI1 -#define MPU_INT_EXTI PC4 - - #define USE_EXTI -//#define USE_GYRO_EXTI -// notice - USE_GYRO_EXTI validity unknown at this time - #define USE_MPU_DATA_READY_SIGNAL +#define MPU_INT_EXTI PC4 + #define ACC_MPU6000_ALIGN CW270_DEG #define GYRO_MPU6000_ALIGN CW270_DEG -#define MPU6000_CS_PIN PA4 +#define MPU6000_CS_PIN PA4 #define MPU6000_SPI_INSTANCE SPI1 #define ACC_MPU6500_ALIGN CW270_DEG #define GYRO_MPU6500_ALIGN CW270_DEG -#define MPU6500_CS_PIN PA4 +#define MPU6500_CS_PIN PA4 #define MPU6500_SPI_INSTANCE SPI1 -#define ACC_ICM42688P_ALIGN CW270_DEG -#define GYRO_ICM42688P_ALIGN CW270_DEG -#define ICM42688P_CS_PIN PA4 -#define ICM42688P_SPI_INSTANCE SPI1 - -// notice - this file was programmatically generated and may need GYRO_2 manually added. +#define ACC_ICM42688P_ALIGN CW270_DEG +#define GYRO_ICM42688P_ALIGN CW270_DEG +#define ICM42688P_CS_PIN PA4 +#define ICM42688P_SPI_INSTANCE SPI1 #define MAG_I2C_INSTANCE (I2CDEV_1) #define USE_I2C @@ -113,7 +101,7 @@ // notice - this file was programmatically generated and likely needs MAG/BARO manually added and/or verified. #define FLASH_CS_PIN PA15 -#define FLASH_SPI_INSTANCE SPI3 +#define FLASH_SPI_INSTANCE SPI3 #define ENABLE_BLACKBOX_LOGGING_ON_SPIFLASH_BY_DEFAULT #define MAX7456_SPI_CS_PIN PB12 @@ -139,15 +127,11 @@ #define UART6_RX_PIN PC7 #define INVERTER_PIN_UART1 PC0 #define SERIAL_PORT_COUNT 7 -// notice - UART/USART were programmatically generated - should verify UART/USART. -// notice - may need "#define SERIALRX_UART SERIAL_PORT_USART_" -// notice - may need "#define DEFAULT_RX_FEATURE, SERIALRX_PROVIDER -// notice - should verify serial count. +// notice - UART/USART were programmatically generated #define VBAT_ADC_PIN PC1 #define CURRENT_METER_ADC_PIN PC3 -#define ADC3_DMA_STREAM DMA2_Stream0 -// # ADC 3: DMA2 Stream 0 Channel 2 // notice - use this for above define. +#define ADC3_DMA_STREAM DMA2_Stream0 // # ADC 3: DMA2 Stream 0 Channel 2 #define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC #define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC #define DEFAULT_CURRENT_METER_SCALE 183 @@ -168,14 +152,13 @@ #define TARGET_IO_PORTB 0xffff #define TARGET_IO_PORTC 0xffff #define TARGET_IO_PORTD 0xffff -// notice - masks were programmatically generated - must verify last port group for 0xffff or (BIT(2)) +// notice - masks were programmatically generated - please verify last port group for 0xffff or (BIT(2)) #define DEFAULT_FEATURES (FEATURE_OSD | FEATURE_TELEMETRY | FEATURE_AIRMODE | FEATURE_RX_SERIAL) #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL // notice - incomplete; may need additional DEFAULT_FEATURES; e.g. FEATURE_SOFTSERIAL | FEATURE_RX_SPI #define USABLE_TIMER_CHANNEL_COUNT 9 -#define USED_TIMERS ( TIM_N(1)|TIM_N(2)|TIM_N(3)|TIM_N(4)|TIM_N(8)|TIM_N(11)) -// notice - incomplete. add/remove/replace x +#define USED_TIMERS ( TIM_N(1)|TIM_N(2)|TIM_N(3)|TIM_N(4)|TIM_N(8)|TIM_N(11) ) // notice - this file was programmatically generated and may be incomplete.