diff --git a/Services/Source/Girouette.c b/Services/Source/Girouette.c index 86683b6..6f3d61c 100644 --- a/Services/Source/Girouette.c +++ b/Services/Source/Girouette.c @@ -1,5 +1,5 @@ #include "stm32f10x.h" -#include "Timer.h" +#include "Horloge.h" #include "DriverGPIO.h" #include "Girouette.h" #include "PWM.h" @@ -10,7 +10,7 @@ void configEncoder(TIM_TypeDef * Timer) { // Timer - EnableTimer(Timer); + Timer_init(Timer, 0, 0); // Settings Timer -> CCMR1 |= TIM_CCMR1_CC1S; // TI1FP1 mapped on TI1 @@ -42,7 +42,7 @@ int angleVent(TIM_TypeDef * Timer) { // Returner l'angle du vent int vent2voile(int angle) { // Conversion angle vent à angle voile if(angle < 45){ - return 0; // Les voiles restent immobiles + return 0;// Les voiles restent immobiles } else{ return(2*(angle-45)/3); // Augmentation linéaire diff --git a/gitignore b/gitignore deleted file mode 100644 index a2e229f..0000000 --- a/gitignore +++ /dev/null @@ -1,30 +0,0 @@ -*.obj -*.o -*.bin -*.list -*.map -*.mk -*.makefile -*.o -*.su -*.d -*.elf -*.scvd -*.crf -*.map -*.sct -*.dbgconf -*.axf -*.htm -*.lnp -*.dep -*.uvguix.* -*.lst -*.iex -**/Objects/ -**/Listings/ -**/Debug/ - - - -