diff --git a/keilproject/Source/Principale.c b/keilproject/Source/Principale.c index e4d5a23..6a6a664 100644 --- a/keilproject/Source/Principale.c +++ b/keilproject/Source/Principale.c @@ -1,8 +1,40 @@ #include "stm32f10x.h" #include "../../driver/MyI2C.h" #include "../../driver/MySPI.h" +#include "../../driver/timer.h" +#include "../../driver/gpio.h" + void Girouette_Angle(void); + int Angle_Girouette=0; + int main (void) { + MyGPIO_Struct_TypeDef MyGPIO={GPIOB,3,In_PullDown}; + + MyGPIO_Init(&MyGPIO); + MyGPIO.GPIO_Pin=4; + MyGPIO_Init(&MyGPIO); + //inturutpion sur rise de gbpiob 3 avec appelle de Girouette_Angle + MyTimer_Struct_Typedef MyTimerGirouette ={TIM4,72,1};//500kHZ + MyTimer_Base_Init(&MyTimerGirouette); + MyTimer_ActiveIT(TIM4,4,Girouette_Angle);//changer prio + while(1){}; - } +} + + +void Girouette_Angle(void) +{ + if ( ( Angle_Girouette==360 )||( Angle_Girouette==-360) ) + { + Angle_Girouette=0; + } + if(MyGPIO_Read(GPIOB,4)) + { + Angle_Girouette =Angle_Girouette-1/4; + }else{ + Angle_Girouette =Angle_Girouette+1/4; + } + //print(Angle_Girouette);//a suppr apr test +} + diff --git a/keilproject/voilier.uvoptx b/keilproject/voilier.uvoptx index b667108..c4ff53b 100644 --- a/keilproject/voilier.uvoptx +++ b/keilproject/voilier.uvoptx @@ -203,6 +203,38 @@ + + 4 + 0 + 11 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + .\Source\Principale.c + + +
+ + 5 + 0 + 18 + 1 +
0
+ 0 + 0 + 0 + 0 + 0 + 0 + .\Source\Principale.c + + +
diff --git a/keilproject/voilier.uvprojx b/keilproject/voilier.uvprojx index cda4e65..389748f 100644 --- a/keilproject/voilier.uvprojx +++ b/keilproject/voilier.uvprojx @@ -10,13 +10,14 @@ Simulé 0x4 ARM-ADS - 5060960::V5.06 update 7 (build 960)::.\ARMCC - 0 + 6190000::V6.19::ARMCLANG + 6190000::V6.19::ARMCLANG + 1 STM32F103RB STMicroelectronics - Keil.STM32F1xx_DFP.2.3.0 + Keil.STM32F1xx_DFP.2.4.0 http://www.keil.com/pack/ IRAM(0x20000000,0x00005000) IROM(0x08000000,0x00020000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE @@ -186,6 +187,7 @@ 0 0 0 + 0 0 0 8 @@ -313,7 +315,7 @@ 1 - 1 + 2 0 0 1 @@ -322,7 +324,7 @@ 0 0 0 - 2 + 3 0 0 0 @@ -418,7 +420,7 @@ STM32F103RB STMicroelectronics - Keil.STM32F1xx_DFP.2.3.0 + Keil.STM32F1xx_DFP.2.4.0 http://www.keil.com/pack/ IRAM(0x20000000,0x00005000) IROM(0x08000000,0x00020000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE @@ -588,6 +590,7 @@ 0 0 0 + 0 0 0 8 @@ -815,15 +818,15 @@ - - + + - + @@ -834,7 +837,7 @@ RTE\Device\STM32F103RB\RTE_Device.h - + @@ -843,7 +846,7 @@ RTE\Device\STM32F103RB\startup_stm32f10x_md.s - + @@ -852,7 +855,7 @@ RTE\Device\STM32F103RB\system_stm32f10x.c - +