forked from acco/chti23
GestionSon + debut DFT
This commit is contained in:
parent
033c4f85d9
commit
1d99ea6a3a
9 changed files with 2192 additions and 2029 deletions
|
|
@ -11,16 +11,59 @@
|
|||
area maram,data,readwrite
|
||||
|
||||
|
||||
|
||||
Index dcd 0
|
||||
Somme dcd 0
|
||||
; ===============================================================================================
|
||||
|
||||
|
||||
EXPORT Index
|
||||
EXPORT Somme
|
||||
|
||||
|
||||
;Section ROM code (read only) :
|
||||
area moncode,code,readonly
|
||||
; é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
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
@ -160,7 +203,6 @@ TabSin
|
|||
DCW -6393 ; 62 0xe707 -0.19510
|
||||
DCW -3212 ; 63 0xf374 -0.09802
|
||||
|
||||
|
||||
|
||||
|
||||
|
||||
END
|
||||
|
|
@ -1,11 +1,12 @@
|
|||
|
||||
|
||||
#include "DriverJeuLaser.h"
|
||||
|
||||
|
||||
extern int DFT_ModuleAuCarre(short int * Signal64ech, char k);
|
||||
extern int LeSignal[];
|
||||
|
||||
int main(void)
|
||||
{
|
||||
{
|
||||
|
||||
|
||||
// ===========================================================================
|
||||
// ============= INIT PERIPH (faites qu'une seule fois) =====================
|
||||
|
|
@ -23,6 +24,7 @@ CLOCK_Configure();
|
|||
|
||||
while (1)
|
||||
{
|
||||
DFT_ModuleAuCarre((short *)LeSignal ,1);
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
File diff suppressed because it is too large
Load diff
File diff suppressed because it is too large
Load diff
3
soft/PjtKEIL_StepSon/Src/GestionSon.h
Normal file
3
soft/PjtKEIL_StepSon/Src/GestionSon.h
Normal file
|
|
@ -0,0 +1,3 @@
|
|||
extern int Index;
|
||||
extern void StartSon(void);
|
||||
void CallbackSon(void);
|
||||
|
|
@ -16,10 +16,10 @@ Index dcd 0x00000000
|
|||
; ===============================================================================================
|
||||
EXPORT CallbackSon
|
||||
EXPORT SortieSon
|
||||
EXPORT StartSon
|
||||
EXPORT Index
|
||||
EXTERN Son
|
||||
EXTERN LongueurSon
|
||||
EXPORT PWM_Set_Value_TIM3_Ch3
|
||||
INCLUDE ../Driver/DriverJeuLaser.inc
|
||||
|
||||
|
||||
|
|
@ -42,11 +42,24 @@ CallbackSon proc
|
|||
push {r9}
|
||||
push {r10}
|
||||
push {r11}
|
||||
ldr r4, [r2] ;on stocke la valeur de l'index dans r2.
|
||||
ldr r10, [r2]
|
||||
ldr r4, [r2] ;on stocke la valeur de l'index dans r4.
|
||||
ldr r10, [r2] ;on stocke la valeur de l'index dans r4.
|
||||
ldr r11, [r3]
|
||||
cmp r10, r11
|
||||
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
|
||||
|
||||
notEqual
|
||||
|
|
@ -60,6 +73,7 @@ notEqual
|
|||
sdiv r5, r8
|
||||
adds r5, #360
|
||||
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
|
||||
str r10, [r2]
|
||||
pop {r11}
|
||||
|
|
@ -73,5 +87,13 @@ notEqual
|
|||
bl PWM_Set_Value_TIM3_Ch3
|
||||
pop {pc}
|
||||
ENDFUNC
|
||||
|
||||
StartSon proc
|
||||
ldr r0, =Index
|
||||
mov r1, #0
|
||||
str r1, [r0]
|
||||
bx lr
|
||||
ENDFUNC
|
||||
|
||||
|
||||
END
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
|
||||
|
||||
#include "DriverJeuLaser.h"
|
||||
void CallbackSon(void);
|
||||
#include "GestionSon.h"
|
||||
|
||||
|
||||
int main(void)
|
||||
|
|
@ -29,6 +27,8 @@ Active_IT_Debordement_Timer(TIM4, 2, CallbackSon);
|
|||
|
||||
while (1)
|
||||
{
|
||||
if (Index == (unsigned int)-1){
|
||||
StartSon();
|
||||
}
|
||||
}
|
||||
|
||||
}
|
||||
|
|
|
|||
|
|
@ -176,6 +176,14 @@
|
|||
<ItemText>portb.0</ItemText>
|
||||
</Ww>
|
||||
</WatchWindow1>
|
||||
<MemoryWindow1>
|
||||
<Mm>
|
||||
<WinNumber>1</WinNumber>
|
||||
<SubType>257</SubType>
|
||||
<ItemText>r0</ItemText>
|
||||
<AccSizeX>0</AccSizeX>
|
||||
</Mm>
|
||||
</MemoryWindow1>
|
||||
<Tracepoint>
|
||||
<THDelay>0</THDelay>
|
||||
</Tracepoint>
|
||||
|
|
@ -222,7 +230,12 @@
|
|||
<Wi>
|
||||
<IntNumber>0</IntNumber>
|
||||
<FirstString>`SortieSon</FirstString>
|
||||
<SecondString>0080000000000000000000000000000000408F4000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000001000000000000000000F03F190000000000000000000000000000000000000094080008</SecondString>
|
||||
<SecondString>0080000000000000000000000000000000408F4000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000001000000000000000000E03F160000000000000000000000000000000000000094080008</SecondString>
|
||||
</Wi>
|
||||
<Wi>
|
||||
<IntNumber>1</IntNumber>
|
||||
<FirstString>((portb & 0x00000001) & 0x1) >> 0</FirstString>
|
||||
<SecondString>00000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1600000000000000000000000000000000000000B40A0008</SecondString>
|
||||
</Wi>
|
||||
</LogicAnalyzers>
|
||||
<DebugDescription>
|
||||
|
|
@ -396,7 +409,7 @@
|
|||
<AscS3>0</AscS3>
|
||||
<aSer3>0</aSer3>
|
||||
<eProf>0</eProf>
|
||||
<aLa>0</aLa>
|
||||
<aLa>1</aLa>
|
||||
<aPa1>0</aPa1>
|
||||
<AscS4>0</AscS4>
|
||||
<aSer4>0</aSer4>
|
||||
|
|
@ -638,7 +651,7 @@
|
|||
<GroupNumber>1</GroupNumber>
|
||||
<FileNumber>1</FileNumber>
|
||||
<FileType>1</FileType>
|
||||
<tvExp>0</tvExp>
|
||||
<tvExp>1</tvExp>
|
||||
<tvExpOptDlg>0</tvExpOptDlg>
|
||||
<bDave2>0</bDave2>
|
||||
<PathWithFileName>.\Src\principal.c</PathWithFileName>
|
||||
|
|
@ -718,6 +731,18 @@
|
|||
<RteFlg>0</RteFlg>
|
||||
<bShared>0</bShared>
|
||||
</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>
|
||||
|
|
|
|||
|
|
@ -423,6 +423,11 @@
|
|||
<FileType>2</FileType>
|
||||
<FilePath>.\Src\bruitverre.asm</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>GestionSon.h</FileName>
|
||||
<FileType>5</FileType>
|
||||
<FilePath>.\GestionSon.h</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
|
@ -434,7 +439,7 @@
|
|||
<TargetName>CibleSondeKEIL</TargetName>
|
||||
<ToolsetNumber>0x4</ToolsetNumber>
|
||||
<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>
|
||||
<TargetOption>
|
||||
<TargetCommonOption>
|
||||
|
|
@ -847,6 +852,11 @@
|
|||
<FileType>2</FileType>
|
||||
<FilePath>.\Src\bruitverre.asm</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>GestionSon.h</FileName>
|
||||
<FileType>5</FileType>
|
||||
<FilePath>.\GestionSon.h</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
|
@ -1340,6 +1350,11 @@
|
|||
<FileType>2</FileType>
|
||||
<FilePath>.\Src\bruitverre.asm</FilePath>
|
||||
</File>
|
||||
<File>
|
||||
<FileName>GestionSon.h</FileName>
|
||||
<FileType>5</FileType>
|
||||
<FilePath>.\GestionSon.h</FilePath>
|
||||
</File>
|
||||
</Files>
|
||||
</Group>
|
||||
<Group>
|
||||
|
|
|
|||
Loading…
Reference in a new issue