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

compiling with all the classes

Browse source
This commit is contained in:
Jasper Güldenstein 2020-11-13 13:51:49 +01:00
parent a8458eeacf
commit 0f375dd4e7
5 changed files with 246 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -404,6 +404,22 @@
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
<Bp>
<Number>2</Number>
<Type>0</Type>
<LineNumber>40</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>..\Services\RFInput.c</Filename>
<ExecCommand></ExecCommand>
<Expression></Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
@ -520,7 +536,7 @@
<GroupNumber>2</GroupNumber>
<FileNumber>2</FileNumber>
<FileType>1</FileType>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Services\Chrono.c</PathWithFileName>
@ -532,7 +548,7 @@
<GroupNumber>2</GroupNumber>
<FileNumber>3</FileNumber>
<FileType>1</FileType>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Services\alimentation.c</PathWithFileName>
@ -543,12 +559,84 @@
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>4</FileNumber>
<FileType>5</FileType>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Services\alimentation.h</PathWithFileName>
<FilenameWithoutPath>alimentation.h</FilenameWithoutPath>
<PathWithFileName>..\Services\accelerometer.c</PathWithFileName>
<FilenameWithoutPath>accelerometer.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>..\Services\DcMotor.c</PathWithFileName>
<FilenameWithoutPath>DcMotor.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>6</FileNumber>
<FileType>1</FileType>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Services\emetteur_rf.c</PathWithFileName>
<FilenameWithoutPath>emetteur_rf.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>7</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Services\IncrEncoder.c</PathWithFileName>
<FilenameWithoutPath>IncrEncoder.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>8</FileNumber>
<FileType>1</FileType>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Services\RFInput.c</PathWithFileName>
<FilenameWithoutPath>RFInput.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>9</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Services\Sail.c</PathWithFileName>
<FilenameWithoutPath>Sail.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>10</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Services\Servo.c</PathWithFileName>
<FilenameWithoutPath>Servo.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
@ -562,7 +650,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>5</FileNumber>
<FileNumber>11</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -582,7 +670,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>6</FileNumber>
<FileNumber>12</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -594,7 +682,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>7</FileNumber>
<FileNumber>13</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -606,7 +694,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>8</FileNumber>
<FileNumber>14</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -618,9 +706,9 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>9</FileNumber>
<FileNumber>15</FileNumber>
<FileType>1</FileType>
<tvExp>1</tvExp>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\LLDrivers\src\stm32f1xx_ll_gpio.c</PathWithFileName>
@ -630,7 +718,7 @@
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>10</FileNumber>
<FileNumber>16</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -640,6 +728,30 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>17</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\LLDrivers\src\stm32f1xx_ll_exti.c</PathWithFileName>
<FilenameWithoutPath>stm32f1xx_ll_exti.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>18</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\LLDrivers\src\stm32f1xx_ll_usart.c</PathWithFileName>
<FilenameWithoutPath>stm32f1xx_ll_usart.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>
@ -650,7 +762,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>5</GroupNumber>
<FileNumber>11</FileNumber>
<FileNumber>19</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -670,7 +782,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>6</GroupNumber>
<FileNumber>12</FileNumber>
<FileNumber>20</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -690,7 +802,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>7</GroupNumber>
<FileNumber>13</FileNumber>
<FileNumber>21</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>

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

