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

Ajout noms dans les .h

Browse source
This commit is contained in:
Morgane Foussats 2020-11-14 11:27:25 +01:00
parent c966ea51da
commit 4731334401
12 changed files with 44 additions and 69 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -28,17 +28,17 @@
<View> <View>
<WinId>38003</WinId> <WinId>38003</WinId>
<ViewName>Registers</ViewName> <ViewName>Registers</ViewName>
<TableColWidths>140 100</TableColWidths> <TableColWidths>140 98</TableColWidths>
</View> </View>
<View> <View>
<WinId>346</WinId> <WinId>346</WinId>
<ViewName>Code Coverage</ViewName> <ViewName>Code Coverage</ViewName>
<TableColWidths>1008 414</TableColWidths> <TableColWidths>1008 160</TableColWidths>
</View> </View>
<View> <View>
<WinId>204</WinId> <WinId>204</WinId>
<ViewName>Performance Analyzer</ViewName> <ViewName>Performance Analyzer</ViewName>
<TableColWidths>1168 175 175 100</TableColWidths> <TableColWidths>1168</TableColWidths>
</View> </View>
</SECTreeCtrl> </SECTreeCtrl>
@ -77,7 +77,7 @@
<WinId>2506</WinId> <WinId>2506</WinId>
<ViewName>Trace Data</ViewName> <ViewName>Trace Data</ViewName>
<UserString>FiltIdx=0;DescrEn=0;DescrHeight=4;FuncTrc=1;FindType=8;ColWidths=004B00870082005F004600E600C80096</UserString> <UserString>FiltIdx=0;DescrEn=0;DescrHeight=4;FuncTrc=1;FindType=8;ColWidths=004B00870082005F004600E600C80096</UserString>
<TableColWidths>75 135 95 70 230 200 150</TableColWidths> <TableColWidths>75 135 130 95 70 230 200 150</TableColWidths>
</View> </View>
<View> <View>
<WinId>466</WinId> <WinId>466</WinId>
@ -123,8 +123,8 @@
<MDIClientArea> <MDIClientArea>
<RegID>0</RegID> <RegID>0</RegID>
<MDITabState> <MDITabState>
<Len>717</Len> <Len>259</Len>
<Data>01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000005000000030000000100000052433A5C55736572735C6D6F6D6F665C446F63756D656E74735C70726F6A65745F766F696C6965725C6B65696C5F70726F6A6563745C4D444B2D41524D5C737461727475705F73746D33326631303378622E730000000015737461727475705F73746D33326631303378622E7300000000C5D4F200FFFFFFFF3F433A5C55736572735C6D6F6D6F665C446F63756D656E74735C70726F6A65745F766F696C6965725C6B65696C5F70726F6A6563745C5372635C6D61696E2E6300000000066D61696E2E6300000000FFDC7800FFFFFFFF55433A5C55736572735C6D6F6D6F665C446F63756D656E74735C70726F6A65745F766F696C6965725C6B65696C5F70726F6A6563745C4C4C447269766572735C696E635C73746D3332663178785F6C6C5F6164632E68000000001273746D3332663178785F6C6C5F6164632E6800000000BECEA100FFFFFFFF4C433A5C55736572735C6D6F6D6F665C446F63756D656E74735C70726F6A65745F766F696C6965725C6B65696C5F70726F6A6563745C53657276696365735C616C696D656E746174696F6E2E63000000000E616C696D656E746174696F6E2E6300000000F0A0A100FFFFFFFF4C433A5C55736572735C6D6F6D6F665C446F63756D656E74735C70726F6A65745F766F696C6965725C6B65696C5F70726F6A6563745C53657276696365735C616C696D656E746174696F6E2E68000000000E616C696D656E746174696F6E2E6800000000BCA8E100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000FC000000700000008007000088030000</Data> <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000100000000000000010000003F433A5C55736572735C6D6F6D6F665C446F63756D656E74735C70726F6A65745F766F696C6965725C6B65696C5F70726F6A6563745C5372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000FC000000700000008007000088030000</Data>
</MDITabState> </MDITabState>
</MDIClientArea> </MDIClientArea>
<ViewEx> <ViewEx>
@ -1835,7 +1835,7 @@
<Name>Build</Name> <Name>Build</Name>
<Buttons> <Buttons>
<Len>998</Len> <Len>998</Len>
<Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000A53696D756C6174657572960000000000000002000D4E55434C454F2D4631303352420A53696D756C617465757200000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DE010000</Data> <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000A53696D756C6174657572960000000000000002000D4E55434C454F2D4631303352420A53696D756C617465757200000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DE010000</Data>
</Buttons> </Buttons>
<OriginalItems> <OriginalItems>
<Len>583</Len> <Len>583</Len>
@ -3616,48 +3616,12 @@
<ActiveMDIGroup>0</ActiveMDIGroup> <ActiveMDIGroup>0</ActiveMDIGroup>
<MDIGroup> <MDIGroup>
<Size>100</Size> <Size>100</Size>
<ActiveTab>3</ActiveTab> <ActiveTab>0</ActiveTab>
<Doc>
<Name>startup_stm32f103xb.s</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>122</TopLine>
<CurrentLine>133</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc> <Doc>
<Name>../Src/main.c</Name> <Name>../Src/main.c</Name>
<ColumnNumber>0</ColumnNumber> <ColumnNumber>26</ColumnNumber>
<TopLine>22</TopLine> <TopLine>31</TopLine>
<CurrentLine>45</CurrentLine> <CurrentLine>29</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>..\LLDrivers\inc\stm32f1xx_ll_adc.h</Name>
<ColumnNumber>0</ColumnNumber>
<TopLine>3557</TopLine>
<CurrentLine>3568</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>..\Services\alimentation.c</Name>
<ColumnNumber>29</ColumnNumber>
<TopLine>26</TopLine>
<CurrentLine>56</CurrentLine>
<Folding>1</Folding>
<ContractedFolders></ContractedFolders>
<PaneID>0</PaneID>
</Doc>
<Doc>
<Name>..\Services\alimentation.h</Name>
<ColumnNumber>5</ColumnNumber>
<TopLine>1</TopLine>
<CurrentLine>20</CurrentLine>
<Folding>1</Folding> <Folding>1</Folding>
<ContractedFolders></ContractedFolders> <ContractedFolders></ContractedFolders>
<PaneID>0</PaneID> <PaneID>0</PaneID>

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

