rooty/LibrePilot
1
0
Fork 0
mirror of https://bitbucket.org/librepilot/librepilot.git synced 2025-02-28 17:54:15 +01:00
Code Issues Releases Activity

mapped LED1&2 ports to output 9&10 so that it is possible to use as accessory or pwm buzzer

Browse Source
This commit is contained in:
a*morale 2012-07-31 21:54:19 +02:00 committed by James Cotton
parent aaaf23e64c
commit 316e02612e
2 changed files with 74 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
flight/Revolution/System/pios_board.c
View File

@ -421,6 +421,7 @@ void PIOS_Board_Init(void) {
/* Set up pulse timers */ /* Set up pulse timers */
PIOS_TIM_InitClock(&tim_1_cfg); PIOS_TIM_InitClock(&tim_1_cfg);
PIOS_TIM_InitClock(&tim_2_cfg);
PIOS_TIM_InitClock(&tim_3_cfg); PIOS_TIM_InitClock(&tim_3_cfg);
PIOS_TIM_InitClock(&tim_4_cfg); PIOS_TIM_InitClock(&tim_4_cfg);
PIOS_TIM_InitClock(&tim_5_cfg); PIOS_TIM_InitClock(&tim_5_cfg);

93
flight/board_hw_defs/revolution/board_hw_defs.c
View File

@ -1313,13 +1313,14 @@ void PIOS_RTC_IRQ_Handler (void)
#include "pios_tim_priv.h" #include "pios_tim_priv.h"
static const TIM_TimeBaseInitTypeDef tim_3_5_time_base = { static const TIM_TimeBaseInitTypeDef tim_2_3_5_time_base = {
.TIM_Prescaler = (PIOS_PERIPHERAL_APB1_CLOCK / 1000000) - 1, .TIM_Prescaler = (PIOS_PERIPHERAL_APB1_CLOCK / 1000000) - 1,
.TIM_ClockDivision = TIM_CKD_DIV1, .TIM_ClockDivision = TIM_CKD_DIV1,
.TIM_CounterMode = TIM_CounterMode_Up, .TIM_CounterMode = TIM_CounterMode_Up,
.TIM_Period = ((1000000 / PIOS_SERVO_UPDATE_HZ) - 1), .TIM_Period = ((1000000 / PIOS_SERVO_UPDATE_HZ) - 1),
.TIM_RepetitionCounter = 0x0000, .TIM_RepetitionCounter = 0x0000,
}; };
static const TIM_TimeBaseInitTypeDef tim_9_10_11_time_base = { static const TIM_TimeBaseInitTypeDef tim_9_10_11_time_base = {
.TIM_Prescaler = (PIOS_PERIPHERAL_APB2_CLOCK / 1000000) - 1, .TIM_Prescaler = (PIOS_PERIPHERAL_APB2_CLOCK / 1000000) - 1,
.TIM_ClockDivision = TIM_CKD_DIV1, .TIM_ClockDivision = TIM_CKD_DIV1,
@ -1328,9 +1329,43 @@ static const TIM_TimeBaseInitTypeDef tim_9_10_11_time_base = {
.TIM_RepetitionCounter = 0x0000, .TIM_RepetitionCounter = 0x0000,
}; };
// Set up timers that only have inputs on APB2
static const TIM_TimeBaseInitTypeDef tim_1_time_base = {
.TIM_Prescaler = (PIOS_PERIPHERAL_APB2_CLOCK / 1000000) - 1,
.TIM_ClockDivision = TIM_CKD_DIV1,
.TIM_CounterMode = TIM_CounterMode_Up,
.TIM_Period = 0xFFFF,
.TIM_RepetitionCounter = 0x0000,
};
// Set up timers that only have inputs on APB2
static const TIM_TimeBaseInitTypeDef tim_4_time_base = {
.TIM_Prescaler = (PIOS_PERIPHERAL_APB1_CLOCK / 1000000) - 1,
.TIM_ClockDivision = TIM_CKD_DIV1,
.TIM_CounterMode = TIM_CounterMode_Up,
.TIM_Period = 0xFFFF,
.TIM_RepetitionCounter = 0x0000,
};
static const struct pios_tim_clock_cfg tim_2_cfg = {
.timer = TIM2,
.time_base_init = &tim_2_3_5_time_base,
.irq = {
.init = {
.NVIC_IRQChannel = TIM2_IRQn,
.NVIC_IRQChannelPreemptionPriority = PIOS_IRQ_PRIO_MID,
.NVIC_IRQChannelSubPriority = 0,
.NVIC_IRQChannelCmd = ENABLE,
},
},
};
static const struct pios_tim_clock_cfg tim_3_cfg = { static const struct pios_tim_clock_cfg tim_3_cfg = {
.timer = TIM3, .timer = TIM3,
.time_base_init = &tim_3_5_time_base, .time_base_init = &tim_2_3_5_time_base,
.irq = { .irq = {
.init = { .init = {
.NVIC_IRQChannel = TIM3_IRQn, .NVIC_IRQChannel = TIM3_IRQn,
@ -1341,9 +1376,10 @@ static const struct pios_tim_clock_cfg tim_3_cfg = {
}, },
}; };
static const struct pios_tim_clock_cfg tim_5_cfg = { static const struct pios_tim_clock_cfg tim_5_cfg = {
.timer = TIM5, .timer = TIM5,
.time_base_init = &tim_3_5_time_base, .time_base_init = &tim_2_3_5_time_base,
.irq = { .irq = {
.init = { .init = {
.NVIC_IRQChannel = TIM5_IRQn, .NVIC_IRQChannel = TIM5_IRQn,
@ -1393,23 +1429,6 @@ static const struct pios_tim_clock_cfg tim_11_cfg = {
}, },
}; };
// Set up timers that only have inputs on APB2
static const TIM_TimeBaseInitTypeDef tim_1_time_base = {
.TIM_Prescaler = (PIOS_PERIPHERAL_APB2_CLOCK / 1000000) - 1,
.TIM_ClockDivision = TIM_CKD_DIV1,
.TIM_CounterMode = TIM_CounterMode_Up,
.TIM_Period = 0xFFFF,
.TIM_RepetitionCounter = 0x0000,
};
// Set up timers that only have inputs on APB2
static const TIM_TimeBaseInitTypeDef tim_4_time_base = {
.TIM_Prescaler = (PIOS_PERIPHERAL_APB1_CLOCK / 1000000) - 1,
.TIM_ClockDivision = TIM_CKD_DIV1,
.TIM_CounterMode = TIM_CounterMode_Up,
.TIM_Period = 0xFFFF,
.TIM_RepetitionCounter = 0x0000,
};
static const struct pios_tim_clock_cfg tim_1_cfg = { static const struct pios_tim_clock_cfg tim_1_cfg = {
.timer = TIM1, .timer = TIM1,
.time_base_init = &tim_1_time_base, .time_base_init = &tim_1_time_base,
@ -1569,6 +1588,40 @@ static const struct pios_tim_channel pios_tim_servoport_all_pins[] = {
}, },
.remap = GPIO_AF_TIM3, .remap = GPIO_AF_TIM3,
}, },
// PB3 - TIM2 CH2 LED1 Ok
{
.timer = TIM2,
.timer_chan = TIM_Channel_2,
.pin = {
.gpio = GPIOB,
.init = {
.GPIO_Pin = GPIO_Pin_3,
.GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_AF,
.GPIO_OType = GPIO_OType_PP,
.GPIO_PuPd = GPIO_PuPd_UP
},
.pin_source = GPIO_PinSource3,
},
.remap = GPIO_AF_TIM2,
},
// led PB4 - TIM3 CH1 LED2
{
.timer = TIM3,
.timer_chan = TIM_Channel_1,
.pin = {
.gpio = GPIOB,
.init = {
.GPIO_Pin = GPIO_Pin_4,
.GPIO_Speed = GPIO_Speed_2MHz,
.GPIO_Mode = GPIO_Mode_AF,
.GPIO_OType = GPIO_OType_PP,
.GPIO_PuPd = GPIO_PuPd_UP
},
.pin_source = GPIO_PinSource4,
},
.remap = GPIO_AF_TIM3,
},
}; };
const struct pios_servo_cfg pios_servo_cfg = { const struct pios_servo_cfg pios_servo_cfg = {