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

Reformatted PPM output code to match coding standards.

Browse Source
This commit is contained in:
Brian Webb 2013-02-02 01:50:02 +00:00
parent be444db7f8
commit 18c592a37a
3 changed files with 53 additions and 63 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flight/PiOS/Common/pios_rfm22b.c
View File

@ -1786,8 +1786,7 @@ static enum pios_rfm22b_event rfm22_rxData(struct pios_rfm22b_dev *rfm22b_dev)
case PACKET_TYPE_PPM: case PACKET_TYPE_PPM:
{ {
PHPpmPacketHandle ppmp = (PHPpmPacketHandle)&(rfm22b_dev->rx_packet); PHPpmPacketHandle ppmp = (PHPpmPacketHandle)&(rfm22b_dev->rx_packet);
for (uint8_t i = 0; i < PIOS_RFM22B_RCVR_MAX_CHANNELS; ++i) for (uint8_t i = 0; i < PIOS_RFM22B_RCVR_MAX_CHANNELS; ++i) {
{
rfm22b_dev->ppm_channel[i] = ppmp->channels[i]; rfm22b_dev->ppm_channel[i] = ppmp->channels[i];
#if defined(PIOS_INCLUDE_PPM_OUT) && defined(PIOS_PPM_OUTPUT) #if defined(PIOS_INCLUDE_PPM_OUT) && defined(PIOS_PPM_OUTPUT)
if (PIOS_PPM_OUTPUT) if (PIOS_PPM_OUTPUT)

110
flight/PiOS/STM32F10x/pios_ppm_out.c
View File

@ -128,72 +128,65 @@ int32_t PIOS_PPM_Out_Init(uint32_t *ppm_out_id, const struct pios_ppm_out_cfg *
return -1; return -1;
// Configure the channels to be in output compare mode // Configure the channels to be in output compare mode
{ const struct pios_tim_channel *chan = cfg->channel;
const struct pios_tim_channel *chan = cfg->channel;
/* Set up for output compare function */ /* Set up for output compare function */
switch(chan->timer_chan) { switch(chan->timer_chan) {
case TIM_Channel_1: case TIM_Channel_1:
TIM_OC1Init(chan->timer, &cfg->tim_oc_init); TIM_OC1Init(chan->timer, &cfg->tim_oc_init);
TIM_OC1PreloadConfig(chan->timer, TIM_OCPreload_Enable); TIM_OC1PreloadConfig(chan->timer, TIM_OCPreload_Enable);
break; break;
case TIM_Channel_2: case TIM_Channel_2:
TIM_OC2Init(chan->timer, &cfg->tim_oc_init); TIM_OC2Init(chan->timer, &cfg->tim_oc_init);
TIM_OC2PreloadConfig(chan->timer, TIM_OCPreload_Enable); TIM_OC2PreloadConfig(chan->timer, TIM_OCPreload_Enable);
break; break;
case TIM_Channel_3: case TIM_Channel_3:
TIM_OC3Init(chan->timer, &cfg->tim_oc_init); TIM_OC3Init(chan->timer, &cfg->tim_oc_init);
TIM_OC3PreloadConfig(chan->timer, TIM_OCPreload_Enable); TIM_OC3PreloadConfig(chan->timer, TIM_OCPreload_Enable);
break; break;
case TIM_Channel_4: case TIM_Channel_4:
TIM_OC4Init(chan->timer, &cfg->tim_oc_init); TIM_OC4Init(chan->timer, &cfg->tim_oc_init);
TIM_OC4PreloadConfig(chan->timer, TIM_OCPreload_Enable); TIM_OC4PreloadConfig(chan->timer, TIM_OCPreload_Enable);
break; break;
}
switch (chan->timer_chan) {
case TIM_Channel_1:
TIM_ITConfig(chan->timer, TIM_IT_CC1 | TIM_IT_Update, ENABLE);
break;
case TIM_Channel_2:
TIM_ITConfig(chan->timer, TIM_IT_CC2 | TIM_IT_Update, ENABLE);
break;
case TIM_Channel_3:
TIM_ITConfig(chan->timer, TIM_IT_CC3 | TIM_IT_Update, ENABLE);
break;
case TIM_Channel_4:
TIM_ITConfig(chan->timer, TIM_IT_CC4 | TIM_IT_Update, ENABLE);
break;
}
TIM_ARRPreloadConfig(chan->timer, ENABLE);
TIM_CtrlPWMOutputs(chan->timer, ENABLE);
TIM_Cmd(chan->timer, ENABLE);
} }
switch (chan->timer_chan) {
case TIM_Channel_1:
TIM_ITConfig(chan->timer, TIM_IT_CC1 | TIM_IT_Update, ENABLE);
break;
case TIM_Channel_2:
TIM_ITConfig(chan->timer, TIM_IT_CC2 | TIM_IT_Update, ENABLE);
break;
case TIM_Channel_3:
TIM_ITConfig(chan->timer, TIM_IT_CC3 | TIM_IT_Update, ENABLE);
break;
case TIM_Channel_4:
TIM_ITConfig(chan->timer, TIM_IT_CC4 | TIM_IT_Update, ENABLE);
break;
}
TIM_ARRPreloadConfig(chan->timer, ENABLE);
TIM_CtrlPWMOutputs(chan->timer, ENABLE);
TIM_Cmd(chan->timer, ENABLE);
TIM_TimeBaseInitTypeDef TIM_TimeBaseStructure; TIM_TimeBaseInitTypeDef TIM_TimeBaseStructure;
TIM_TimeBaseStructure.TIM_ClockDivision = TIM_CKD_DIV1; TIM_TimeBaseStructure.TIM_ClockDivision = TIM_CKD_DIV1;
TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up; TIM_TimeBaseStructure.TIM_CounterMode = TIM_CounterMode_Up;
TIM_TimeBaseStructure.TIM_Prescaler = (PIOS_MASTER_CLOCK / 1000000) - 1; TIM_TimeBaseStructure.TIM_Prescaler = (PIOS_MASTER_CLOCK / 1000000) - 1;
TIM_TimeBaseStructure.TIM_Period = ((1000000 / 100) - 1); TIM_TimeBaseStructure.TIM_Period = ((1000000 / 100) - 1);
const struct pios_tim_channel * chan = cfg->channel;
TIM_TimeBaseInit(chan->timer, &TIM_TimeBaseStructure); TIM_TimeBaseInit(chan->timer, &TIM_TimeBaseStructure);
switch(chan->timer_chan) {
{ case TIM_Channel_1:
const struct pios_tim_channel * chan = cfg->channel; TIM_SetCompare1(chan->timer, ppm_dev->triggering_period);
switch(chan->timer_chan) { break;
case TIM_Channel_1: case TIM_Channel_2:
TIM_SetCompare1(chan->timer, ppm_dev->triggering_period); TIM_SetCompare2(chan->timer, ppm_dev->triggering_period);
break; break;
case TIM_Channel_2: case TIM_Channel_3:
TIM_SetCompare2(chan->timer, ppm_dev->triggering_period); TIM_SetCompare3(chan->timer, ppm_dev->triggering_period);
break; break;
case TIM_Channel_3: case TIM_Channel_4:
TIM_SetCompare3(chan->timer, ppm_dev->triggering_period); TIM_SetCompare4(chan->timer, ppm_dev->triggering_period);
break; break;
case TIM_Channel_4:
TIM_SetCompare4(chan->timer, ppm_dev->triggering_period);
break;
}
} }
return 0; return 0;
} }
@ -222,8 +215,7 @@ static void PIOS_PPM_OUT_tim_edge_cb (uint32_t tim_id, uint32_t context, uint8_t
// Finish out the frame if we reached the last channel. // Finish out the frame if we reached the last channel.
uint32_t pulse_width; uint32_t pulse_width;
if ((ppm_dev->NumChannelCounter >= PIOS_PPM_OUT_MAX_CHANNELS)) if ((ppm_dev->NumChannelCounter >= PIOS_PPM_OUT_MAX_CHANNELS)) {
{
pulse_width = PIOS_PPM_OUT_FRAME_PERIOD_US - ppm_dev->ChannelSum; pulse_width = PIOS_PPM_OUT_FRAME_PERIOD_US - ppm_dev->ChannelSum;
ppm_dev->NumChannelCounter = 0; ppm_dev->NumChannelCounter = 0;
ppm_dev->ChannelSum = 0; ppm_dev->ChannelSum = 0;

3
flight/PipXtreme/System/pios_board.c
View File

@ -200,8 +200,7 @@ void PIOS_Board_Init(void) {
#endif #endif
/* Configure PPM input */ /* Configure PPM input */
switch (oplinkSettings.PPM) switch (oplinkSettings.PPM) {
{
#if defined(PIOS_INCLUDE_PPM) #if defined(PIOS_INCLUDE_PPM)
case OPLINKSETTINGS_PPM_INPUT: case OPLINKSETTINGS_PPM_INPUT:
{ {