bfau/chti23
1
0
Fork 0
forked from acco/chti23
Code Issues Pull requests Releases Wiki Activity

GestionSon + debut DFT

Browse source
This commit is contained in:
Benoit Fau 2023-05-30 17:50:55 +02:00
parent 033c4f85d9
commit 1d99ea6a3a
9 changed files with 2192 additions and 2029 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

50
soft/PjtKEIL_StepDFT/Src/DFT.s
View file

@ -11,15 +11,58 @@
area maram,data,readwrite area maram,data,readwrite
Index dcd 0
Somme dcd 0
; =============================================================================================== ; ===============================================================================================
EXPORT Index
EXPORT Somme
;Section ROM code (read only) : ;Section ROM code (read only) :
area moncode,code,readonly area moncode,code,readonly
; écrire le code ici ; écrire le code ici
DFT_ModuleAuCarre proc
push {lr}
ldr r2, =Index
ldr r3, =Somme
push {r4}
ldr r4, =TabCos
push {r5}
push {r6}
push {r7}
push {r8}
push {r9}
push {r10}
notEqual
mov r5, r2 ;copie de n dans r5
mul r5, r1 ;n*k = p dans r5 (il faut faire %64)
mov r6, #2
mul r5, r6 ; mul par 2 pour se deplacer dans le tableau
ldrsh r7, [r4, r5] ; dans r7: TabCos[p]
mov r8, r2 ;copie de n dans r8
mul r8, r6; mul par 2
ldrsh r9, [r0, r8] ; dans r9: Signal[n]
mul r7, r8 ; dans r7: TabCos[p] * Signal[n]
add r3, r7
ldr r10, [r2]
adds r10, #1
str r10, [r2]
cmp r2, #63
bne notEqual
pop {r10}
pop {r9}
pop {r8}
pop {r7}
pop {r6}
pop {r5}
mov r0, r3; on met la somme dans r0
pop {r4}
pop {pc}
ENDFUNC
@ -162,5 +205,4 @@ TabSin
END END

8
soft/PjtKEIL_StepDFT/Src/principal.c
View file

@ -1,11 +1,12 @@
#include "DriverJeuLaser.h" #include "DriverJeuLaser.h"
extern int DFT_ModuleAuCarre(short int * Signal64ech, char k);
extern int LeSignal[];
int main(void) int main(void)
{ {
// =========================================================================== // ===========================================================================
// ============= INIT PERIPH (faites qu'une seule fois) ===================== // ============= INIT PERIPH (faites qu'une seule fois) =====================
@ -23,6 +24,7 @@ CLOCK_Configure();
while (1) while (1)
{ {
DFT_ModuleAuCarre((short *)LeSignal ,1);
} }
} }

32
soft/PjtKEIL_StepDFT/StepDFT.uvoptx
View file

@ -75,7 +75,7 @@
<OPTFL> <OPTFL>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget> <IsCurrentTarget>1</IsCurrentTarget>
</OPTFL> </OPTFL>
<CpuCode>18</CpuCode> <CpuCode>18</CpuCode>
<DebugOpt> <DebugOpt>
@ -267,7 +267,7 @@
<OPTFL> <OPTFL>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget> <IsCurrentTarget>0</IsCurrentTarget>
</OPTFL> </OPTFL>
<CpuCode>18</CpuCode> <CpuCode>18</CpuCode>
<DebugOpt> <DebugOpt>
@ -624,6 +624,30 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File>
<GroupNumber>1</GroupNumber>
<FileNumber>2</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Src\DFT.s</PathWithFileName>
<FilenameWithoutPath>DFT.s</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>1</GroupNumber>
<FileNumber>3</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Src\Signal.asm</PathWithFileName>
<FilenameWithoutPath>Signal.asm</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group> </Group>
<Group> <Group>
@ -634,7 +658,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>2</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>2</FileNumber> <FileNumber>4</FileNumber>
<FileType>2</FileType> <FileType>2</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -654,7 +678,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>3</FileNumber> <FileNumber>5</FileNumber>
<FileType>4</FileType> <FileType>4</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>

