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

Compare commits

base: brunetto:448bfc931628c069b3b5d0cf76e8684078ee8684
Branches Tags
brunetto:master
acco:master
...
compare: brunetto:b4f148a288e1673737f5b5a159c607eba64ce07b
Branches Tags
brunetto:master
acco:master

2 commits
448bfc9316 ... b4f148a288

Author SHA1 Message Date
brunetto
b4f148a288 StepDFT - Première étape - Non testée 2023-04-14 18:18:39 +02:00
brunetto
3e88b87649 Step_Jeu_Son Fini 2023-04-14 15:57:32 +02:00
9 changed files with 182 additions and 28 deletions
Show stats Expand all files Collapse all files

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

@ -15,13 +15,33 @@
; =============================================================================================== ; ===============================================================================================
;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, r4, r5, r6}
mov r2, #0 ;Compteur de boucle
mov r3, #0 ;Partie Réelle
ldr r5, =TabCos
BOUCLER
cmp r2, #63
bgt FINBOUCLER
mul r4, r1, r2
and r4, #63 ; p
ldrh r4, [r5, r4, LSL #1] ; TabCos(p)
ldrh r6, [r0, r2, LSL #1] ; LeSignal(n)
mul r4, r6
add r3, r4
add r2, #1
bl BOUCLER
FINBOUCLER
mov r0, r3
pop {pc, r4, r5, r6}
endp

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

@ -2,7 +2,7 @@
#include "DriverJeuLaser.h" #include "DriverJeuLaser.h"
int DFT_ModuleAuCarre( short int * Signal64ech, char k);
int main(void) int main(void)
{ {
@ -14,8 +14,6 @@ int main(void)
// Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers // Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers
CLOCK_Configure(); CLOCK_Configure();
//============================================================================ //============================================================================
@ -23,6 +21,7 @@ CLOCK_Configure();
while (1) while (1)
{ {
//DFT_ModuleAuCarre( LeSignal, 17);
} }
} }

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>

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

@ -0,0 +1,14 @@
/**
* Bibliothèque comprenant les fonctions de gestion du son bruitverre.asm à travers GestionSon.s
* Les fonctions présentes sont CallbackSon et StartSon
*/
#include "DriverJeuLaser.h"
//**********************************************************************************************************
//--------------------- FONCTIONS DE GESTION DU SON --------------------------------------
//**********************************************************************************************************
void CallbackSon(void);
void StartSon(void);

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

@ -17,7 +17,7 @@ Index dcw 0
; =============================================================================================== ; ===============================================================================================
EXPORT SortieSon EXPORT SortieSon
EXPORT CallbackSon EXPORT CallbackSon
;EXPORT StartSon EXPORT StartSon
IMPORT Son IMPORT Son
IMPORT LongueurSon IMPORT LongueurSon
IMPORT PWM_Set_Value_TIM3_Ch3 IMPORT PWM_Set_Value_TIM3_Ch3
@ -67,12 +67,13 @@ Fin
endp endp
;StartSon proc StartSon proc
; push {lr} push {lr}
; ldr r3,=Index ldr r3,=Index
; mov r1, #0 mov r1, #0
; strh r1,[r3] strh r1,[r3]
; pop {pc} pop {pc}
endp

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

@ -1,9 +1,5 @@
#include "DriverJeuLaser.h" #include "GestionSon.h"
void CallbackSon(void);
//void StartSon(void);
int main(void) int main(void)
{ {
@ -35,17 +31,19 @@ Active_IT_Debordement_Timer( TIM4, 2, CallbackSon );
GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL); GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL);
GPIO_Configure(GPIOB, 1, OUTPUT, OUTPUT_PPULL); GPIO_Configure(GPIOB, 1, OUTPUT, OUTPUT_PPULL);
//Appel Startson tout les secondes. Enlevez le commentaire pour tester StartSon en simulation
/*
Timer_1234_Init_ff( TIM2, 72000000 );
Active_IT_Debordement_Timer( TIM2, 2, StartSon );
*/
//============================================================================ //============================================================================
while (1) while (1)
{ {
/*
for(int i = 0; i<99999; i++)
{
StartSon();
}*/
} }
} }

6
soft/PjtKEIL_StepSon/StepSon.uvoptx
View file

