rusefi
/
atbetaflight
mirror of https://github.com/rusefi/atbetaflight.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #5796 from jamming/kakutef7Test 

Kakutef7 IMU change
This commit is contained in:
Michael Keller 2018-06-01 00:34:52 +12:00 committed by GitHub
parent 011711c0c1 ad7a847275
commit c8184a93f6
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 6 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/target/KAKUTEF7/target.c
View File

@ -28,7 +28,7 @@
#include "drivers/timer_def.h" #include "drivers/timer_def.h"
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
DEF_TIM(TIM1, CH3, PE13, TIM_USE_PPM, 0, 1), // PPM , DMA2_ST6 DEF_TIM(TIM1, CH3, PE13, TIM_USE_PPM, 0, 1), // PPM / CAM_CONTROL, DMA2_ST6
DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // M1 , DMA1_ST7 DEF_TIM(TIM3, CH3, PB0, TIM_USE_MOTOR, 0, 0), // M1 , DMA1_ST7
DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // M2 , DMA1_ST2 DEF_TIM(TIM3, CH4, PB1, TIM_USE_MOTOR, 0, 0), // M2 , DMA1_ST2

29
src/main/target/KAKUTEF7/target.h
View File

@ -33,38 +33,26 @@
#define USE_ACC #define USE_ACC
#define USE_GYRO #define USE_GYRO
#define USE_DUAL_GYRO
//define camera control
#define CAMERA_CONTROL_PIN PE13
// ICM-20689 // ICM-20689
#define USE_ACC_SPI_ICM20689 #define USE_ACC_SPI_ICM20689
#define USE_GYRO_SPI_ICM20689 #define USE_GYRO_SPI_ICM20689
#define GYRO_ICM20689_ALIGN CW270_DEG #define GYRO_ICM20689_ALIGN CW270_DEG
#define ACC_ICM20689_ALIGN CW270_DEG #define ACC_ICM20689_ALIGN CW270_DEG
//#define MPU_INT_EXTI PE1 #define MPU_INT_EXTI PE1
// MPU6000
#define USE_ACC_SPI_MPU6000
#define USE_GYRO_SPI_MPU6000
#define GYRO_MPU6000_ALIGN CW270_DEG
#define ACC_MPU6000_ALIGN CW270_DEG
//#define MPU_INT_EXTI PB9
#define ICM20689_CS_PIN SPI4_NSS_PIN #define ICM20689_CS_PIN SPI4_NSS_PIN
#define ICM20689_SPI_INSTANCE SPI4 #define ICM20689_SPI_INSTANCE SPI4
#define MPU6000_CS_PIN SPI3_NSS_PIN
#define MPU6000_SPI_INSTANCE SPI3
#define GYRO_1_CS_PIN ICM20689_CS_PIN #define GYRO_1_CS_PIN ICM20689_CS_PIN
#define GYRO_2_CS_PIN MPU6000_CS_PIN
#define GYRO_1_SPI_INSTANCE ICM20689_SPI_INSTANCE #define GYRO_1_SPI_INSTANCE ICM20689_SPI_INSTANCE
#define GYRO_2_SPI_INSTANCE MPU6000_SPI_INSTANCE
#define ACC_1_ALIGN ACC_ICM20689_ALIGN #define ACC_1_ALIGN ACC_ICM20689_ALIGN
#define ACC_2_ALIGN ACC_MPU6000_ALIGN
#define GYRO_1_ALIGN GYRO_ICM20689_ALIGN #define GYRO_1_ALIGN GYRO_ICM20689_ALIGN
#define GYRO_2_ALIGN GYRO_MPU6000_ALIGN
//#define USE_MPU_DATA_READY_SIGNAL
#define USE_MPU_DATA_READY_SIGNAL
#define USE_EXTI #define USE_EXTI
#define USE_VCP #define USE_VCP
@ -107,7 +95,6 @@
#define USE_SPI #define USE_SPI
#define USE_SPI_DEVICE_1 //SD Card #define USE_SPI_DEVICE_1 //SD Card
#define USE_SPI_DEVICE_2 //OSD #define USE_SPI_DEVICE_2 //OSD
#define USE_SPI_DEVICE_3 //MPU6000
#define USE_SPI_DEVICE_4 //ICM20689 #define USE_SPI_DEVICE_4 //ICM20689
#define SPI1_NSS_PIN PA4 #define SPI1_NSS_PIN PA4
@ -120,17 +107,11 @@
#define SPI2_MISO_PIN PB14 #define SPI2_MISO_PIN PB14
#define SPI2_MOSI_PIN PB15 #define SPI2_MOSI_PIN PB15
#define SPI3_NSS_PIN PA15
#define SPI3_SCK_PIN PB3
#define SPI3_MISO_PIN PB4
#define SPI3_MOSI_PIN PB5
#define SPI4_NSS_PIN PE4 #define SPI4_NSS_PIN PE4
#define SPI4_SCK_PIN PE2 #define SPI4_SCK_PIN PE2
#define SPI4_MISO_PIN PE5 #define SPI4_MISO_PIN PE5
#define SPI4_MOSI_PIN PE6 #define SPI4_MOSI_PIN PE6
#define USE_MAX7456 #define USE_MAX7456
#define MAX7456_SPI_INSTANCE SPI2 #define MAX7456_SPI_INSTANCE SPI2
#define MAX7456_SPI_CS_PIN SPI2_NSS_PIN #define MAX7456_SPI_CS_PIN SPI2_NSS_PIN

1
src/main/target/KAKUTEF7/target.mk
View File

@ -4,7 +4,6 @@ FEATURES += SDCARD VCP
TARGET_SRC = \ TARGET_SRC = \
drivers/accgyro/accgyro_mpu.c \ drivers/accgyro/accgyro_mpu.c \
drivers/accgyro/accgyro_spi_icm20689.c \ drivers/accgyro/accgyro_spi_icm20689.c \
drivers/accgyro/accgyro_spi_mpu6000.c \
drivers/barometer/barometer_bmp280.c \ drivers/barometer/barometer_bmp280.c \
drivers/compass/compass_hmc5883l.c \ drivers/compass/compass_hmc5883l.c \
drivers/compass/compass_qmc5883l.c \ drivers/compass/compass_qmc5883l.c \