Skip to content

Commit

Permalink
Merge pull request #187 from blckmn/make_cleanup
Browse files Browse the repository at this point in the history 
Makefile cleanup and a few others
  • Loading branch information
@blckmn
blckmn committed May 19, 2016
2 parents add963d + a3f643c commit c8fd5e4
Show file tree
Hide file tree
Showing 24 changed files with 2,342 additions and 422 deletions.
310 changes: 183 additions & 127 deletions Makefile
View file

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions src/main/config/config.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -665,12 +665,12 @@ static void resetConf(void)
featureSet(FEATURE_FAILSAFE);
#endif

// alternative defaults settings for ALIENWIIF1 and ALIENWIIF3 targets
#ifdef ALIENWII32
// alternative defaults settings for ALIENFLIGHTF1 and ALIENFLIGHTF3 targets
#ifdef ALIENFLIGHT
featureSet(FEATURE_RX_SERIAL);
featureSet(FEATURE_MOTOR_STOP);
featureClear(FEATURE_ONESHOT125);
#if defined(ALIENWIIF3) || defined(ALIENFLIGHTF4)
#if defined(ALIENFLIGHTF3) || defined(ALIENFLIGHTF4)
masterConfig.serialConfig.portConfigs[1].functionMask = FUNCTION_MSP; //default config USART1 for MSP at 9600 for use with 1wire.
masterConfig.serialConfig.portConfigs[1].msp_baudrateIndex = BAUD_9600;
masterConfig.serialConfig.portConfigs[2].functionMask = FUNCTION_RX_SERIAL;
Expand Down
2 changes: 1 addition & 1 deletion src/main/drivers/accgyro_mpu6500.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -39,7 +39,7 @@ extern uint16_t acc_1G;

#define BIT_I2C_IF_DIS 0x10

