Mirror/inav
1
0
Fork 0
mirror of https://github.com/iNavFlight/inav.git synced 2025-07-26 01:35:35 +03:00
Code Issues Wiki Activity

Merge pull request #2825 from ted-rcnet/development

Browse source 
Fix Target YuPiF4
This commit is contained in:
Konstantin Sharlaimov 2018-02-26 00:57:04 +10:00 • committed by GitHub
commit a65d5fe8fc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 60 additions and 56 deletions
Download patch file Download diff file Expand all files Collapse all files

6
src/main/target/YUPIF4/config.c
View file

@ -35,11 +35,11 @@ void targetConfiguration(void)
{ {
/* Changes depending on versions */ /* Changes depending on versions */
if (hardwareRevision == YUPIF4_RACE3) { if (hardwareRevision == YUPIF4_RACE3) {
beeperDevConfigMutable()->ioTag = IO_TAG(BEEPER_OPT); beeperDevConfigMutable()->ioTag = IO_TAG(PB14);
telemetryConfigMutable()->halfDuplex = false; telemetryConfigMutable()->halfDuplex = false;
} else if (hardwareRevision == YUPIF4_RACE2) { } else if (hardwareRevision == YUPIF4_RACE2) {
beeperDevConfigMutable()->ioTag = IO_TAG(BEEPER_OPT); beeperDevConfigMutable()->ioTag = IO_TAG(PB14);
} else if (hardwareRevision == YUPIF4_MINI) { } else if (hardwareRevision == YUPIF4_MINI) {
beeperDevConfigMutable()->frequency = 0; beeperDevConfigMutable()->frequency = 0;
@ -47,7 +47,7 @@ void targetConfiguration(void)
adcConfigMutable()->current.enabled = 0; adcConfigMutable()->current.enabled = 0;
} else if (hardwareRevision == YUPIF4_NAV) { } else if (hardwareRevision == YUPIF4_NAV) {
beeperDevConfigMutable()->ioTag = IO_TAG(BEEPER_OPT); beeperDevConfigMutable()->ioTag = IO_TAG(PB14);
} else { } else {
adcConfigMutable()->current.enabled = 0; adcConfigMutable()->current.enabled = 0;

15
src/main/target/YUPIF4/target.c
View file

@ -21,14 +21,15 @@
#include "drivers/io.h" #include "drivers/io.h"
#include "drivers/pwm_mapping.h" #include "drivers/pwm_mapping.h"
#include "drivers/timer.h" #include "drivers/timer.h"
#include "drivers/bus.h"
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
{ TIM8, IO_TAG(PC8), TIM_Channel_3, 0, IOCFG_AF_PP, GPIO_AF_TIM8, TIM_USE_PPM }, { TIM8, IO_TAG(PC8), TIM_Channel_3, 0, IOCFG_AF_PP, GPIO_AF_TIM8, TIM_USE_PPM },
{ TIM2, IO_TAG(PA0), TIM_Channel_1, 1, IOCFG_AF_PP, GPIO_AF_TIM2, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR }, { TIM2, IO_TAG(PA0), TIM_Channel_1, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM2, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR },
{ TIM2, IO_TAG(PA1), TIM_Channel_2, 1, IOCFG_AF_PP, GPIO_AF_TIM2, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR }, { TIM2, IO_TAG(PA1), TIM_Channel_2, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM2, TIM_USE_MC_MOTOR | TIM_USE_FW_MOTOR },
{ TIM2, IO_TAG(PA2), TIM_Channel_3, 1, IOCFG_AF_PP, GPIO_AF_TIM2, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO }, { TIM5, IO_TAG(PA2), TIM_Channel_3, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM5, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO },
{ TIM2, IO_TAG(PA3), TIM_Channel_4, 1, IOCFG_AF_PP, GPIO_AF_TIM2, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO }, { TIM5, IO_TAG(PA3), TIM_Channel_4, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM5, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO },
{ TIM3, IO_TAG(PB0), TIM_Channel_3, 1, IOCFG_AF_PP, GPIO_AF_TIM3, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO | TIM_USE_LED }, { TIM3, IO_TAG(PB0), TIM_Channel_3, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM3, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_SERVO },
{ TIM3, IO_TAG(PB1), TIM_Channel_4, 1, IOCFG_AF_PP, GPIO_AF_TIM3, TIM_USE_MC_MOTOR | TIM_USE_FW_SERVO }, { TIM3, IO_TAG(PB1), TIM_Channel_4, 1, IOCFG_AF_PP_PD, GPIO_AF_TIM3, TIM_USE_MC_MOTOR | TIM_USE_MC_SERVO | TIM_USE_FW_SERVO | TIM_USE_LED },
{ TIM8, IO_TAG(PC9), TIM_Channel_4, 1, IOCFG_AF_PP, GPIO_AF_TIM8, TIM_USE_BEEPER }, { TIM12, IO_TAG(PB14), TIM_Channel_1, 1, IOCFG_AF_PP, GPIO_AF_TIM12, TIM_USE_BEEPER },
}; };

95
src/main/target/YUPIF4/target.h
View file

@ -22,76 +22,79 @@
#define LED0 PB6 #define LED0 PB6
#define LED1 PB4 #define LED1 PB4
#define LED2 PB5
#define BEEPER PC9 #define BEEPER PB14
#define BEEPER_PWM #define BEEPER_PWM
#define BEEPER_INVERTED #define BEEPER_INVERTED
#define BEEPER_PWM_TIMER TIM8
#define BEEPER_PWM_TIMER_CH TIM_Channel_4
#define BEEPER_PWM_FREQUENCY 3150 #define BEEPER_PWM_FREQUENCY 3150
#define INVERTER_PIN_UART6 PB15 #define INVERTER_PIN_UART6 PB15
#define USE_SPI
#define USE_SPI_DEVICE_1 // Gyro
#define SPI1_NSS_PIN PA4
#define SPI1_SCK_PIN PA5
#define SPI1_MISO_PIN PA6
#define SPI1_MOSI_PIN PA7
/////// ICM20689 ////////
#define USE_EXTI #define USE_EXTI
#define MPU_INT_EXTI PC4 #define MPU_INT_EXTI PC4
#define USE_MPU_DATA_READY_SIGNAL #define USE_MPU_DATA_READY_SIGNAL
#define ENSURE_MPU_DATA_READY_IS_LOW #define ENSURE_MPU_DATA_READY_IS_LOW
// ICM20689
#define MPU6500_CS_PIN SPI1_NSS_PIN #define MPU6500_CS_PIN SPI1_NSS_PIN
#define MPU6500_SPI_BUS BUS_SPI1 #define MPU6500_SPI_BUS BUS_SPI1
#define USE_ACC #define USE_GYRO_MPU6500
#define USE_ACC_MPU6500 #define USE_ACC_MPU6500
#define ICM20689_CS_PIN SPI1_NSS_PIN
#define ICM20689_EXTI_PIN PC4
#define USE_ACC
#define USE_ACC_SPI_MPU6500
#define ACC_MPU6500_ALIGN CW90_DEG #define ACC_MPU6500_ALIGN CW90_DEG
#define USE_GYRO #define USE_GYRO
#define USE_GYRO_MPU6500 #define USE_GYRO_SPI_MPU6500
#define GYRO_MPU6500_ALIGN CW90_DEG #define GYRO_MPU6500_ALIGN CW90_DEG
////////////////////////
#define USE_I2C #define USE_I2C
#define USE_I2C_DEVICE_2 #define USE_I2C_DEVICE_2
#define I2C2_SCL PB10 #define I2C1_SCL PB10
#define I2C2_SDA PB11 #define I2C1_SDA PB11
#define USE_MAG #define USE_MAG
#define MAG_I2C_BUS BUS_I2C2 #define MAG_I2C_BUS BUS_I2C2
#define USE_MAG_HMC5883 #define USE_MAG_HMC5883
#define MAG_HMC5883_ALIGN CW270_DEG_FLIP
#define USE_MAG_QMC5883 #define USE_MAG_QMC5883
#define USE_MAG_IST8310
#define USE_MAG_MAG3110
#define USE_BARO #define USE_BARO
#define BARO_I2C_BUS BUS_I2C2 #define BARO_I2C_BUS BUS_I2C2
#define USE_BARO_BMP280
#define USE_BARO_MS5611 #define USE_BARO_MS5611
#define USE_BARO_BMP280
// OSD
#define USE_OSD #define USE_OSD
#define USE_MAX7456 #define USE_MAX7456
#define MAX7456_SPI_BUS BUS_SPI1 #define MAX7456_SPI_BUS BUS_SPI1
#define MAX7456_CS_PIN PA14 #define MAX7456_CS_PIN PA14
// Serial Ports #define USE_SDCARD
#define USE_SDCARD_SPI3
#define SDCARD_DETECT_INVERTED
#define SDCARD_DETECT_PIN PD2
#define SDCARD_SPI_INSTANCE SPI3
#define SDCARD_SPI_CS_PIN SPI3_NSS_PIN
#define SDCARD_DMA_CHANNEL_TX DMA1_Stream5
#define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA_FLAG_TCIF5
#define SDCARD_DMA_CLK RCC_AHB1Periph_DMA1
#define SDCARD_DMA_CHANNEL DMA_Channel_0
#define USB_IO
#define USE_VCP #define USE_VCP
#define USE_UART1 #define USE_UART1
#define UART1_RX_PIN PA10 #define UART1_RX_PIN PA10
#define UART1_TX_PIN PA9 #define UART1_TX_PIN PA9
#define USE_UART3
#define UART3_RX_PIN PB11
#define UART3_TX_PIN PB10
#define USE_UART4 #define USE_UART4
#define UART4_RX_PIN PC11 #define UART4_RX_PIN PC11
#define UART4_TX_PIN PC10 #define UART4_TX_PIN PC10
@ -100,25 +103,23 @@
#define UART6_RX_PIN PC7 #define UART6_RX_PIN PC7
#define UART6_TX_PIN PC6 #define UART6_TX_PIN PC6
#define SERIAL_PORT_COUNT 4 // VCP, UART1, UART3, UART6 #define SERIAL_PORT_COUNT 5
#define USE_ESCSERIAL #define USE_ESCSERIAL
#define ESCSERIAL_TIMER_TX_HARDWARE 0 #define ESCSERIAL_TIMER_TX_HARDWARE 0
#define USE_SPI
#define USE_SPI_DEVICE_1 // Gyro
#define SPI1_NSS_PIN PA4
#define SPI1_SCK_PIN PA5
#define SPI1_MISO_PIN PA6
#define SPI1_MOSI_PIN PA7
// SD Card #define USE_SPI_DEVICE_3 // SD Card
/* #define SPI3_NSS_PIN PA15
#define USE_SDCARD #define SPI3_SCK_PIN PC10
#define SDCARD_DETECT_INVERTED #define SPI3_MISO_PIN PC11
#define SPI3_MOSI_PIN PC12
#define SDCARD_DETECT_PIN PD2
#define SDCARD_SPI_INSTANCE SPI3
#define SDCARD_SPI_CS_PIN PA15
#define SDCARD_DMA_CHANNEL_TX DMA1_Stream5
#define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA_FLAG_TCIF5
#define SDCARD_DMA_CLK RCC_AHB1Periph_DMA1
#define SDCARD_DMA_CHANNEL DMA_Channel_0
*/
// ADC inputs // ADC inputs
#define BOARD_HAS_VOLTAGE_DIVIDER #define BOARD_HAS_VOLTAGE_DIVIDER
@ -128,19 +129,21 @@
#define VBAT_ADC_CHANNEL ADC_CHN_1 #define VBAT_ADC_CHANNEL ADC_CHN_1
#define RSSI_ADC_CHANNEL ADC_CHN_2 #define RSSI_ADC_CHANNEL ADC_CHN_2
// LED Strip can run off Pin 5 (PB0) of the motor outputs // LED Strip can run off Pin 5 (PB1) of the motor outputs
#define LED_STRIP #define LED_STRIP
#define WS2811_PIN PB0 #define WS2811_PIN PB1
#define WS2811_TIMER TIM3 #define WS2811_TIMER TIM8
#define WS2811_DMA_HANDLER_IDENTIFER DMA1_ST2_HANDLER #define WS2811_DMA_HANDLER_IDENTIFER DMA1_ST2_HANDLER
#define WS2811_DMA_STREAM DMA1_Stream2 #define WS2811_DMA_STREAM DMA1_Stream2
#define WS2811_DMA_CHANNEL DMA_Channel_3 #define WS2811_DMA_CHANNEL DMA_Channel_5
// Features // Features
// #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT // #define ENABLE_BLACKBOX_LOGGING_ON_SDCARD_BY_DEFAULT
#define DEFAULT_RX_TYPE RX_TYPE_SERIAL #define DEFAULT_RX_TYPE RX_TYPE_SERIAL
// #define DEFAULT_FEATURES (FEATURE_TX_PROF_SEL | FEATURE_BLACKBOX) #define SERIALRX_PROVIDER SERIALRX_SBUS
#define SERIALRX_UART SERIAL_PORT_USART6
#define DEFAULT_FEATURES (FEATURE_VBAT | FEATURE_OSD)
#define USE_SERIAL_4WAY_BLHELI_INTERFACE #define USE_SERIAL_4WAY_BLHELI_INTERFACE
@ -152,5 +155,5 @@
#define TARGET_IO_PORTC 0xffff #define TARGET_IO_PORTC 0xffff
#define TARGET_IO_PORTD (BIT(2)) #define TARGET_IO_PORTD (BIT(2))
#define USABLE_TIMER_CHANNEL_COUNT 10 #define USABLE_TIMER_CHANNEL_COUNT 8
#define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(5) |TIM_N(8) | TIM_N(12)) #define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(8) | TIM_N(12))