From 2e801fbe026b3d2658d504553eb11b262670ba75 Mon Sep 17 00:00:00 2001 From: Moto Moto Date: Sun, 4 Dec 2016 16:04:09 -0600 Subject: [PATCH] Adjustments to MOTOLAB target for v3.1 --- src/main/target/MOTOLAB/target.c | 2 +- src/main/target/MOTOLAB/target.h | 12 +----------- src/main/target/MOTOLAB/target.mk | 4 +--- 3 files changed, 3 insertions(+), 15 deletions(-) diff --git a/src/main/target/MOTOLAB/target.c b/src/main/target/MOTOLAB/target.c index c9adecf16..414404fbb 100644 --- a/src/main/target/MOTOLAB/target.c +++ b/src/main/target/MOTOLAB/target.c @@ -34,6 +34,6 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = { DEF_TIM(TIM15, CH2, PA3, TIM_USE_MOTOR, 1 ), // PWM7 - PA3 - *TIM15_CH2, TIM2_CH4 DEF_TIM(TIM1, CH1, PA8, TIM_USE_MOTOR, 1 ), // PWM8 - PA8 - *TIM1_CH1, TIM4_ETR DEF_TIM(TIM17, CH1, PA7, TIM_USE_PPM, 0 ), // PPM - PA7 - *TIM17_CH1, TIM1_CH1N, TIM8_CH1 - DEF_TIM(TIM16, CH1, PB8, TIM_USE_LED, 0 ), // PPM - PA7 - *TIM17_CH1, TIM1_CH1N, TIM8_CH1 + DEF_TIM(TIM16, CH1, PB8, TIM_USE_LED, 0 ), // LED - PB8 - *TIM16_CH1, TIM4_CH3, TIM8_CH2 }; diff --git a/src/main/target/MOTOLAB/target.h b/src/main/target/MOTOLAB/target.h index 295bab37d..d2fe6f1df 100644 --- a/src/main/target/MOTOLAB/target.h +++ b/src/main/target/MOTOLAB/target.h @@ -34,7 +34,7 @@ #define MPU_INT_EXTI PA15 #define EXTI15_10_CALLBACK_HANDLER_COUNT 1 // MPU data ready #define USE_MPU_DATA_READY_SIGNAL -//#define ENSURE_MPU_DATA_READY_IS_LOW +#define ENSURE_MPU_DATA_READY_IS_LOW #define GYRO #define ACC @@ -55,12 +55,6 @@ #define MPU6000_CS_PIN PB12 #define MPU6000_SPI_INSTANCE SPI2 -//#define BARO -//#define USE_BARO_MS5611 - -//#define MAG -//#define USE_MAG_HMC5883 - #define USE_VCP #define USE_UART1 #define USE_UART2 @@ -87,7 +81,6 @@ #define M25P16_CS_PIN PB12 #define M25P16_SPI_INSTANCE SPI2 -//#define SENSORS_SET (SENSOR_ACC | SENSOR_BARO | SENSOR_GPS | SENSOR_MAG) #define SENSORS_SET (SENSOR_ACC) #undef GPS @@ -115,9 +108,6 @@ #define TARGET_IO_PORTA 0xffff #define TARGET_IO_PORTB 0xffff #define TARGET_IO_PORTC (BIT(13)|BIT(14)|BIT(15)) -// #define TARGET_IO_PORTF (BIT(0)|BIT(1)) -// !!TODO - check the following line is correct -#define TARGET_IO_PORTF (BIT(0)|BIT(1)|BIT(3)|BIT(4)) #define USABLE_TIMER_CHANNEL_COUNT 10 #define USED_TIMERS (TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(15) | TIM_N(17)) diff --git a/src/main/target/MOTOLAB/target.mk b/src/main/target/MOTOLAB/target.mk index 35a228d5b..a464efbde 100644 --- a/src/main/target/MOTOLAB/target.mk +++ b/src/main/target/MOTOLAB/target.mk @@ -4,7 +4,5 @@ FEATURES = VCP ONBOARDFLASH TARGET_SRC = \ drivers/accgyro_mpu.c \ drivers/accgyro_mpu6050.c \ - drivers/accgyro_spi_mpu6000.c \ - drivers/barometer_ms5611.c \ - drivers/compass_hmc5883l.c + drivers/accgyro_spi_mpu6000.c