diff --git a/Services/Plateau.c b/Services/Plateau.c index 178ad85..47d86d9 100644 --- a/Services/Plateau.c +++ b/Services/Plateau.c @@ -1,9 +1,9 @@ #include #include #include -#include "GPIO.h" -#include "ADC.h" -#include "USART.h" +#include +#include +#include void handler_USART1 (void) { //Pour le projet : Lancer PWM en fonction de la valeur du curseur @@ -11,14 +11,14 @@ void handler_USART1 (void) { char valabs; if (data & (1<<7)) { MyGPIO_Set(GPIOA, 1); - valabs = 2^7 - (data & 0x7F); + valabs = (1<<7) - (data & 0x7F); Mytimer_PWM_cycle(TIM3, 3, valabs); } else { MyGPIO_Reset(GPIOA, 1); Mytimer_PWM_cycle(TIM3, 3, data); } - MyTimer_Base_Start(TIM3); + } void Plateau_Init (void){ @@ -28,5 +28,5 @@ void Plateau_Init (void){ Mytimer_PWM(TIM3, 3); My_USART_Init(USART1); MyUSART_ActiveIT(USART1, 6, &handler_USART1); -} - + MyTimer_Base_Start(TIM3); +} \ No newline at end of file diff --git a/drivers/GPIO.c b/drivers/GPIO.c index b390aaa..54f77fd 100644 --- a/drivers/GPIO.c +++ b/drivers/GPIO.c @@ -1,5 +1,5 @@ -#include "stm32f10x.h" -#include "GPIO.h" +#include +#include void MyGPIO_Init(GPIO_TypeDef *GPIO, char pin, char conf){ if (GPIO == GPIOA) {RCC->APB2ENR |= (RCC_APB2ENR_IOPAEN);} diff --git a/drivers/GPIO.h b/drivers/GPIO.h index 4b8c01b..ae5dca6 100644 --- a/drivers/GPIO.h +++ b/drivers/GPIO.h @@ -1,6 +1,6 @@ #ifndef MYGPIO_H #define MYGPIO_H -#include "stm32f10x.h" +#include #define In_Floating 0x4 #define In_PullDown 0x8 diff --git a/drivers/MyTimer.h b/drivers/MyTimer.h index 985701d..4754420 100644 --- a/drivers/MyTimer.h +++ b/drivers/MyTimer.h @@ -1,6 +1,6 @@ #ifndef MYTIMER_H #define MYTIMER_H -#include "stm32f10x.h" +#include #define MyTimer_Base_Start(Timer) Timer->CR1|=TIM_CR1_CEN; #define MyTimer_Base_Stop(Timer) Timer->CR1&=~TIM_CR1_CEN; diff --git a/drivers/USART.c b/drivers/USART.c index 2276080..113100f 100644 --- a/drivers/USART.c +++ b/drivers/USART.c @@ -1,5 +1,5 @@ #include -#include "USART.h" +#include #include void (*ptr_fct_u1) (void);