[Horus] Haptic now OK

This commit is contained in:
Bertrand Songis
2016-01-20 21:40:53 +01:00
parent c51a85f376
commit c9ae964428
8 changed files with 22 additions and 15 deletions
+12 -6
View File
@@ -45,12 +45,18 @@ void hapticInit(void)
GPIO_PinAFConfig(HAPTIC_GPIO, HAPTIC_GPIO_PinSource, HAPTIC_GPIO_AF);
HAPTIC_GPIO_TIMER->ARR = 100 ;
HAPTIC_GPIO_TIMER->ARR = 100;
HAPTIC_GPIO_TIMER->PSC = (PERI2_FREQUENCY * TIMER_MULT_APB2) / 10000 - 1;
HAPTIC_GPIO_TIMER->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2 ; // PWM
HAPTIC_GPIO_TIMER->CCER = TIM_CCER_CC1E ;
HAPTIC_GPIO_TIMER->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2; // PWM
HAPTIC_GPIO_TIMER->CCER = TIM_CCER_CC1E;
HAPTIC_GPIO_TIMER->CCR1 = 0 ;
HAPTIC_GPIO_TIMER->EGR = 0 ;
HAPTIC_GPIO_TIMER->CR1 = TIM_CR1_CEN ; // Counter enable
HAPTIC_GPIO_TIMER->CCR1 = 0;
HAPTIC_GPIO_TIMER->EGR = 0;
HAPTIC_GPIO_TIMER->CR1 = TIM_CR1_CEN; // counter enable
}
void hapticDone(void)
{
hapticOff();
RCC_AHB1PeriphClockCmd(HAPTIC_RCC_AHB1Periph, DISABLE);
}