30
soft/PjtKEIL_StepDFT/StepDFT.uvprojx
View file

@ -388,6 +388,16 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\Src\principal.c</FilePath> <FilePath>.\Src\principal.c</FilePath>
</File> </File>
<File>
<FileName>DFT.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\DFT.s</FilePath>
</File>
<File>
<FileName>Signal.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\Signal.asm</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -797,6 +807,16 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\Src\principal.c</FilePath> <FilePath>.\Src\principal.c</FilePath>
</File> </File>
<File>
<FileName>DFT.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\DFT.s</FilePath>
</File>
<File>
<FileName>Signal.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\Signal.asm</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -1275,6 +1295,16 @@
<FileType>1</FileType> <FileType>1</FileType>
<FilePath>.\Src\principal.c</FilePath> <FilePath>.\Src\principal.c</FilePath>
</File> </File>
<File>
<FileName>DFT.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\DFT.s</FilePath>
</File>
<File>
<FileName>Signal.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\Signal.asm</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>

3
soft/PjtKEIL_StepSon/Src/GestionSon.h Normal file
View file

@ -0,0 +1,3 @@
extern int Index;
extern void StartSon(void);
void CallbackSon(void);

28
soft/PjtKEIL_StepSon/Src/GestionSon.s
View file

@ -16,10 +16,10 @@ Index dcd 0x00000000
; =============================================================================================== ; ===============================================================================================
EXPORT CallbackSon EXPORT CallbackSon
EXPORT SortieSon EXPORT SortieSon
EXPORT StartSon
EXPORT Index EXPORT Index
EXTERN Son EXTERN Son
EXTERN LongueurSon EXTERN LongueurSon
EXPORT PWM_Set_Value_TIM3_Ch3
INCLUDE ../Driver/DriverJeuLaser.inc INCLUDE ../Driver/DriverJeuLaser.inc
@ -42,11 +42,24 @@ CallbackSon proc
push {r9} push {r9}
push {r10} push {r10}
push {r11} push {r11}
ldr r4, [r2] ;on stocke la valeur de l'index dans r2. ldr r4, [r2] ;on stocke la valeur de l'index dans r4.
ldr r10, [r2] ldr r10, [r2] ;on stocke la valeur de l'index dans r4.
ldr r11, [r3] ldr r11, [r3]
cmp r10, r11 cmp r10, r11
bne notEqual bne notEqual
push {r12}
mov r12, #-1
str r12, [r2]
pop {r12}
pop {r11}
pop {r10}
pop {r9}
pop {r8}
pop {r7}
pop {r6}
pop {r5}
pop {r4}
pop {lr}
bx lr bx lr
notEqual notEqual
@ -60,6 +73,7 @@ notEqual
sdiv r5, r8 sdiv r5, r8
adds r5, #360 adds r5, #360
strh r5, [r0] ; on stocke la valeur calculee dans r0 strh r5, [r0] ; on stocke la valeur calculee dans r0
mov r0, r5
adds r10, #1; on incremente r4 qui correspond à la valeur de l'index adds r10, #1; on incremente r4 qui correspond à la valeur de l'index
str r10, [r2] str r10, [r2]
pop {r11} pop {r11}
@ -74,4 +88,12 @@ notEqual
pop {pc} pop {pc}
ENDFUNC ENDFUNC
StartSon proc
ldr r0, =Index
mov r1, #0
str r1, [r0]
bx lr
ENDFUNC
END END

8
soft/PjtKEIL_StepSon/Src/principal.c
View file

@ -1,7 +1,5 @@
#include "DriverJeuLaser.h" #include "DriverJeuLaser.h"
void CallbackSon(void); #include "GestionSon.h"
int main(void) int main(void)
@ -29,6 +27,8 @@ Active_IT_Debordement_Timer(TIM4, 2, CallbackSon);
while (1) while (1)
{ {
if (Index == (unsigned int)-1){
StartSon();
} }
} }
}

