touchais/Periph-Voilier
1
0
Fork 0
Code Issues Pull requests Releases Activity

Merge branch 'Sequencer' into develop

Browse source
This commit is contained in:
Neluji 2020-11-24 11:07:09 +01:00
commit fc622094a9
5 changed files with 105 additions and 25 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

58
MDK-ARM/Project.uvoptx
View file

@ -463,6 +463,30 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>3</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Services\Moteur.c</PathWithFileName>
<FilenameWithoutPath>Moteur.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>4</FileNumber>
<FileType>1</FileType>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Services\MySequencer.c</PathWithFileName>
<FilenameWithoutPath>MySequencer.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group> </Group>
<Group> <Group>
@ -473,7 +497,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>3</FileNumber> <FileNumber>5</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -485,7 +509,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>4</FileNumber> <FileNumber>6</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -497,7 +521,7 @@
</File> </File>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>5</FileNumber> <FileNumber>7</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -507,6 +531,18 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>8</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\MyDrivers\MySysTick.c</PathWithFileName>
<FilenameWithoutPath>MySysTick.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group> </Group>
<Group> <Group>
@ -517,7 +553,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>6</FileNumber> <FileNumber>9</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -529,7 +565,7 @@
</File> </File>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>7</FileNumber> <FileNumber>10</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -541,7 +577,7 @@
</File> </File>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>8</FileNumber> <FileNumber>11</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -553,7 +589,7 @@
</File> </File>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>9</FileNumber> <FileNumber>12</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -565,7 +601,7 @@
</File> </File>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>10</FileNumber> <FileNumber>13</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -585,7 +621,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>5</GroupNumber> <GroupNumber>5</GroupNumber>
<FileNumber>11</FileNumber> <FileNumber>14</FileNumber>
<FileType>5</FileType> <FileType>5</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -605,7 +641,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>6</GroupNumber> <GroupNumber>6</GroupNumber>
<FileNumber>12</FileNumber> <FileNumber>15</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -625,7 +661,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>7</GroupNumber> <GroupNumber>7</GroupNumber>
<FileNumber>13</FileNumber> <FileNumber>16</FileNumber>
<FileType>2</FileType> <FileType>2</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>

30
MDK-ARM/Project.uvprojx
View file

@ -397,6 +397,16 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\Services\MyRF.c</FilePath> <FilePath>..\Services\MyRF.c</FilePath>
</File> </File>
<File>
<FileName>Moteur.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\Moteur.c</FilePath>
</File>
<File>
<FileName>MySequencer.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\MySequencer.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -417,6 +427,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\MyDrivers\MyUSART.c</FilePath> <FilePath>..\MyDrivers\MyUSART.c</FilePath>
</File> </File>
<File>
<FileName>MySysTick.c</FileName>
<FileType>1</FileType>
<FilePath>..\MyDrivers\MySysTick.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -875,6 +890,16 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\Services\MyRF.c</FilePath> <FilePath>..\Services\MyRF.c</FilePath>
</File> </File>
<File>
<FileName>Moteur.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\Moteur.c</FilePath>
</File>
<File>
<FileName>MySequencer.c</FileName>
<FileType>1</FileType>
<FilePath>..\Services\MySequencer.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -895,6 +920,11 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>..\MyDrivers\MyUSART.c</FilePath> <FilePath>..\MyDrivers\MyUSART.c</FilePath>
</File> </File>
<File>
<FileName>MySysTick.c</FileName>
<FileType>1</FileType>
<FilePath>..\MyDrivers\MySysTick.c</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>

16
Services/MySequencer.c Normal file
View file

@ -0,0 +1,16 @@
#include "MySequencer.h"
#include "MySysTick.h"
void MySequencer_Conf(void) {
MySysTick_Conf(0xAFC80);
MySysTick_IT_Conf(MySequencer_Task_10ms,3);
MySysTick_IT_Enable();
}
void MySequencer_Task_10ms (void) {
__nop();
}

10
Services/MySequencer.h Normal file
View file

@ -0,0 +1,10 @@
#ifndef MY_SEQ_H
#define MY_SEQ_H
#include "stm32f103xb.h"
void MySequencer_Conf(void);
void MySequencer_Task_10ms (void);
#endif

16
Src/main.c
View file

@ -25,7 +25,7 @@
#include "MyRF.h" #include "MyRF.h"
#include "Moteur.h" #include "Moteur.h"
#include "MySysTick.h" #include "MySysTick.h"
#include <stdio.h> #include "MySequencer.h"
void SystemClock_Config(void); void SystemClock_Config(void);
@ -38,25 +38,13 @@ void SystemClock_Config(void);
*/ */
void test (void) {
printf("ok");
}
int main(void) int main(void)
{ {
/* Configure the system clock to 72 MHz */ /* Configure the system clock to 72 MHz */
SystemClock_Config(); SystemClock_Config();
MySysTick_Conf(0xAFC80);
MySysTick_IT_Conf(test,3);
MySysTick_IT_Enable();
MyRF_Conf(); MyRF_Conf();
MySequencer_Conf();
for(int i=0; i<0xCFFF; i++) {
}
MyRF_Transmit_3s();
/* Infinite loop */ /* Infinite loop */
while (1) while (1)