alejeune/TP_Voilier
2
1
Fork 0
forked from rlacroix/TP_Voilier_la_meilleure_version
Code Issues Pull requests Releases Wiki Activity

added Get_Timer_Count function

Browse source
This commit is contained in:
joelimgu 2022-10-21 16:49:52 +02:00
parent fe79171a55
commit 31c1d3de43
8 changed files with 3708 additions and 32 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
FileInclude/MyTimer.c
View file

@ -43,6 +43,9 @@ void MyTimer_Base_Stop(TIM_TypeDef * Timer ) {
} }
uint16_t Get_Timer_Count(TIM_TypeDef * Timer){
return Timer ->CNT;
}
void MyTimer_ActiveIT ( TIM_TypeDef * Timer , char Prio, void (* IT_function) (void)){ void MyTimer_ActiveIT ( TIM_TypeDef * Timer , char Prio, void (* IT_function) (void)){
Timer->DIER |= 0x01; // on autorise l'interuption au niveau du timer Timer->DIER |= 0x01; // on autorise l'interuption au niveau du timer

2
FileInclude/MyTimer.h
View file

@ -41,4 +41,6 @@ uint16_t Get_Max_Duty(TIM_TypeDef * Timer);
void Set_PWM_PRCT(TIM_TypeDef * Timer, char Channel, int percent); void Set_PWM_PRCT(TIM_TypeDef * Timer, char Channel, int percent);
uint16_t Get_Timer_Count(TIM_TypeDef * Timer);
#endif #endif

BIN
Objects/main.crf Normal file
View file

Binary file not shown.

12
Objects/main.d Normal file
View file

@ -0,0 +1,12 @@
.\objects\main.o: Sources\main.c
.\objects\main.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
.\objects\main.o: .\RTE\_SImulation\RTE_Components.h
.\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
.\objects\main.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
.\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h
.\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h
.\objects\main.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h
.\objects\main.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h
.\objects\main.o: .\FileInclude\Driver_GPIO.h
.\objects\main.o: .\FileInclude\MyTimer.h
.\objects\main.o: .\FileInclude\MyADC.h

BIN
Objects/main.o Normal file
View file

Binary file not shown.

3637
Projet1.uvguix.imbergam Normal file
View file

File diff suppressed because one or more lines are too long

48
Projet1.uvoptx
View file

@ -398,11 +398,11 @@
<GroupNumber>1</GroupNumber> <GroupNumber>1</GroupNumber>
<FileNumber>1</FileNumber> <FileNumber>1</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>.\Sources\prinicpal.c</PathWithFileName> <PathWithFileName>.\Sources\main.c</PathWithFileName>
<FilenameWithoutPath>prinicpal.c</FilenameWithoutPath> <FilenameWithoutPath>main.c</FilenameWithoutPath>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
@ -421,18 +421,6 @@
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>U:\Documents\4ir\S1\Microcontroleur\Drivers\FileInclude\Driver_GPIO.c</PathWithFileName>
<FilenameWithoutPath>Driver_GPIO.c</FilenameWithoutPath>
<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>.\FileInclude\MyTimer.c</PathWithFileName> <PathWithFileName>.\FileInclude\MyTimer.c</PathWithFileName>
<FilenameWithoutPath>MyTimer.c</FilenameWithoutPath> <FilenameWithoutPath>MyTimer.c</FilenameWithoutPath>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
@ -440,7 +428,7 @@
</File> </File>
<File> <File>
<GroupNumber>2</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>4</FileNumber> <FileNumber>3</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -452,7 +440,7 @@
</File> </File>
<File> <File>
<GroupNumber>2</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>5</FileNumber> <FileNumber>4</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -464,7 +452,7 @@
</File> </File>
<File> <File>
<GroupNumber>2</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>6</FileNumber> <FileNumber>5</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -474,6 +462,30 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>6</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\FileInclude\Driver_GPIO.c</PathWithFileName>
<FilenameWithoutPath>Driver_GPIO.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>7</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\FileInclude\Driver_GPIO.h</PathWithFileName>
<FilenameWithoutPath>Driver_GPIO.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group> </Group>
<Group> <Group>

38
Projet1.uvprojx
View file

@ -384,20 +384,15 @@
<GroupName>MesSources</GroupName> <GroupName>MesSources</GroupName>
<Files> <Files>
<File> <File>
<FileName>prinicpal.c</FileName> <FileName>main.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\Sources\prinicpal.c</FilePath> <FilePath>.\Sources\main.c</FilePath>
</File> </File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
<GroupName>MesDrivers</GroupName> <GroupName>MesDrivers</GroupName>
<Files> <Files>
<File>
<FileName>Driver_GPIO.c</FileName>
<FileType>1</FileType>
<FilePath>U:\Documents\4ir\S1\Microcontroleur\Drivers\FileInclude\Driver_GPIO.c</FilePath>
</File>
<File> <File>
<FileName>MyTimer.c</FileName> <FileName>MyTimer.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
@ -418,6 +413,16 @@
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>.\FileInclude\MyADC.h</FilePath> <FilePath>.\FileInclude\MyADC.h</FilePath>
</File> </File>
<File>
<FileName>Driver_GPIO.c</FileName>
<FileType>1</FileType>
<FilePath>.\FileInclude\Driver_GPIO.c</FilePath>
</File>
<File>
<FileName>Driver_GPIO.h</FileName>
<FileType>5</FileType>
<FilePath>.\FileInclude\Driver_GPIO.h</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -806,20 +811,15 @@
<GroupName>MesSources</GroupName> <GroupName>MesSources</GroupName>
<Files> <Files>
<File> <File>
<FileName>prinicpal.c</FileName> <FileName>main.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\Sources\prinicpal.c</FilePath> <FilePath>.\Sources\main.c</FilePath>
</File> </File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
<GroupName>MesDrivers</GroupName> <GroupName>MesDrivers</GroupName>
<Files> <Files>
<File>
<FileName>Driver_GPIO.c</FileName>
<FileType>1</FileType>
<FilePath>U:\Documents\4ir\S1\Microcontroleur\Drivers\FileInclude\Driver_GPIO.c</FilePath>
</File>
<File> <File>
<FileName>MyTimer.c</FileName> <FileName>MyTimer.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
@ -840,6 +840,16 @@
<FileType>5</FileType> <FileType>5</FileType>
<FilePath>.\FileInclude\MyADC.h</FilePath> <FilePath>.\FileInclude\MyADC.h</FilePath>
</File> </File>
<File>
<FileName>Driver_GPIO.c</FileName>
<FileType>1</FileType>
<FilePath>.\FileInclude\Driver_GPIO.c</FilePath>
</File>
<File>
<FileName>Driver_GPIO.h</FileName>
<FileType>5</FileType>
<FilePath>.\FileInclude\Driver_GPIO.h</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>