31
soft/PjtKEIL_StepSon/StepSon.uvoptx
View file

@ -176,6 +176,14 @@
<ItemText>portb.0</ItemText> <ItemText>portb.0</ItemText>
</Ww> </Ww>
</WatchWindow1> </WatchWindow1>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>257</SubType>
<ItemText>r0</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
<Tracepoint> <Tracepoint>
<THDelay>0</THDelay> <THDelay>0</THDelay>
</Tracepoint> </Tracepoint>
@ -222,7 +230,12 @@
<Wi> <Wi>
<IntNumber>0</IntNumber> <IntNumber>0</IntNumber>
<FirstString>`SortieSon</FirstString> <FirstString>`SortieSon</FirstString>
<SecondString>0080000000000000000000000000000000408F4000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000001000000000000000000F03F190000000000000000000000000000000000000094080008</SecondString> <SecondString>0080000000000000000000000000000000408F4000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000001000000000000000000E03F160000000000000000000000000000000000000094080008</SecondString>
</Wi>
<Wi>
<IntNumber>1</IntNumber>
<FirstString>((portb &amp; 0x00000001) &amp; 0x1) &gt;&gt; 0</FirstString>
<SecondString>00000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1600000000000000000000000000000000000000B40A0008</SecondString>
</Wi> </Wi>
</LogicAnalyzers> </LogicAnalyzers>
<DebugDescription> <DebugDescription>
@ -396,7 +409,7 @@
<AscS3>0</AscS3> <AscS3>0</AscS3>
<aSer3>0</aSer3> <aSer3>0</aSer3>
<eProf>0</eProf> <eProf>0</eProf>
<aLa>0</aLa> <aLa>1</aLa>
<aPa1>0</aPa1> <aPa1>0</aPa1>
<AscS4>0</AscS4> <AscS4>0</AscS4>
<aSer4>0</aSer4> <aSer4>0</aSer4>
@ -638,7 +651,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\principal.c</PathWithFileName> <PathWithFileName>.\Src\principal.c</PathWithFileName>
@ -718,6 +731,18 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>6</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\GestionSon.h</PathWithFileName>
<FilenameWithoutPath>GestionSon.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group> </Group>
<Group> <Group>

17
soft/PjtKEIL_StepSon/StepSon.uvprojx
View file

@ -423,6 +423,11 @@
<FileType>2</FileType> <FileType>2</FileType>
<FilePath>.\Src\bruitverre.asm</FilePath> <FilePath>.\Src\bruitverre.asm</FilePath>
</File> </File>
<File>
<FileName>GestionSon.h</FileName>
<FileType>5</FileType>
<FilePath>.\GestionSon.h</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -434,7 +439,7 @@
<TargetName>CibleSondeKEIL</TargetName> <TargetName>CibleSondeKEIL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber> <ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName> <ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed> <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
<uAC6>0</uAC6> <uAC6>0</uAC6>
<TargetOption> <TargetOption>
<TargetCommonOption> <TargetCommonOption>
@ -847,6 +852,11 @@
<FileType>2</FileType> <FileType>2</FileType>
<FilePath>.\Src\bruitverre.asm</FilePath> <FilePath>.\Src\bruitverre.asm</FilePath>
</File> </File>
<File>
<FileName>GestionSon.h</FileName>
<FileType>5</FileType>
<FilePath>.\GestionSon.h</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -1340,6 +1350,11 @@
<FileType>2</FileType> <FileType>2</FileType>
<FilePath>.\Src\bruitverre.asm</FilePath> <FilePath>.\Src\bruitverre.asm</FilePath>
</File> </File>
<File>
<FileName>GestionSon.h</FileName>
<FileType>5</FileType>
<FilePath>.\GestionSon.h</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>