diff --git a/.gitignore b/.gitignore index 43314a8..71f418e 100644 --- a/.gitignore +++ b/.gitignore @@ -23,8 +23,4 @@ *.iex **/Objects/ **/Listings/ -**/Debug/ - - - - +**/Debug/ \ No newline at end of file diff --git a/Services/Plateau.c b/Services/Plateau.c index bf404d7..b0fa2e6 100644 --- a/Services/Plateau.c +++ b/Services/Plateau.c @@ -28,5 +28,4 @@ void Plateau_Init (void){ Mytimer_PWM(TIM3, 3); My_USART_Init(USART1); MyUSART_ActiveIT(USART1, 6, &handler_USART1); -} - +} \ No newline at end of file diff --git a/drivers/ADC.c b/drivers/ADC.c index d8159fd..1426e3d 100644 --- a/drivers/ADC.c +++ b/drivers/ADC.c @@ -40,4 +40,3 @@ void ADC1_2_IRQHandler(void){ // ts = 9.010913347*(Rain +1000.00)*0.000000000008; // cycle = ts*12/0.000001; // ADC->SMPR1 |= -//} \ No newline at end of file diff --git a/drivers/GPIO.c b/drivers/GPIO.c index 2fb0e2c..893704f 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);} @@ -54,5 +54,4 @@ void MyGPIO_Reset(GPIO_TypeDef *GPIO, char GPIO_Pin){ void MyGPIO_Toggle(GPIO_TypeDef *GPIO, char GPIO_Pin){ if (((GPIO->ODR>>GPIO_Pin)&1) == 1) MyGPIO_Reset(GPIO, GPIO_Pin); - else MyGPIO_Set(GPIO, GPIO_Pin); -} \ No newline at end of file + else MyGPIO_Set(GPIO, GPIO_Pin); \ No newline at end of file diff --git a/drivers/GPIO.h b/drivers/GPIO.h index adc7563..7c963c7 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.c b/drivers/MyTimer.c index cd92a55..af8c94a 100644 --- a/drivers/MyTimer.c +++ b/drivers/MyTimer.c @@ -87,5 +87,4 @@ void TIM3_IRQHandler(void){ void TIM4_IRQHandler(void){ TIM4->SR&=~TIM_SR_UIF; - Ptr_fct_t4(); -} \ No newline at end of file + Ptr_fct_t4(); \ No newline at end of file diff --git a/drivers/MyTimer.h b/drivers/MyTimer.h index 3fd5126..c6299cb 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 ab52be7..e00e080 100644 --- a/drivers/USART.c +++ b/drivers/USART.c @@ -74,5 +74,4 @@ void USART1_IRQHandler(void){ void USART3_IRQHandler(void){ USART3->SR&=~USART_SR_RXNE; - ptr_fct_u3(); -} \ No newline at end of file + ptr_fct_u3(); \ No newline at end of file diff --git a/readme.txt b/readme.txt index 2b31011..1385f26 100644 --- a/readme.txt +++ b/readme.txt @@ -1 +1 @@ -hey \ No newline at end of file +hey