@ -185,6 +185,7 @@
<uocXRam>0</uocXRam>
<RvdsVP>0</RvdsVP>
<RvdsMve>0</RvdsMve>
<RvdsCdeCp>0</RvdsCdeCp>
<hadIRAM2>0</hadIRAM2>
<hadIROM2>0</hadIROM2>
<StupSel>8</StupSel>
@ -351,7 +352,7 @@
<NoWarn>0</NoWarn>
<uSurpInc>0</uSurpInc>
<useXO>0</useXO>
<uClangAs>0</uClangAs>
<ClangAsOpt>4</ClangAsOpt>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -403,9 +404,39 @@
<FilePath>..\Services\alimentation.c</FilePath>
</File>
<File>
<FileName>alimentation.h</FileName>
<FileType>5</FileType>
<FilePath>..\Services\alimentation.h</FilePath>
<FileName>accelerometer.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\accelerometer.c</FilePath>
</File>
<File>
<FileName>DcMotor.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\DcMotor.c</FilePath>
</File>
<File>
<FileName>emetteur_rf.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\emetteur_rf.c</FilePath>
</File>
<File>
<FileName>IncrEncoder.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\IncrEncoder.c</FilePath>
</File>
<File>
<FileName>RFInput.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\RFInput.c</FilePath>
</File>
<File>
<FileName>Sail.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\Sail.c</FilePath>
</File>
<File>
<FileName>Servo.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\Servo.c</FilePath>
</File>
</Files>
</Group>
@ -447,6 +478,16 @@
<FileType>1</FileType>
<FilePath>..\LLDrivers\src\stm32f1xx_ll_adc.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_ll_exti.c</FileName>
<FileType>1</FileType>
<FilePath>..\LLDrivers\src\stm32f1xx_ll_exti.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_ll_usart.c</FileName>
<FileType>1</FileType>
<FilePath>..\LLDrivers\src\stm32f1xx_ll_usart.c</FilePath>
</File>
</Files>
</Group>
<Group>
@ -488,7 +529,7 @@
<TargetName>Simulateur</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060750::V5.06 update 6 (build 750)::ARMCC</pCCUsed>
<pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
<uAC6>0</uAC6>
<TargetOption>
<TargetCommonOption>
@ -663,6 +704,7 @@
<uocXRam>0</uocXRam>
<RvdsVP>0</RvdsVP>
<RvdsMve>0</RvdsMve>
<RvdsCdeCp>0</RvdsCdeCp>
<hadIRAM2>0</hadIRAM2>
<hadIROM2>0</hadIROM2>
<StupSel>8</StupSel>
@ -829,7 +871,7 @@
<NoWarn>0</NoWarn>
<uSurpInc>0</uSurpInc>
<useXO>0</useXO>
<uClangAs>0</uClangAs>
<ClangAsOpt>4</ClangAsOpt>
<VariousControls>
<MiscControls></MiscControls>
<Define></Define>
@ -881,9 +923,39 @@
<FilePath>..\Services\alimentation.c</FilePath>
</File>
<File>
<FileName>alimentation.h</FileName>
<FileType>5</FileType>
<FilePath>..\Services\alimentation.h</FilePath>
<FileName>accelerometer.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\accelerometer.c</FilePath>
</File>
<File>
<FileName>DcMotor.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\DcMotor.c</FilePath>
</File>
<File>
<FileName>emetteur_rf.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\emetteur_rf.c</FilePath>
</File>
<File>
<FileName>IncrEncoder.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\IncrEncoder.c</FilePath>
</File>
<File>
<FileName>RFInput.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\RFInput.c</FilePath>
</File>
<File>
<FileName>Sail.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\Sail.c</FilePath>
</File>
<File>
<FileName>Servo.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\Servo.c</FilePath>
</File>
</Files>
</Group>
@ -925,6 +997,16 @@
<FileType>1</FileType>
<FilePath>..\LLDrivers\src\stm32f1xx_ll_adc.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_ll_exti.c</FileName>
<FileType>1</FileType>
<FilePath>..\LLDrivers\src\stm32f1xx_ll_exti.c</FilePath>
</File>
<File>
<FileName>stm32f1xx_ll_usart.c</FileName>
<FileType>1</FileType>
<FilePath>..\LLDrivers\src\stm32f1xx_ll_usart.c</FilePath>
</File>
</Files>
</Group>
<Group>
@ -978,4 +1060,19 @@
<files/>
</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>

11
keil_project/Services/RFInput.h
View file

@ -1,5 +1,12 @@
// initializes the PWM input of the remote on PB6
void RF_INPUT_Init(void);
int RF_INPUT_GetValue1(void);
int RF_INPUT_GetValue2(void);
// returns the period of the PWM signal of the remote in us
int RF_INPUT_GetPeriodUs(void);
// returns the duty time of the PWM signal of the remote in us
int RF_INPUT_GetDutyTimeUs(void);
// returns the duty time of the PWM signal of the remote as a value between -100 and 100
int RF_INPUT_GetDutyTimeRelative(void);

4
keil_project/Services/emetteur_rf.h
View file

@ -6,9 +6,9 @@
#include "stm32f1xx_ll_usart.h"
#include "stm32f1xx_ll_gpio.h"
void emetteur_rf_init();
void emetteur_rf_init(void);
void emetteur_send_bytes(USART_TypeDef * uart_port,char* buf, int len);
#endif
#endif

4
keil_project/Src/main.c
View file

@ -58,8 +58,8 @@ int main(void)
LL_mDelay(10);
counter = (counter + 1) % 100;
DC_MOTOR_SetSpeed(counter);
val = RF_INPUT_GetValue1();
val2 = RF_INPUT_GetValue2();
val = RF_INPUT_GetPeriodUs();
val2 = RF_INPUT_GetDutyTimeUs();
SAIL_SetAngle(counter);
level = get_battery_level();
level_enough = is_level_enough();