Mirror/betaflight
1
0
Fork 0
mirror of https://github.com/betaflight/betaflight.git synced 2025-07-18 22:05:17 +03:00
Code Issues Wiki Activity

Fixed KIWI/PLUM sbus issues, added KIWIV2 target

Browse source
This commit is contained in:
flyinglemonfpv 2017-04-03 16:33:26 +02:00
parent f2fa06e52e
commit d7e0917a4f
3 changed files with 50 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

0
src/main/target/KIWIF4/KIWIF4V2.mk Normal file
View file

58
src/main/target/KIWIF4/target.h
View file

@ -17,25 +17,26 @@
#pragma once #pragma once
#ifdef PLUMF4 #if defined(PLUMF4)
#define TARGET_BOARD_IDENTIFIER "PLUM" #define TARGET_BOARD_IDENTIFIER "PLUM"
#define USBD_PRODUCT_STRING "PLUMF4" #define USBD_PRODUCT_STRING "PLUMF4"
#elif defined(KIWIF4V2)
#define TARGET_BOARD_IDENTIFIER "KIW2"
#define USBD_PRODUCT_STRING "KIWIF4V2"
#else #else
#define TARGET_BOARD_IDENTIFIER "KIWI" #define TARGET_BOARD_IDENTIFIER "KIWI"
#define USBD_PRODUCT_STRING "KIWIF4" #define USBD_PRODUCT_STRING "KIWIF4"
#endif #endif
#ifdef PLUMF4 #if defined(PLUMF4) || defined(KIWIF4V2)
#define LED0 PB4 #define LED0 PB4
#else #else
#define LED0 PB5 #define LED0 PB5
#define LED1 PB4 #define LED1 PB4
#endif #endif
#define BEEPER PA8 #define BEEPER PA8
@ -60,9 +61,16 @@
#define USE_ACC_SPI_MPU6000 #define USE_ACC_SPI_MPU6000
#define ACC_MPU6000_ALIGN CW180_DEG #define ACC_MPU6000_ALIGN CW180_DEG
#ifdef KIWIF4 #if defined(KIWIF4) || defined(KIWIF4V2)
#define OSD #define OSD
#define USE_MAX7456 #define USE_MAX7456
#endif
#if defined(KIWIF4V2)
#define MAX7456_SPI_INSTANCE SPI3
#define MAX7456_SPI_CS_PIN PA15
#else
#define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN PB12 #define MAX7456_SPI_CS_PIN PB12
//#define MAX7456_DMA_CHANNEL_TX DMA1_Stream5 //#define MAX7456_DMA_CHANNEL_TX DMA1_Stream5
@ -70,10 +78,37 @@
//#define MAX7456_DMA_IRQ_HANDLER_ID DMA1_ST0_HANDLER //#define MAX7456_DMA_IRQ_HANDLER_ID DMA1_ST0_HANDLER
#endif #endif
#if defined(KIWIF4V2)
#define USE_SDCARD
//#define SDCARD_DETECT_INVERTED
#define SDCARD_DETECT_PIN PB9
#define SDCARD_SPI_INSTANCE SPI2
#define SDCARD_SPI_CS_PIN PB12
// SPI2 is on the APB1 bus whose clock runs at 84MHz. Divide to under 400kHz for init:
#define SDCARD_SPI_INITIALIZATION_CLOCK_DIVIDER 256 // 328kHz
// Divide to under 25MHz for normal operation:
#define SDCARD_SPI_FULL_SPEED_CLOCK_DIVIDER 4 // 21MHz
//#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 SDCARD_DMA_CHANNEL_TX DMA1_Stream4
#define SDCARD_DMA_CHANNEL_TX_COMPLETE_FLAG DMA_FLAG_TCIF4
#define SDCARD_DMA_CLK RCC_AHB1Periph_DMA1
#define SDCARD_DMA_CHANNEL DMA_Channel_0
#else
#define USE_FLASHFS #define USE_FLASHFS
#define USE_FLASH_M25P16 #define USE_FLASH_M25P16
#define M25P16_CS_PIN SPI3_NSS_PIN #define M25P16_CS_PIN SPI3_NSS_PIN
#define M25P16_SPI_INSTANCE SPI3 #define M25P16_SPI_INSTANCE SPI3
#endif
#define USE_VCP #define USE_VCP
#define VBUS_SENSING_PIN PC5 #define VBUS_SENSING_PIN PC5
@ -82,7 +117,7 @@
#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 UART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2 //#define UART1_AHB1_PERIPHERALS RCC_AHB1Periph_DMA2
#define USE_UART3 #define USE_UART3
#define UART3_RX_PIN PB11 #define UART3_RX_PIN PB11
@ -135,9 +170,14 @@
#define RSSI_ADC_PIN PC2 #define RSSI_ADC_PIN PC2
#define CURRENT_METER_ADC_PIN PC3 #define CURRENT_METER_ADC_PIN PC3
#define CURRENT_METER_SCALE_DEFAULT 444
#define VBAT_SCALE_DEFAULT 57
#define DEFAULT_FEATURES (FEATURE_OSD) #define DEFAULT_FEATURES (FEATURE_OSD)
#define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL #define DEFAULT_RX_FEATURE FEATURE_RX_SERIAL
#define SERIALRX_PROVIDER SERIALRX_SBUS #define SERIALRX_PROVIDER SERIALRX_SBUS
#define SERIALRX_UART SERIAL_PORT_USART1
#define SPEKTRUM_BIND_PIN UART3_RX_PIN #define SPEKTRUM_BIND_PIN UART3_RX_PIN
@ -150,7 +190,7 @@
#define USABLE_TIMER_CHANNEL_COUNT 12 #define USABLE_TIMER_CHANNEL_COUNT 12
#define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(12) | TIM_N(8) | TIM_N(9) ) #define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(8) | TIM_N(9) )
#define CMS #define CMS
#define USE_MSP_DISPLAYPORT #define USE_MSP_DISPLAYPORT

2
src/main/target/KIWIF4/target.mk
View file

@ -1,5 +1,5 @@
F405_TARGETS += $(TARGET) F405_TARGETS += $(TARGET)
FEATURES += VCP ONBOARDFLASH FEATURES += VCP ONBOARDFLASH SDCARD
TARGET_SRC = \ TARGET_SRC = \
drivers/accgyro_spi_mpu6000.c \ drivers/accgyro_spi_mpu6000.c \