kcavaill/be_chti
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Objectif 2 DFT en réel

Browse source
This commit is contained in:
Cavailles Kevin 2020-05-14 11:44:03 +02:00
parent d1081eb58d
commit b717bc4b46
3 changed files with 32 additions and 71 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

84
Project.uvoptx
View file

@ -157,55 +157,7 @@
<Bp> <Bp>
<Number>0</Number> <Number>0</Number>
<Type>0</Type> <Type>0</Type>
<LineNumber>29</LineNumber> <LineNumber>61</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134227768</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>.\Src\calcul_dft.s</Filename>
<ExecCommand></ExecCommand>
<Expression>\\CHTI\Src/calcul_dft.s\29</Expression>
</Bp>
<Bp>
<Number>1</Number>
<Type>0</Type>
<LineNumber>42</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134227652</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>.\Src\principal.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\CHTI\Src/principal.c\42</Expression>
</Bp>
<Bp>
<Number>2</Number>
<Type>0</Type>
<LineNumber>37</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134227626</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>.\Src\principal.c</Filename>
<ExecCommand></ExecCommand>
<Expression>\\CHTI\Src/principal.c\37</Expression>
</Bp>
<Bp>
<Number>3</Number>
<Type>0</Type>
<LineNumber>62</LineNumber>
<EnabledFlag>1</EnabledFlag> <EnabledFlag>1</EnabledFlag>
<Address>0</Address> <Address>0</Address>
<ByteObject>0</ByteObject> <ByteObject>0</ByteObject>
@ -230,6 +182,16 @@
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>res_dft</ItemText> <ItemText>res_dft</ItemText>
</Ww> </Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
<ItemText>compteurs</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
<ItemText>scores</ItemText>
</Ww>
</WatchWindow1> </WatchWindow1>
<MemoryWindow1> <MemoryWindow1>
<Mm> <Mm>
@ -359,18 +321,6 @@
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>4</FileNumber> <FileNumber>4</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\GASSP72\gassp72.lib</PathWithFileName>
<FilenameWithoutPath>gassp72.lib</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>5</FileNumber>
<FileType>2</FileType> <FileType>2</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -380,6 +330,18 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>5</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\GFSSP72\gfssp72.lib</PathWithFileName>
<FilenameWithoutPath>gfssp72.lib</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group> </Group>
<Group> <Group>

10
Project.uvprojx
View file

@ -407,16 +407,16 @@
<Group> <Group>
<GroupName>Driver</GroupName> <GroupName>Driver</GroupName>
<Files> <Files>
<File>
<FileName>gassp72.lib</FileName>
<FileType>4</FileType>
<FilePath>..\GASSP72\gassp72.lib</FilePath>
</File>
<File> <File>
<FileName>table_sin_cos.s</FileName> <FileName>table_sin_cos.s</FileName>
<FileType>2</FileType> <FileType>2</FileType>
<FilePath>.\Src\table_sin_cos.s</FilePath> <FilePath>.\Src\table_sin_cos.s</FilePath>
</File> </File>
<File>
<FileName>gfssp72.lib</FileName>
<FileType>4</FileType>
<FilePath>..\GFSSP72\gfssp72.lib</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>

9
Src/principal.c
View file

@ -5,6 +5,7 @@
#define taille 6 #define taille 6
#define SYSTICK_PER 360000 // (360000 ticks équivaut à 5ms) #define SYSTICK_PER 360000 // (360000 ticks équivaut à 5ms)
#define M2TIR 985988
extern short TabSig[]; extern short TabSig[];
int etat = 0x00020000; int etat = 0x00020000;
@ -19,13 +20,13 @@ unsigned short dma_buf[64];
int compteurs[taille]; int compteurs[taille];
int scores[taille]; int scores[taille];
int k_values[] = {17,18,19,20,23,24}; int k_values[] = {17,18,19,20,23,24};
int M2TIR = 985507;
void checkCounter(void){ void checkCounter(void){
for(int i=0; i<taille; i++) { for(int i=0; i<taille; i++) {
if(compteurs[i] == 13){ if(compteurs[i] >= 13){
compteurs[i]=0; compteurs[i]=0;
scores[i]++; scores[i]++;
} }
@ -48,8 +49,6 @@ void sys_callback(void){
} }
checkCounter(); checkCounter();
} }
@ -72,7 +71,7 @@ int main(void)
GPIO_Configure(GPIOB, 14, OUTPUT, OUTPUT_PPULL); GPIO_Configure(GPIOB, 14, OUTPUT, OUTPUT_PPULL);
// activation ADC, sampling time 1us // activation ADC, sampling time 1us
Init_TimingADC_ActiveADC_ff( ADC1, 0x33 ); Init_TimingADC_ActiveADC_ff( ADC1, 0x31 );
Single_Channel_ADC( ADC1, 2 ); Single_Channel_ADC( ADC1, 2 );
// Déclenchement ADC par timer2, periode (72MHz/320kHz)ticks // Déclenchement ADC par timer2, periode (72MHz/320kHz)ticks
Init_Conversion_On_Trig_Timer_ff( ADC1, TIM2_CC2, 225 ); Init_Conversion_On_Trig_Timer_ff( ADC1, TIM2_CC2, 225 );