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

Formatting based on feedback

This commit is contained in:
blckmn 2016-07-02 19:37:39 +10:00
parent 7d38b510a4
commit afea1d6123
2 changed files with 54 additions and 58 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/main/drivers/light_ws2811strip_stm32f4xx.c
View File

@ -96,8 +96,7 @@ void ws2811LedStripHardwareInit(void)
TIM_OCInitStructure.TIM_Pulse = 0; TIM_OCInitStructure.TIM_Pulse = 0;
uint32_t channelAddress = 0; uint32_t channelAddress = 0;
switch (WS2811_TIMER_CHANNEL) switch (WS2811_TIMER_CHANNEL) {
{
case TIM_Channel_1: case TIM_Channel_1:
TIM_OC1Init(WS2811_TIMER, &TIM_OCInitStructure); TIM_OC1Init(WS2811_TIMER, &TIM_OCInitStructure);
timDMASource = TIM_DMA_CC1; timDMASource = TIM_DMA_CC1;

7
src/main/drivers/timer_stm32f4xx.c
View File

@ -63,8 +63,7 @@ void TIM_SelectOCxM_NoDisable(TIM_TypeDef* TIMx, uint16_t TIM_Channel, uint16_t
tmp = (uint32_t) TIMx; tmp = (uint32_t) TIMx;
tmp += CCMR_Offset; tmp += CCMR_Offset;
if((TIM_Channel == TIM_Channel_1) ||(TIM_Channel == TIM_Channel_3)) if((TIM_Channel == TIM_Channel_1) ||(TIM_Channel == TIM_Channel_3)) {
{
tmp += (TIM_Channel>>1); tmp += (TIM_Channel>>1);
/* Reset the OCxM bits in the CCMRx register */ /* Reset the OCxM bits in the CCMRx register */
@ -72,9 +71,7 @@ void TIM_SelectOCxM_NoDisable(TIM_TypeDef* TIMx, uint16_t TIM_Channel, uint16_t
/* Configure the OCxM bits in the CCMRx register */ /* Configure the OCxM bits in the CCMRx register */
*(__IO uint32_t *) tmp |= TIM_OCMode; *(__IO uint32_t *) tmp |= TIM_OCMode;
} } else {
else
{
tmp += (uint16_t)(TIM_Channel - (uint16_t)4)>> (uint16_t)1; tmp += (uint16_t)(TIM_Channel - (uint16_t)4)>> (uint16_t)1;
/* Reset the OCxM bits in the CCMRx register */ /* Reset the OCxM bits in the CCMRx register */