acco/chti23
1
1
Fork 29
Code Issues Pull requests Releases Wiki Activity

Compare commits

merge into: acco:master
Branches Tags
acco:master
bfau:master
...
pull from: bfau:master
Branches Tags
bfau:master
acco:master

4 commits
master ... master

Author SHA1 Message Date
Benoit Fau
59492cfe2c StepSon + debut StepDFT 2023-05-30 18:23:42 +02:00
Benoit Fau
1d99ea6a3a GestionSon + debut DFT 2023-05-30 17:50:55 +02:00
Fau Benoit
033c4f85d9 Fin seance 18/04 2023-04-19 12:34:57 +02:00
Benoit Fau
f597e293ff Fin TP 3 2023-04-07 18:11:56 +02:00
39 changed files with 13790 additions and 13463 deletions
Show stats Expand all files Collapse all files

17
Brouillon.txt Normal file
View file

@ -0,0 +1,17 @@
int[] tableau = les valeurs;
int SortieSon;
int index = 0;
int CallbackSon()
{
echantillon = tableau[index];
SortieSon = (int)(echantillon * 360 / 32768) + 360;
return SortieSon
}
while (index<5512)
{
CallbackSon();
index++;
}

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

@ -11,15 +11,58 @@
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
@ -162,5 +205,4 @@ TabSin
END

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

@ -1,12 +1,13 @@
#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);
}
}

32
soft/PjtKEIL_StepDFT/StepDFT.uvoptx
View file

@ -75,7 +75,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -267,7 +267,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -624,6 +624,30 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</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>
@ -634,7 +658,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>2</FileNumber>
<FileNumber>4</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -654,7 +678,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>3</FileNumber>
<FileNumber>5</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>

30
soft/PjtKEIL_StepDFT/StepDFT.uvprojx
View file

@ -388,6 +388,16 @@
<FileType>1</FileType>
<FilePath>.\Src\principal.c</FilePath>
</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>
</Group>
<Group>
@ -797,6 +807,16 @@
<FileType>1</FileType>
<FilePath>.\Src\principal.c</FilePath>
</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>
</Group>
<Group>
@ -1275,6 +1295,16 @@
<FileType>1</FileType>
<FilePath>.\Src\principal.c</FilePath>
</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>
</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);

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

@ -11,9 +11,16 @@
area maram,data,readwrite
SortieSon dcw 0
Index dcd 0x00000000
; ===============================================================================================
EXPORT CallbackSon
EXPORT SortieSon
EXPORT StartSon
EXPORT Index
EXTERN Son
EXTERN LongueurSon
INCLUDE ../Driver/DriverJeuLaser.inc
@ -21,10 +28,72 @@
area moncode,code,readonly
; écrire le code ici
CallbackSon proc
push {lr}
ldr r0, =SortieSon ; r0 = &SortieSon car SortieSon variable
ldr r1, =Son ; r1 = &Son
ldr r2, =Index ; r2 = &Index
ldr r3, =LongueurSon ; r3 = &LongueurSon
push {r4}
push {r5}
push {r6}
push {r7}
push {r8}
push {r9}
push {r10}
push {r11}
ldr r4, [r2] ; r4 = Index
ldr r10, [r2] ; r10 = Index
ldr r11, [r3] ; r11 = LongueurSon
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
mov r9, #2
mul r4, r9 ; r4 = 2*Index
ldrsh r5, [r1, r4] ; r5 = Son[(2*)Index] //ldrsh car 16 bits signés
ldr r6, [r0] ; r6 = SortieSon
mov r7, #360
mov r8, #32768
mul r5, r7
sdiv r5, r8
adds r5, #360 ; r5 = (r6*360)/32768 + 360 pour la mise à l'échelle entre 0 et 719 des valauers de SortieSon
strh r5, [r0] ;SortieSon chargée dans la mémoire //strh car 16 bits signe positif
mov r0, r5
adds r10, #1; r10 = Index++
str r10, [r2] ;Index chargée dans la mémoire //str car 32 bits
pop {r11}
pop {r10}
pop {r9}
pop {r8}
pop {r7}
pop {r6}
pop {r5}
pop {r4}
bl PWM_Set_Value_TIM3_Ch3
pop {pc}
ENDFUNC
StartSon proc
ldr r0, =Index; r0 = &Index
mov r1, #0 ; r1 = 0
str r1, [r0] ;Index chargée dans la mémoire //str car 32 bits
bx lr
ENDFUNC
END

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