void resetGyro (void) {
void mpu6500ResetGyro (void) {
// Device Reset
mpuConfiguration.write(MPU_RA_PWR_MGMT_1, MPU6500_BIT_RESET);
delay(100);
Expand Down
2 changes: 1 addition & 1 deletion src/main/drivers/accgyro_mpu6500.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@

#pragma once

void resetGyro(void);
void mpu6500ResetGyro(void);

bool mpu6500AccDetect(acc_t *acc);
bool mpu6500GyroDetect(gyro_t *gyro);
Expand Down
4 changes: 2 additions & 2 deletions src/main/drivers/accgyro_spi_mpu6500.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -106,7 +106,7 @@ static void mpu6500SpiInit(void)
IOInit(mpuSpi6500CsPin, OWNER_SYSTEM, RESOURCE_SPI);
IOConfigGPIO(mpuSpi6500CsPin, SPI_IO_CS_CFG);

#if defined(STM32F40_41xxx) || defined (STM32F411xE)
#if defined(STM32F4)
spiSetDivisor(MPU6500_SPI_INSTANCE, SPI_SLOW_CLOCK);
#else
spiSetDivisor(MPU6500_SPI_INSTANCE, SPI_STANDARD_CLOCK);
Expand All @@ -123,7 +123,7 @@ bool mpu6500SpiDetect(void)

mpu6500ReadRegister(MPU_RA_WHO_AM_I, 1, &tmp);

if (tmp == MPU6500_WHO_AM_I_CONST || tmp == MPU9250_WHO_AM_I_CONST) {
if (tmp == MPU6500_WHO_AM_I_CONST) {
return true;
}

Expand Down
161 changes: 158 additions & 3 deletions src/main/drivers/pwm_mapping.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -367,7 +367,7 @@ static const uint16_t airPWM[] = {
};
#endif

#if defined(SPARKY) || defined(ALIENWIIF3)
#if defined(SPARKY) || defined(ALIENFLIGHTF3)
static const uint16_t multiPPM[] = {
PWM11 | (MAP_TO_PPM_INPUT << 8), // PPM input

Expand Down Expand Up @@ -780,6 +780,68 @@ static const uint16_t airPWM[] = {
};
#endif

#ifdef YOUPIF4
static const uint16_t multiPPM[] = {
PWM1 | (MAP_TO_PPM_INPUT << 8), // PPM input
PWM6 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
PWM7 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
PWM8 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM9 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM10 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM11 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM2 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
PWM3 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
PWM4 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
PWM5 | (MAP_TO_MOTOR_OUTPUT << 8), // Swap to servo if needed
0xFFFF
};
static const uint16_t multiPWM[] = {
PWM1 | (MAP_TO_PWM_INPUT << 8), // input #1
PWM2 | (MAP_TO_PWM_INPUT << 8),
PWM3 | (MAP_TO_PWM_INPUT << 8),
PWM4 | (MAP_TO_PWM_INPUT << 8),
PWM5 | (MAP_TO_PWM_INPUT << 8),
PWM6 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #1 or servo #1 (swap to servo if needed)
PWM7 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #2 or servo #2 (swap to servo if needed)
PWM8 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #1 or #3
PWM9 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM10 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM11 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #4 or #6
0xFFFF
};

static const uint16_t airPPM[] = {
PWM1 | (MAP_TO_PPM_INPUT << 8), // PPM input
PWM6 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM7 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM8 | (MAP_TO_SERVO_OUTPUT << 8),
PWM9 | (MAP_TO_SERVO_OUTPUT << 8),
PWM10 | (MAP_TO_SERVO_OUTPUT << 8),
PWM11 | (MAP_TO_SERVO_OUTPUT << 8),
PWM2 | (MAP_TO_SERVO_OUTPUT << 8),
PWM3 | (MAP_TO_SERVO_OUTPUT << 8),
PWM4 | (MAP_TO_SERVO_OUTPUT << 8),
PWM5 | (MAP_TO_SERVO_OUTPUT << 8),
0xFFFF
};

static const uint16_t airPWM[] = {
PWM1 | (MAP_TO_PWM_INPUT << 8), // input #1
PWM2 | (MAP_TO_PWM_INPUT << 8),
PWM3 | (MAP_TO_PWM_INPUT << 8),
PWM4 | (MAP_TO_PWM_INPUT << 8),
PWM5 | (MAP_TO_PWM_INPUT << 8),
PWM6 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #1
PWM7 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #2
PWM8 | (MAP_TO_SERVO_OUTPUT << 8), // servo #1
PWM9 | (MAP_TO_SERVO_OUTPUT << 8), // servo #2
PWM10 | (MAP_TO_SERVO_OUTPUT << 8), // servo #3
PWM11 | (MAP_TO_SERVO_OUTPUT << 8), // servo #4
0xFFFF
};
#endif


#ifdef QUANTON
static const uint16_t multiPPM[] = {
PWM1 | (MAP_TO_PPM_INPUT << 8), // PPM input
Expand Down Expand Up @@ -849,6 +911,91 @@ static const uint16_t airPWM[] = {
};
#endif

#ifdef AQ32_V2
static const uint16_t multiPPM[] = {
PWM1 | (MAP_TO_PPM_INPUT << 8), // PPM input

PWM9 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #1
PWM10 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM11 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM12 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM13 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM14 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM15 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM16 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #8
PWM17 | (MAP_TO_SERVO_OUTPUT << 8), // servo #1
PWM18 | (MAP_TO_SERVO_OUTPUT << 8),
PWM19 | (MAP_TO_SERVO_OUTPUT << 8),
PWM20 | (MAP_TO_SERVO_OUTPUT << 8), // servo #4
0xFFFF
};

static const uint16_t multiPWM[] = {
PWM1 | (MAP_TO_PWM_INPUT << 8), // input #1
PWM2 | (MAP_TO_PWM_INPUT << 8),
PWM3 | (MAP_TO_PWM_INPUT << 8),
PWM4 | (MAP_TO_PWM_INPUT << 8),
PWM5 | (MAP_TO_PWM_INPUT << 8),
PWM6 | (MAP_TO_PWM_INPUT << 8),
PWM7 | (MAP_TO_PWM_INPUT << 8),
PWM8 | (MAP_TO_PWM_INPUT << 8), // input #8
PWM9 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #1
PWM10 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM11 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM12 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM13 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM14 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM15 | (MAP_TO_MOTOR_OUTPUT << 8),
PWM16 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #8
PWM17 | (MAP_TO_SERVO_OUTPUT << 8), // servo #1
PWM18 | (MAP_TO_SERVO_OUTPUT << 8),
PWM19 | (MAP_TO_SERVO_OUTPUT << 8),
PWM20 | (MAP_TO_SERVO_OUTPUT << 8), // servo #4
0xFFFF
};

static const uint16_t airPPM[] = {
PWM1 | (MAP_TO_PPM_INPUT << 8), // PPM input
PWM9 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #1
PWM10 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #2
PWM11 | (MAP_TO_SERVO_OUTPUT << 8), // servo #1
PWM12 | (MAP_TO_SERVO_OUTPUT << 8),
PWM13 | (MAP_TO_SERVO_OUTPUT << 8),
PWM14 | (MAP_TO_SERVO_OUTPUT << 8),
PWM15 | (MAP_TO_SERVO_OUTPUT << 8),
PWM16 | (MAP_TO_SERVO_OUTPUT << 8),
PWM17 | (MAP_TO_SERVO_OUTPUT << 8),
PWM18 | (MAP_TO_SERVO_OUTPUT << 8),
PWM19 | (MAP_TO_SERVO_OUTPUT << 8),
PWM20 | (MAP_TO_SERVO_OUTPUT << 8), // server #10
0xFFFF
};

static const uint16_t airPWM[] = {
PWM1 | (MAP_TO_PWM_INPUT << 8), // input #1
PWM2 | (MAP_TO_PWM_INPUT << 8),
PWM3 | (MAP_TO_PWM_INPUT << 8),
PWM4 | (MAP_TO_PWM_INPUT << 8),
PWM5 | (MAP_TO_PWM_INPUT << 8),
PWM6 | (MAP_TO_PWM_INPUT << 8),
PWM7 | (MAP_TO_PWM_INPUT << 8),
PWM8 | (MAP_TO_PWM_INPUT << 8), // input #8
PWM9 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #1
PWM10 | (MAP_TO_MOTOR_OUTPUT << 8), // motor #2
PWM11 | (MAP_TO_SERVO_OUTPUT << 8), // servo #1
PWM12 | (MAP_TO_SERVO_OUTPUT << 8),
PWM13 | (MAP_TO_SERVO_OUTPUT << 8),
PWM14 | (MAP_TO_SERVO_OUTPUT << 8),
PWM15 | (MAP_TO_SERVO_OUTPUT << 8),
PWM16 | (MAP_TO_SERVO_OUTPUT << 8),
PWM17 | (MAP_TO_SERVO_OUTPUT << 8),
PWM18 | (MAP_TO_SERVO_OUTPUT << 8),
PWM19 | (MAP_TO_SERVO_OUTPUT << 8),
PWM20 | (MAP_TO_SERVO_OUTPUT << 8), // server #10
0xFFFF
};
#endif

#ifdef KKNGF4
static const uint16_t multiPPM[] = {
PWM1 | (MAP_TO_PPM_INPUT << 8), // PPM input
Expand Down Expand Up @@ -1056,7 +1203,6 @@ if (init->useBuzzerP6) {

const timerHardware_t *timerHardwarePtr = &timerHardware[timerIndex];


#ifdef OLIMEXINO_UNCUT_LED2_E_JUMPER
// PWM2 is connected to LED2 on the board and cannot be connected unless you cut LED2_E
if (timerIndex == PWM2)
Expand Down Expand Up @@ -1183,7 +1329,6 @@ if (init->useBuzzerP6) {
#endif
}


if (init->useChannelForwarding && !init->airplane) {
#if defined(NAZE) && defined(LED_STRIP_TIMER)
// if LED strip is active, PWM5-8 are unavailable, so map AUX1+AUX2 to PWM13+PWM14
Expand Down Expand Up @@ -1234,11 +1379,21 @@ if (init->useBuzzerP6) {
ppmAvoidPWMTimerClash(timerHardwarePtr, TIM1);
}
#endif
#ifdef AQ32_V2
if (init->useMultiShot || init->useOneshot || isMotorBrushed(init->motorPwmRate)) {
ppmAvoidPWMTimerClash(timerHardwarePtr, TIM4);
}
#endif
#ifdef VRCORE
if (init->useMultiShot || init->useOneshot || isMotorBrushed(init->motorPwmRate)) {
ppmAvoidPWMTimerClash(timerHardwarePtr, TIM1);
}
#endif
#ifdef YOUPIF4
if (init->useMultiShot || init->useOneshot || isMotorBrushed(init->motorPwmRate)) {
ppmAvoidPWMTimerClash(timerHardwarePtr, TIM8);
}
#endif
//#ifdef KKNGF4
// if (init->useMultiShot || init->useOneshot || isMotorBrushed(init->motorPwmRate)) {
// ppmAvoidPWMTimerClash(timerHardwarePtr, TIM8);
Expand Down
6 changes: 5 additions & 1 deletion src/main/drivers/pwm_mapping.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -137,7 +137,11 @@ enum {
PWM13,
PWM14,
PWM15,
PWM16
PWM16,
PWM17,
PWM18,
PWM19,
PWM20
};

pwmOutputConfiguration_t *pwmGetOutputConfiguration(void);
58 changes: 57 additions & 1 deletion src/main/drivers/timer.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -202,7 +202,7 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {

#endif

#if defined(SPARKY) || defined(ALIENWIIF3)
#if defined(SPARKY) || defined(ALIENFLIGHTF3)
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
//
// 6 x 3 pin headers
Expand Down Expand Up @@ -385,6 +385,29 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {

#endif

#if defined(YOUPIF4)
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
{ TIM8, GPIOC, Pin_7, TIM_Channel_2, TIM8_CC_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource7, GPIO_AF_TIM8}, // PPM IN
{ TIM12, GPIOB, Pin_14, TIM_Channel_1, TIM8_BRK_TIM12_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource14, GPIO_AF_TIM12}, // S2_IN
{ TIM12, GPIOB, Pin_15, TIM_Channel_2, TIM8_BRK_TIM12_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource15, GPIO_AF_TIM12}, // S3_IN - GPIO_PartialRemap_TIM3
{ TIM8, GPIOC, Pin_8, TIM_Channel_3, TIM8_CC_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource8, GPIO_AF_TIM8}, // S4_IN
{ TIM8, GPIOC, Pin_9, TIM_Channel_4, TIM8_CC_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource9, GPIO_AF_TIM8}, // S5_IN

{ TIM3, GPIOB, Pin_0, TIM_Channel_3, TIM3_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource0, GPIO_AF_TIM3}, // S1_OUT
{ TIM3, GPIOB, Pin_1, TIM_Channel_4, TIM3_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource1, GPIO_AF_TIM3}, // S2_OUT
{ TIM9, GPIOA, Pin_3, TIM_Channel_2, TIM1_BRK_TIM9_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource3, GPIO_AF_TIM9}, // S3_OUT
{ TIM2, GPIOA, Pin_2, TIM_Channel_3, TIM2_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource2, GPIO_AF_TIM2}, // S4_OUT
{ TIM5, GPIOA, Pin_1, TIM_Channel_2, TIM5_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource1, GPIO_AF_TIM5}, // S5_OUT - GPIO_PartialRemap_TIM3
{ TIM5, GPIOA, Pin_0, TIM_Channel_1, TIM5_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource0, GPIO_AF_TIM5}, // S6_OUT
};

#define USED_TIMERS ( TIM_N(2) | TIM_N(3) | TIM_N(5) | TIM_N(12) | TIM_N(8) | TIM_N(9))

#define TIMER_APB1_PERIPHERALS (RCC_APB1Periph_TIM2 | RCC_APB1Periph_TIM3 | RCC_APB1Periph_TIM5 | RCC_APB1Periph_TIM12 | RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC)
#define TIMER_APB2_PERIPHERALS (RCC_APB2Periph_TIM8 | RCC_APB2Periph_TIM9)

#endif

#ifdef QUANTON
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
{ TIM1, GPIOA, Pin_10, TIM_Channel_3, TIM1_CC_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource10, GPIO_AF_TIM1 },
Expand Down Expand Up @@ -413,6 +436,39 @@ const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {

#endif

#ifdef AQ32_V2
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
{ TIM4, GPIOD, Pin_12, TIM_Channel_1, TIM4_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource12, GPIO_AF_TIM4 },
{ TIM4, GPIOD, Pin_13, TIM_Channel_2, TIM4_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource13, GPIO_AF_TIM4 },
{ TIM4, GPIOD, Pin_14, TIM_Channel_3, TIM4_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource14, GPIO_AF_TIM4 },
{ TIM4, GPIOD, Pin_15, TIM_Channel_4, TIM4_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource14, GPIO_AF_TIM4 },
{ TIM1, GPIOE, Pin_9, TIM_Channel_1, TIM1_CC_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource9, GPIO_AF_TIM1 },
{ TIM1, GPIOE, Pin_11, TIM_Channel_2, TIM1_CC_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource11, GPIO_AF_TIM1 },
{ TIM1, GPIOE, Pin_12, TIM_Channel_3, TIM1_CC_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource12, GPIO_AF_TIM1 },
{ TIM1, GPIOE, Pin_13, TIM_Channel_4, TIM1_CC_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource13, GPIO_AF_TIM1 },

{ TIM8, GPIOC, Pin_9, TIM_Channel_4, TIM8_CC_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource9, GPIO_AF_TIM8 },
{ TIM8, GPIOC, Pin_8, TIM_Channel_3, TIM8_CC_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource8, GPIO_AF_TIM8 },
{ TIM8, GPIOC, Pin_7, TIM_Channel_2, TIM8_CC_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource7, GPIO_AF_TIM8 },
{ TIM8, GPIOC, Pin_6, TIM_Channel_1, TIM8_CC_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource6, GPIO_AF_TIM8 },
{ TIM2, GPIOA, Pin_15, TIM_Channel_1, TIM2_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource15, GPIO_AF_TIM2 },
{ TIM2, GPIOB, Pin_3, TIM_Channel_2, TIM2_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource3, GPIO_AF_TIM2 },
{ TIM3, GPIOB, Pin_4, TIM_Channel_1, TIM3_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource4, GPIO_AF_TIM3 },
{ TIM3, GPIOB, Pin_5, TIM_Channel_2, TIM3_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource5, GPIO_AF_TIM3 },

{ TIM5, GPIOA, Pin_3, TIM_Channel_4, TIM5_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource3, GPIO_AF_TIM5 },
{ TIM5, GPIOA, Pin_2, TIM_Channel_3, TIM5_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource2, GPIO_AF_TIM5 },
{ TIM5, GPIOA, Pin_1, TIM_Channel_2, TIM5_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource1, GPIO_AF_TIM5 },
{ TIM5, GPIOA, Pin_0, TIM_Channel_1, TIM5_IRQn, 1, GPIO_Mode_AF, GPIO_PinSource0, GPIO_AF_TIM5 },
};

#define USED_TIMERS ( TIM_N(1) | TIM_N(2) | TIM_N(3) | TIM_N(4) | TIM_N(5) | TIM_N(8))

#define TIMER_APB1_PERIPHERALS (RCC_APB1Periph_TIM2 | RCC_APB1Periph_TIM3 | RCC_APB1Periph_TIM4| RCC_APB1Periph_TIM5 | RCC_AHB1Periph_GPIOA | RCC_AHB1Periph_GPIOB | RCC_AHB1Periph_GPIOC | RCC_AHB1Periph_GPIOD | RCC_AHB1Periph_GPIOE)
#define TIMER_APB2_PERIPHERALS (RCC_APB2Periph_TIM1 | RCC_APB2Periph_TIM8)

#endif

#if defined(KKNGF4)
const timerHardware_t timerHardware[USABLE_TIMER_CHANNEL_COUNT] = {
{ TIM8, GPIOC, Pin_9, TIM_Channel_4, TIM8_CC_IRQn, 0, GPIO_Mode_AF, GPIO_PinSource9, GPIO_AF_TIM8}, // PPM_IN
Expand Down
2 changes: 1 addition & 1 deletion src/main/io/serial_msp.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
#include "config/config_master.h"

#include "version.h"
#ifdef NAZE
#ifdef USE_HARDWARE_REVISION_DETECTION
#include "hardware_revision.h"
#endif

Expand Down
Loading

0 comments on commit c8fd5e4

Please sign in to comment.