From 114b3010007d0366c38ff35921056dec9c98c611 Mon Sep 17 00:00:00 2001 From: Faduf Date: Sat, 10 Feb 2018 20:28:44 +0100 Subject: [PATCH] Update YupiF7 target --- src/main/target/YUPIF7/target.c | 6 ++-- src/main/target/YUPIF7/target.h | 54 ++++++++++++++++++++------------ src/main/target/YUPIF7/target.mk | 3 ++ 3 files changed, 40 insertions(+), 23 deletions(-) diff --git a/src/main/target/YUPIF7/target.c b/src/main/target/YUPIF7/target.c index 335680ae9..be4c75a52 100644 --- a/src/main/target/YUPIF7/target.c +++ b/src/main/target/YUPIF7/target.c @@ -30,8 +30,8 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM5, CH2, PA1, TIM_USE_MOTOR, 0, 0 ), // S2_OUT - DMA1_ST4 DEF_TIM(TIM2, CH3, PA2, TIM_USE_MOTOR, 0, 0 ), // S3_OUT - DMA1_ST1 DEF_TIM(TIM2, CH4, PA3, TIM_USE_MOTOR, 0, 1 ), // S4_OUT - DMA1_ST6 - DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR | TIM_USE_LED, 0, 0 ), // S5_OUT - DMA1_ST7 - LED Control - DEF_TIM(TIM4, CH2, PB7, TIM_USE_ANY, 0, 0 ), // S6_OUT - DMA1_ST3 - Camera Control - DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0 ), // S7_OUT + DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0 ), // S5_OUT - DMA1_ST7 - LED Control + DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR | TIM_USE_LED, 0, 0 ), // S6_OUT + DEF_TIM(TIM4, CH2, PB7, TIM_USE_ANY, 0, 0 ), // Camera Control DEF_TIM(TIM12, CH1, PB14, TIM_USE_BEEPER, 0, 0 ), // BEEPER PWM }; diff --git a/src/main/target/YUPIF7/target.h b/src/main/target/YUPIF7/target.h index b4194b5ae..4169a0666 100644 --- a/src/main/target/YUPIF7/target.h +++ b/src/main/target/YUPIF7/target.h @@ -17,16 +17,13 @@ #pragma once #define TARGET_BOARD_IDENTIFIER "YPF7" -#define USE_TARGET_CONFIG -#define USBD_PRODUCT_STRING "YUPIF7" +#define USBD_PRODUCT_STRING "YUPIF7" -#define LED0_PIN PB6 -#define LED1_PIN PB4 -#define LED2_PIN PB5 +#define LED0_PIN PB4 //define camera control -#define CAMERA_CONTROL_PIN PB7 +#define CAMERA_CONTROL_PIN PB7 #define BEEPER PB14 #define BEEPER_PWM_HZ 3150 // Beeper PWM frequency in Hz @@ -36,7 +33,7 @@ #define USE_MPU_DATA_READY_SIGNAL #define MPU_INT_EXTI PC4 -//ICM 20689 +// ICM 20689 #define ICM20689_CS_PIN PA4 #define ICM20689_SPI_INSTANCE SPI1 @@ -50,6 +47,8 @@ // Serial ports #define USE_VCP +#define VBUS_SENSING_PIN PA8 + #define USE_UART1 #define UART1_RX_PIN PA10 #define UART1_TX_PIN PA9 @@ -58,6 +57,10 @@ #define UART3_RX_PIN PB11 #define UART3_TX_PIN PB10 +#define USE_UART5 +#define UART5_RX_PIN PD2 +#define UART5_TX_PIN PC12 + #define USE_UART6 #define UART6_RX_PIN PC7 #define UART6_TX_PIN PC6 @@ -66,7 +69,7 @@ #define SOFTSERIAL1_RX_PIN PB0 // PWM5 #define SOFTSERIAL1_TX_PIN PB1 // PWM7 -#define SERIAL_PORT_COUNT 5 //VCP, USART1, USART3,USART6, SOFT_SERIAL1 +#define SERIAL_PORT_COUNT 6 //VCP, USART1, USART3, USART5, USART6, SOFTSERIAL1 #define USE_ESCSERIAL #define ESCSERIAL_TIMER_TX_PIN PC8 // (Hardware=0, PPM) @@ -74,17 +77,26 @@ //SPI ports #define USE_SPI -#define USE_SPI_DEVICE_1 //Gyro +#define USE_SPI_DEVICE_1 //Gyro & OSD #define SPI1_NSS_PIN PA4 #define SPI1_SCK_PIN PA5 #define SPI1_MISO_PIN PA6 #define SPI1_MOSI_PIN PA7 -#define USE_SPI_DEVICE_3 //dataslash +#define USE_SPI_DEVICE_3 //Dataslash #define SPI3_NSS_PIN PA15 #define SPI3_SCK_PIN PC10 #define SPI3_MISO_PIN PC11 -#define SPI3_MOSI_PIN PC12 +#define SPI3_MOSI_PIN PB5 + +/* I2C Port +#define USE_I2C +#define USE_I2C_PULLUP +#define USE_I2C_DEVICE_1 +#define I2C2_SCL PB8 +#define I2C2_SDA PB9 +#define I2C_DEVICE (I2CDEV_1) +*/ // OSD #define USE_MAX7456 @@ -96,23 +108,25 @@ // Dataflash #define USE_FLASHFS #define USE_FLASH_M25P16 -#define M25P16_CS_PIN SPI3_NSS_PIN -#define M25P16_SPI_INSTANCE SPI3 +#define M25P16_CS_PIN SPI3_NSS_PIN +#define M25P16_SPI_INSTANCE SPI3 // ADC inputs #define USE_ADC -#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC -#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC -#define RSSI_ADC_GPIO_PIN PC0 -#define VBAT_ADC_PIN PC1 -#define CURRENT_METER_ADC_PIN PC2 -#define CURRENT_METER_SCALE_DEFAULT 250 // 3.3/120A = 25mv/A +#define DEFAULT_VOLTAGE_METER_SOURCE VOLTAGE_METER_ADC +#define DEFAULT_CURRENT_METER_SOURCE CURRENT_METER_ADC +#define RSSI_ADC_GPIO_PIN PC0 +#define VBAT_ADC_PIN PC1 +#define CURRENT_METER_ADC_PIN PC2 +#define CURRENT_METER_SCALE_DEFAULT 235 // Default configuration #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_UART SERIAL_PORT_USART6 -#define DEFAULT_FEATURES (FEATURE_OSD) +#define TELEMETRY_UART SERIAL_PORT_USART1 +#define DEFAULT_FEATURES (FEATURE_TELEMETRY | FEATURE_OSD) +#define USE_GYRO_FAST_KALMAN // Target IO and timers #define USE_SERIAL_4WAY_BLHELI_INTERFACE diff --git a/src/main/target/YUPIF7/target.mk b/src/main/target/YUPIF7/target.mk index 4ec5e0eee..49f2102b8 100644 --- a/src/main/target/YUPIF7/target.mk +++ b/src/main/target/YUPIF7/target.mk @@ -2,6 +2,9 @@ F7X2RE_TARGETS += $(TARGET) FEATURES += VCP ONBOARDFLASH TARGET_SRC = \ drivers/accgyro/accgyro_spi_icm20689.c\ + drivers/barometer/barometer_bmp280.c \ + drivers/barometer/barometer_ms5611.c \ + drivers/compass/compass_hmc5883l.c \ drivers/light_ws2811strip.c \ drivers/light_ws2811strip_hal.c \ drivers/max7456.c