INSA/boat-project
1
0
Fork 0
mirror of https://git.etud.insa-toulouse.fr/boujon/voilier-team-1.git synced 2025-06-08 07:50:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Girouette avec fonction intern du uc

Browse source
This commit is contained in:
Simon 2023-04-07 15:33:22 +02:00
parent ed15d8a584
commit 25b871f48e
4 changed files with 129 additions and 27 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
keilproject/RTE/_R_el/RTE_Components.h
View file

@ -3,7 +3,7 @@
* Auto generated Run-Time-Environment Configuration File
* *** Do not modify ! ***
*
* Project: 'gpiodriver'
* Project: 'voilier'
* Target: 'Réel'
*/

38
keilproject/Source/Principale.c
View file

@ -9,32 +9,30 @@
int main (void)
{
MyGPIO_Struct_TypeDef MyGPIO={GPIOB,3,In_PullDown};
//configuration gpiob6 et gpiob7 en entrées pull up
MyGPIO_Struct_TypeDef MyGPIO={GPIOB,6,In_PullUp};
MyGPIO_Init(&MyGPIO);
MyGPIO.GPIO_Pin=4;
MyGPIO.GPIO_Pin=7;
MyGPIO_Init(&MyGPIO);
//inturutpion sur rise de gbpiob 3 avec appelle de Girouette_Angle
MyTimer_Struct_Typedef MyTimerGirouette ={TIM4,72,1};//500kHZ
//configuration TIM4 reset a 360
MyTimer_Struct_Typedef MyTimerGirouette ={TIM4,359,1};
MyTimer_Base_Init(&MyTimerGirouette);
MyTimer_ActiveIT(TIM4,4,Girouette_Angle);//changer prio
TIM4->SMCR &=~0x07;
TIM4->SMCR |=~0x011;
TIM4->CCMR1 |= TIM_CCMR1_CC1S_0;
TIM4->CCMR1 |= TIM_CCMR1_CC2S_0;
TIM4->CCER &=~TIM_CCER_CC1P;
TIM4->CCER &=~TIM_CCER_CC1NP;
TIM4->CCER &=~TIM_CCER_CC2P;
TIM4->CCER &=~TIM_CCER_CC2NP;
TIM4->CCMR1&=~TIM_CCER_IC1F;
TIM1->CR1 |= 1;
Angle_Girouette=TIM4->CNT;
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
}

72
keilproject/voilier.uvoptx
View file

@ -75,7 +75,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -222,7 +222,23 @@
<Bp>
<Number>5</Number>
<Type>0</Type>
<LineNumber>18</LineNumber>
<LineNumber>16</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>0</BreakIfRCount>
<Filename>.\Source\Principale.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>6</Number>
<Type>0</Type>
<LineNumber>22</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>0</Address>
<ByteObject>0</ByteObject>
@ -364,7 +380,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -534,7 +550,7 @@
<GroupNumber>1</GroupNumber>
<FileNumber>1</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Source\Principale.c</PathWithFileName>
@ -562,6 +578,54 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>3</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\driver\adc.c</PathWithFileName>
<FilenameWithoutPath>adc.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>4</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\driver\gpio.c</PathWithFileName>
<FilenameWithoutPath>gpio.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>5</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\driver\timer.c</PathWithFileName>
<FilenameWithoutPath>timer.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>6</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\driver\uart.c</PathWithFileName>
<FilenameWithoutPath>uart.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>

44
keilproject/voilier.uvprojx
View file

@ -400,6 +400,26 @@
<FileType>4</FileType>
<FilePath>..\driver\Lib_Com_Periph_2022.lib</FilePath>
</File>
<File>
<FileName>adc.c</FileName>
<FileType>1</FileType>
<FilePath>..\driver\adc.c</FilePath>
</File>
<File>
<FileName>gpio.c</FileName>
<FileType>1</FileType>
<FilePath>..\driver\gpio.c</FilePath>
</File>
<File>
<FileName>timer.c</FileName>
<FileType>1</FileType>
<FilePath>..\driver\timer.c</FilePath>
</File>
<File>
<FileName>uart.c</FileName>
<FileType>1</FileType>
<FilePath>..\driver\uart.c</FilePath>
</File>
</Files>
</Group>
<Group>
@ -414,7 +434,7 @@
<TargetName>Réel</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
<pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
<uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
@ -718,7 +738,7 @@
</ArmAdsMisc>
<Cads>
<interw>1</interw>
<Optim>1</Optim>
<Optim>2</Optim>
<oTime>0</oTime>
<SplitLS>0</SplitLS>
<OneElfS>1</OneElfS>
@ -803,6 +823,26 @@
<FileType>4</FileType>
<FilePath>..\driver\Lib_Com_Periph_2022.lib</FilePath>
</File>
<File>
<FileName>adc.c</FileName>
<FileType>1</FileType>
<FilePath>..\driver\adc.c</FilePath>
</File>
<File>
<FileName>gpio.c</FileName>
<FileType>1</FileType>
<FilePath>..\driver\gpio.c</FilePath>
</File>
<File>
<FileName>timer.c</FileName>
<FileType>1</FileType>
<FilePath>..\driver\timer.c</FilePath>
</File>
<File>
<FileName>uart.c</FileName>
<FileType>1</FileType>
<FilePath>..\driver\uart.c</FilePath>
</File>
</Files>
</Group>
<Group>