X10 HAL update

- LCD OK
 - Backlight OK
 - Sound OK
 - Keys OK
 - Haptic OK

 - ADC KO
This commit is contained in:
Bertrand Songis
2017-08-12 10:48:38 +02:00
parent 8d8fef23c9
commit de00d223c4
3 changed files with 29 additions and 22 deletions
+6 -6
View File
@@ -46,14 +46,14 @@ void hapticInit(void)
GPIO_PinAFConfig(HAPTIC_GPIO, HAPTIC_GPIO_PinSource, HAPTIC_GPIO_AF);
HAPTIC_TIMER->ARR = 100 ;
HAPTIC_TIMER->ARR = 100;
HAPTIC_TIMER->PSC = (PERI2_FREQUENCY * TIMER_MULT_APB2) / 10000 - 1;
HAPTIC_TIMER->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2 ; // PWM
HAPTIC_TIMER->CCER = TIM_CCER_CC1E ;
HAPTIC_TIMER->CCMR1 = TIM_CCMR1_OC1M_1 | TIM_CCMR1_OC1M_2; // PWM
HAPTIC_TIMER->CCER = TIM_CCER_CC1E;
HAPTIC_TIMER->CCR1 = 0 ;
HAPTIC_TIMER->EGR = 0 ;
HAPTIC_TIMER->CR1 = TIM_CR1_CEN ; // Counter enable
HAPTIC_TIMER->CCR1 = 0;
HAPTIC_TIMER->EGR = 0;
HAPTIC_TIMER->CR1 = TIM_CR1_CEN; // Counter enable
}
#else