guldenst/projet_voilier
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

merge into: guldenst:master
Branches Tags
guldenst:master
guldenst:rf_input
guldenst:alimentation
guldenst:emetteur_rf
guldenst:accelerometer
guldenst:servo
guldenst:dc_motor
guldenst:incr_encoder
guldenst:recepteur_hf
guldenst:affichage
...
pull from: guldenst:recepteur_hf
Branches Tags
guldenst:master
guldenst:rf_input
guldenst:alimentation
guldenst:emetteur_rf
guldenst:accelerometer
guldenst:servo
guldenst:dc_motor
guldenst:incr_encoder
guldenst:recepteur_hf
guldenst:affichage

1 commit
master ... recepteur_

Author SHA1 Message Date
foussats
1591c8152d branche alimentation 2020-11-11 14:46:13 +01:00
7 changed files with 105 additions and 53 deletions
Show stats Expand all files Collapse all files

55
keil_project/MDK-ARM/Project.uvguix.momof
View file

File diff suppressed because one or more lines are too long

58
keil_project/MDK-ARM/Project.uvoptx
View file

@ -404,6 +404,22 @@
<ExecCommand></ExecCommand> <ExecCommand></ExecCommand>
<Expression></Expression> <Expression></Expression>
</Bp> </Bp>
<Bp>
<Number>2</Number>
<Type>0</Type>
<LineNumber>42</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>../Src/main.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
</Breakpoint> </Breakpoint>
<WatchWindow1> <WatchWindow1>
<Ww> <Ww>
@ -495,7 +511,7 @@
<GroupNumber>1</GroupNumber> <GroupNumber>1</GroupNumber>
<FileNumber>1</FileNumber> <FileNumber>1</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>../Src/main.c</PathWithFileName> <PathWithFileName>../Src/main.c</PathWithFileName>
@ -515,7 +531,7 @@
<GroupNumber>2</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>2</FileNumber> <FileNumber>2</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>..\Services\Chrono.c</PathWithFileName> <PathWithFileName>..\Services\Chrono.c</PathWithFileName>
@ -526,12 +542,24 @@
<File> <File>
<GroupNumber>2</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>3</FileNumber> <FileNumber>3</FileNumber>
<FileType>1</FileType> <FileType>5</FileType>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\Services\accelerometer.c</PathWithFileName> <PathWithFileName>..\Services\recepteurHF_input.h</PathWithFileName>
<FilenameWithoutPath>accelerometer.c</FilenameWithoutPath> <FilenameWithoutPath>recepteurHF_input.h</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>..\Services\recpeteurHF_input.c</PathWithFileName>
<FilenameWithoutPath>recpeteurHF_input.c</FilenameWithoutPath>
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
@ -545,7 +573,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>4</FileNumber> <FileNumber>5</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -565,7 +593,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>5</FileNumber> <FileNumber>6</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -577,7 +605,7 @@
</File> </File>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>6</FileNumber> <FileNumber>7</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -589,7 +617,7 @@
</File> </File>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>7</FileNumber> <FileNumber>8</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -601,7 +629,7 @@
</File> </File>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>8</FileNumber> <FileNumber>9</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -613,7 +641,7 @@
</File> </File>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>9</FileNumber> <FileNumber>10</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -633,7 +661,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>10</FileNumber> <FileNumber>11</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -653,7 +681,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>11</FileNumber> <FileNumber>12</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -673,7 +701,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>7</GroupNumber> <GroupNumber>7</GroupNumber>
<FileNumber>12</FileNumber> <FileNumber>13</FileNumber>
<FileType>2</FileType> <FileType>2</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>

18
keil_project/MDK-ARM/Project.uvprojx
View file

@ -398,9 +398,14 @@
<FilePath>..\Services\Chrono.c</FilePath> <FilePath>..\Services\Chrono.c</FilePath>
</File> </File>
<File> <File>
<FileName>accelerometer.c</FileName> <FileName>recepteurHF_input.h</FileName>
<FileType>5</FileType>
<FilePath>..\Services\recepteurHF_input.h</FilePath>
</File>
<File>
<FileName>recpeteurHF_input.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\Services\accelerometer.c</FilePath> <FilePath>..\Services\recpeteurHF_input.c</FilePath>
</File> </File>
</Files> </Files>
</Group> </Group>
@ -871,9 +876,14 @@
<FilePath>..\Services\Chrono.c</FilePath> <FilePath>..\Services\Chrono.c</FilePath>
</File> </File>
<File> <File>
<FileName>accelerometer.c</FileName> <FileName>recepteurHF_input.h</FileName>
<FileType>5</FileType>
<FilePath>..\Services\recepteurHF_input.h</FilePath>
</File>
<File>
<FileName>recpeteurHF_input.c</FileName>
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\Services\accelerometer.c</FilePath> <FilePath>..\Services\recpeteurHF_input.c</FilePath>
</File> </File>
</Files> </Files>
</Group> </Group>

0
keil_project/MDK-ARM/recepteurHF_input.c Normal file
View file

10
keil_project/Services/recepteurHF_input.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef RECEPTEURHF_INPUT_H
#define RECEPTEURHF_INPUT_H
void recepteurHF_input_init(void);
#endif

4
keil_project/Services/recpeteurHF_input.c Normal file
View file

@ -0,0 +1,4 @@
#include "recepteurHF_input.h"
void recepteurHF_input_init(void){
}

11
keil_project/Src/main.c
View file

@ -21,7 +21,7 @@
#include "stm32f1xx_ll_system.h" // utile dans la fonction SystemClock_Config #include "stm32f1xx_ll_system.h" // utile dans la fonction SystemClock_Config
#include "Chrono.h" #include "Chrono.h"
#include "accelerometer.h"
void SystemClock_Config(void); void SystemClock_Config(void);
@ -33,21 +33,12 @@ void SystemClock_Config(void);
* @retval None * @retval None
*/ */
int angle_bon;
int battery_level;
int main(void) int main(void)
{ {
/* Configure the system clock to 72 MHz */ /* Configure the system clock to 72 MHz */
SystemClock_Config(); SystemClock_Config();
accelero_init();
while(1){
angle_bon = accelero_angle_bon();
battery_level = get_battery_level();
}
/* Infinite loop */ /* Infinite loop */
while (1) while (1)