@ -420,6 +420,22 @@
<ExecCommand></ExecCommand> <ExecCommand></ExecCommand>
<Expression></Expression> <Expression></Expression>
</Bp> </Bp>
<Bp>
<Number>3</Number>
<Type>0</Type>
<LineNumber>46</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>
@ -536,7 +552,7 @@
<GroupNumber>2</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>2</FileNumber> <FileNumber>2</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>..\Services\Chrono.c</PathWithFileName> <PathWithFileName>..\Services\Chrono.c</PathWithFileName>

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

@ -185,7 +185,6 @@
<uocXRam>0</uocXRam> <uocXRam>0</uocXRam>
<RvdsVP>0</RvdsVP> <RvdsVP>0</RvdsVP>
<RvdsMve>0</RvdsMve> <RvdsMve>0</RvdsMve>
<RvdsCdeCp>0</RvdsCdeCp>
<hadIRAM2>0</hadIRAM2> <hadIRAM2>0</hadIRAM2>
<hadIROM2>0</hadIROM2> <hadIROM2>0</hadIROM2>
<StupSel>8</StupSel> <StupSel>8</StupSel>
@ -352,7 +351,7 @@
<NoWarn>0</NoWarn> <NoWarn>0</NoWarn>
<uSurpInc>0</uSurpInc> <uSurpInc>0</uSurpInc>
<useXO>0</useXO> <useXO>0</useXO>
<ClangAsOpt>4</ClangAsOpt> <uClangAs>0</uClangAs>
<VariousControls> <VariousControls>
<MiscControls></MiscControls> <MiscControls></MiscControls>
<Define></Define> <Define></Define>
@ -704,7 +703,6 @@
<uocXRam>0</uocXRam> <uocXRam>0</uocXRam>
<RvdsVP>0</RvdsVP> <RvdsVP>0</RvdsVP>
<RvdsMve>0</RvdsMve> <RvdsMve>0</RvdsMve>
<RvdsCdeCp>0</RvdsCdeCp>
<hadIRAM2>0</hadIRAM2> <hadIRAM2>0</hadIRAM2>
<hadIROM2>0</hadIROM2> <hadIROM2>0</hadIROM2>
<StupSel>8</StupSel> <StupSel>8</StupSel>
@ -871,7 +869,7 @@
<NoWarn>0</NoWarn> <NoWarn>0</NoWarn>
<uSurpInc>0</uSurpInc> <uSurpInc>0</uSurpInc>
<useXO>0</useXO> <useXO>0</useXO>
<ClangAsOpt>4</ClangAsOpt> <uClangAs>0</uClangAs>
<VariousControls> <VariousControls>
<MiscControls></MiscControls> <MiscControls></MiscControls>
<Define></Define> <Define></Define>
@ -1060,19 +1058,4 @@
<files/> <files/>
</RTE> </RTE>
<LayerInfo>
<Layers>
<Layer>
<LayName>&lt;Project Info&gt;</LayName>
<LayDesc></LayDesc>
<LayUrl></LayUrl>
<LayKeys></LayKeys>
<LayCat></LayCat>
<LayLic></LayLic>
<LayTarg>0</LayTarg>
<LayPrjMark>1</LayPrjMark>
</Layer>
</Layers>
</LayerInfo>
</Project> </Project>