@ -180,7 +180,7 @@
<Mm> <Mm>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<SubType>10</SubType> <SubType>10</SubType>
<ItemText>R2</ItemText> <ItemText>R3</ItemText>
<AccSizeX>0</AccSizeX> <AccSizeX>0</AccSizeX>
</Mm> </Mm>
</MemoryWindow1> </MemoryWindow1>
@ -230,12 +230,12 @@
<Wi> <Wi>
<IntNumber>0</IntNumber> <IntNumber>0</IntNumber>
<FirstString>(PORTB &amp; 0x00000001)</FirstString> <FirstString>(PORTB &amp; 0x00000001)</FirstString>
<SecondString>008000000000000000000000000000000000F03F0000000000000000000000000000000028504F52544220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F0E00000000000000000000000000000000000000F20A0008</SecondString> <SecondString>008000000000000000000000000000000000F03F0000000000000000000000000000000028504F52544220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1900000000000000000000000000000000000000F20A0008</SecondString>
</Wi> </Wi>
<Wi> <Wi>
<IntNumber>1</IntNumber> <IntNumber>1</IntNumber>
<FirstString>(SortieSon &amp; 0xFFFF) &gt;&gt; 0</FirstString> <FirstString>(SortieSon &amp; 0xFFFF) &gt;&gt; 0</FirstString>
<SecondString>000080000000000000000000000000000000884000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000003000000FFFFFFFFFFFFDF3F0E00000000000000000000000000000000000000CC090008</SecondString> <SecondString>000080000000000000000000000000000000884000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000FFFFFFFFFFFFDF3F1900000000000000000000000000000000000000CC090008</SecondString>
</Wi> </Wi>
</LogicAnalyzers> </LogicAnalyzers>
<DebugDescription> <DebugDescription>

68
soft/Signal.asm Normal file
View file

@ -0,0 +1,68 @@
AREA Signal, DATA, READONLY
export LeSignal
LeSignal
DCW 0x0fff ; 0 4095 0.99976
DCW 0x0737 ; 1 1847 0.45093
DCW 0x0027 ; 2 39 0.00952
DCW 0x0a53 ; 3 2643 0.64526
DCW 0x0f64 ; 4 3940 0.96191
DCW 0x043b ; 5 1083 0.26440
DCW 0x0159 ; 6 345 0.08423
DCW 0x0d13 ; 7 3347 0.81714
DCW 0x0da8 ; 8 3496 0.85352
DCW 0x01d1 ; 9 465 0.11353
DCW 0x038e ; 10 910 0.22217
DCW 0x0f0e ; 11 3854 0.94092
DCW 0x0b10 ; 12 2832 0.69141
DCW 0x0058 ; 13 88 0.02148
DCW 0x0670 ; 14 1648 0.40234
DCW 0x0ff6 ; 15 4086 0.99756
DCW 0x0800 ; 16 2048 0.50000
DCW 0x000a ; 17 10 0.00244
DCW 0x0990 ; 18 2448 0.59766
DCW 0x0fa8 ; 19 4008 0.97852
DCW 0x04f0 ; 20 1264 0.30859
DCW 0x00f2 ; 21 242 0.05908
DCW 0x0c72 ; 22 3186 0.77783
DCW 0x0e2f ; 23 3631 0.88647
DCW 0x0258 ; 24 600 0.14648
DCW 0x02ed ; 25 749 0.18286
DCW 0x0ea7 ; 26 3751 0.91577
DCW 0x0bc5 ; 27 3013 0.73560
DCW 0x009c ; 28 156 0.03809
DCW 0x05ad ; 29 1453 0.35474
DCW 0x0fd9 ; 30 4057 0.99048
DCW 0x08c9 ; 31 2249 0.54907
DCW 0x0000 ; 32 0 0.00000
DCW 0x08c9 ; 33 2249 0.54907
DCW 0x0fd9 ; 34 4057 0.99048
DCW 0x05ad ; 35 1453 0.35474
DCW 0x009c ; 36 156 0.03809
DCW 0x0bc5 ; 37 3013 0.73560
DCW 0x0ea7 ; 38 3751 0.91577
DCW 0x02ed ; 39 749 0.18286
DCW 0x0258 ; 40 600 0.14648
DCW 0x0e2f ; 41 3631 0.88647
DCW 0x0c72 ; 42 3186 0.77783
DCW 0x00f2 ; 43 242 0.05908
DCW 0x04f0 ; 44 1264 0.30859
DCW 0x0fa8 ; 45 4008 0.97852
DCW 0x0990 ; 46 2448 0.59766
DCW 0x000a ; 47 10 0.00244
DCW 0x0800 ; 48 2048 0.50000
DCW 0x0ff6 ; 49 4086 0.99756
DCW 0x0670 ; 50 1648 0.40234
DCW 0x0058 ; 51 88 0.02148
DCW 0x0b10 ; 52 2832 0.69141
DCW 0x0f0e ; 53 3854 0.94092
DCW 0x038e ; 54 910 0.22217
DCW 0x01d1 ; 55 465 0.11353
DCW 0x0da8 ; 56 3496 0.85352
DCW 0x0d13 ; 57 3347 0.81714
DCW 0x0159 ; 58 345 0.08423
DCW 0x043b ; 59 1083 0.26440
DCW 0x0f64 ; 60 3940 0.96191
DCW 0x0a53 ; 61 2643 0.64526
DCW 0x0027 ; 62 39 0.00952
DCW 0x0737 ; 63 1847 0.45093
END