@ -1,7 +1,5 @@
#include "DriverJeuLaser.h"
#include "GestionSon.h"
int main(void)
@ -13,7 +11,13 @@ int main(void)
// Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers
CLOCK_Configure();
// configuration du Timer 4 en débordement 100ms
u32 duree = 6552; //655200; //91*7200
Timer_1234_Init_ff(TIM4, duree);
PWM_Init_ff(TIM3, 3, 720);
GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL);
//** Placez votre code là ** //
Active_IT_Debordement_Timer(TIM4, 2, CallbackSon);
@ -23,6 +27,8 @@ CLOCK_Configure();
while (1)
{
if (Index == (unsigned int)-1){
StartSon();
}
}
}

95
soft/PjtKEIL_StepSon/StepSon.uvoptx
View file

@ -10,7 +10,7 @@
<aExt>*.s*; *.src; *.a*</aExt>
<oExt>*.obj; *.o</oExt>
<lExt>*.lib</lExt>
<tExt>*.txt; *.h; *.inc</tExt>
<tExt>*.txt; *.h; *.inc; *.md</tExt>
<pExt>*.plm</pExt>
<CppX>*.cpp</CppX>
<nMigrate>0</nMigrate>
@ -75,7 +75,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -154,6 +154,36 @@
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>R0</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
<ItemText>SortieSon</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
<ItemText>Index,0x0A</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
<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>
@ -174,7 +204,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>
@ -199,8 +229,13 @@
<LogicAnalyzers>
<Wi>
<IntNumber>0</IntNumber>
<FirstString>((portb &amp; 0x00000002) &gt;&gt; 1 &amp; 0x2) &gt;&gt; 1</FirstString>
<SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F160000000000000000000000000000000000000096020008</SecondString>
<FirstString>`SortieSon</FirstString>
<SecondString>0080000000000000000000000000000000408F4000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000001000000000000000000E03F160000000000000000000000000000000000000094080008</SecondString>
</Wi>
<Wi>
<IntNumber>1</IntNumber>
<FirstString>((portb &amp; 0x00000001) &amp; 0x1) &gt;&gt; 0</FirstString>
<SecondString>00000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1600000000000000000000000000000000000000B40A0008</SecondString>
</Wi>
</LogicAnalyzers>
<DebugDescription>
@ -374,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>
@ -460,7 +495,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -616,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>
@ -666,6 +701,50 @@
</File>
</Group>
<Group>
<GroupName>Son</GroupName>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>4</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Src\GestionSon.s</PathWithFileName>
<FilenameWithoutPath>GestionSon.s</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>5</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Src\bruitverre.asm</PathWithFileName>
<FilenameWithoutPath>bruitverre.asm</FilenameWithoutPath>
<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>
<GroupName>::CMSIS</GroupName>
<tvExp>0</tvExp>

71
soft/PjtKEIL_StepSon/StepSon.uvprojx
View file

@ -10,7 +10,7 @@
<TargetName>Simu</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>
@ -410,6 +410,26 @@
</File>
</Files>
</Group>
<Group>
<GroupName>Son</GroupName>
<Files>
<File>
<FileName>GestionSon.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\GestionSon.s</FilePath>
</File>
<File>
<FileName>bruitverre.asm</FileName>
<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>
<GroupName>::CMSIS</GroupName>
</Group>
@ -419,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>
@ -819,6 +839,26 @@
</File>
</Files>
</Group>
<Group>
<GroupName>Son</GroupName>
<Files>
<File>
<FileName>GestionSon.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\GestionSon.s</FilePath>
</File>
<File>
<FileName>bruitverre.asm</FileName>
<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>
<GroupName>::CMSIS</GroupName>
<GroupOption>
@ -1297,6 +1337,26 @@
</File>
</Files>
</Group>
<Group>
<GroupName>Son</GroupName>
<Files>
<File>
<FileName>GestionSon.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\GestionSon.s</FilePath>
</File>
<File>
<FileName>bruitverre.asm</FileName>
<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>
<GroupName>::CMSIS</GroupName>
</Group>
@ -1322,12 +1382,7 @@
<LayerInfo>
<Layers>
<Layer>
<LayName>&lt;Project Info&gt;</LayName>
<LayDesc></LayDesc>
<LayUrl></LayUrl>
<LayKeys></LayKeys>
<LayCat></LayCat>
<LayLic></LayLic>
<LayName>StepSon</LayName>
<LayTarg>0</LayTarg>
<LayPrjMark>1</LayPrjMark>
</Layer>