2
keil_project/Services/DcMotor.h
View file

@ -1,3 +1,5 @@
//codé par Kévin Cavailles et Jasper Güldenstein
void DC_MOTOR_Init(void); void DC_MOTOR_Init(void);
// set a speed between -100 (full throttle clockwise) 0 (stop) and 100 (full throttle counterclockwise) // set a speed between -100 (full throttle clockwise) 0 (stop) and 100 (full throttle counterclockwise)

2
keil_project/Services/IncrEncoder.h
View file

@ -1,5 +1,5 @@
#ifndef INCR_ENCODER #ifndef INCR_ENCODER
//codé par Kévin Cavailles et Jasper Güldenstein
/** /**
*/ */
void INCR_ENCODER_Init(void); void INCR_ENCODER_Init(void);

2
keil_project/Services/RFInput.h
View file

@ -1,3 +1,5 @@
//codé par Kévin Cavailles et Jasper Güldenstein
// initializes the PWM input of the remote on PB6 // initializes the PWM input of the remote on PB6
void RF_INPUT_Init(void); void RF_INPUT_Init(void);

2
keil_project/Services/Sail.h
View file

@ -1,4 +1,4 @@
//codé par Kévin Cavailles et Jasper Güldenstein
void SAIL_Init(void); void SAIL_Init(void);

2
keil_project/Services/Servo.h
View file

@ -1,6 +1,8 @@
#ifndef SERVO #ifndef SERVO
#define SERVO #define SERVO
//codé par Kévin Cavailles et Jasper Güldenstein
void SERVO_Init(void); void SERVO_Init(void);
void SERVO_SetAngle(int angle); void SERVO_SetAngle(int angle);

2
keil_project/Services/accelerometer.h
View file

@ -1,5 +1,7 @@
// RIEN A MODIFIER // // RIEN A MODIFIER //
//codé par Léonie GALLOIS et Morgane FOUSSATS
#ifndef ACCELERO_H #ifndef ACCELERO_H
#define ACCELERO_H #define ACCELERO_H

2
keil_project/Services/alimentation.h
View file

@ -1,5 +1,7 @@
// RIEN A MODIFIER // // RIEN A MODIFIER //
//codé par Léonie GALLOIS et Morgane FOUSSATS
#ifndef ALIMENTATION_H #ifndef ALIMENTATION_H
#define ALIMENTATION_H #define ALIMENTATION_H

1
keil_project/Services/emetteur_rf.h
View file

@ -1,6 +1,7 @@
#ifndef RECEPTEURHF_INPUT_H #ifndef RECEPTEURHF_INPUT_H
#define RECEPTEURHF_INPUT_H #define RECEPTEURHF_INPUT_H
//codé par Léonie GALLOIS et Morgane FOUSSATS
#include "stm32f1xx_ll_bus.h" #include "stm32f1xx_ll_bus.h"
#include "stm32f1xx_ll_usart.h" #include "stm32f1xx_ll_usart.h"

1
keil_project/Src/main.c
View file

@ -26,6 +26,7 @@
#include "DcMotor.h" #include "DcMotor.h"
#include "Sail.h" #include "Sail.h"
#include "alimentation.h" #include "alimentation.h"
#include "accelerometer.h"
void SystemClock_Config(void); void SystemClock_Config(void);