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

Compare commits

base: acco:master
Branches Tags
acco:master
slamnia:master
..
compare: slamnia:master
Branches Tags
slamnia:master
acco:master

9 commits
master ... master

Author SHA1 Message Date
Slamnia Enzo
0d7170208c fin de la DFT 2023-05-25 17:01:41 +02:00
Slamnia Enzo
99785ea3ac fin de la DFT / pb de format 2023-05-24 15:26:08 +02:00
Slamnia Enzo
b6baee8edc début de la DFT 2023-05-22 12:13:10 +02:00
Enzo Slamnia
fe6be534f1 StepSon : Fin Callbackson 2023-04-19 12:17:24 +02:00
Enzo Slamnia
1aea46f820 partie PWM 2023-04-12 15:21:44 +02:00
Enzo Slamnia
6d36e9c037 fonction de mise a l'echelle 2023-04-12 12:43:02 +02:00
Enzo Slamnia
39ed994241 step deb 2 2023-03-21 18:22:42 +01:00
Enzo Slamnia
01dee3307d ajout des fichiers matlab 2023-03-16 16:21:52 +01:00
Enzo Slamnia
d2647bf70b 1ere partie 2023-03-15 18:20:23 +01:00
43 changed files with 10037 additions and 9312 deletions
Show stats Expand all files Collapse all files

1
.gitignore vendored
View file

@ -108,4 +108,3 @@ RTE
# To explicitly override the above, define any exceptions here; e.g.:
# !my_customized_scatter_file.sct
*.slprj

173
signal/matlab/ScriptDFT.m Normal file
View file

@ -0,0 +1,173 @@
%%
%TUTO BAC A SABLE
figure(1);
plot(Res.Sinus_Continu);
hold on;
plot(Res.Sinus_Echanti,'o');
grid;
title('Courbe temporelle du Sinus');
tab = linspace(0,M-1,M);
tab = tab*(Fe/M);
r = fft(Res.Sinus_Echanti.data);
figure(2);
stem(tab,abs(r/M));
grid;
title('Module de la TFD en fonction de la fréquence');
%%
%QUESTION 1 ET 2
clear all;
close all;
clc;
Fe = 320000;
Te = 1/Fe;
T = 1/5000;
M = T/Te;
Tsim = T-Te;
F1 = 85000;
F2 = 90000;
F3 = 95000;
F4 = 100000;
F5 = 115000;
F6 = 120000;
Res = sim('SimuGuns');
echelle_freq = linspace(0,M-1,M)*(Fe/M);
r = fft(Res.Echanti.data);
figure(1);
plot(Res.Continu);
grid;
figure(2);
plot(echelle_freq,abs(r/M),'o');
grid;
%%
%QUESTION 3
clear all;
close all;
clc;
Fe = 320000;
Te = 1/Fe;
T = 1/5000;
M = T/Te;
Tsim = T-Te;
F1 = 85005.9;
F2 = 90000;
F3 = 94846.8;
F4 = 100000;
F5 = 115015.9;
F6 = 120000;
Res = sim('SimuGuns');
echelle_freq = linspace(0,M-1,M)*(Fe/M);
r = fft(Res.Echanti.data);
figure(1);
plot(Res.Continu);
grid;
hold on;
figure(2);
semilogy(echelle_freq,abs(r/M));
grid;
%%
%Question 4
clear all;
close all;
clc;
Fe = 320000;
Te = 1/Fe;
T = 1/5000;
M = T/Te;
Tsim = T-Te;
F1 = 85005.9;
F2 = 90000;
F3 = 94846.8;
F4 = 100000;
F5 = 115015.9;
F6 = 120000;
Res = sim('SimuGuns');
for i = 1:32
Res.Echanti.data(i) = 0;
end
echelle_freq = linspace(0,M-1,M)*(Fe/M);
r = fft(Res.Echanti.data);
figure(1);
plot(Res.Continu);
grid;
hold on;
figure(2);
semilogy(echelle_freq,abs(r/M));
grid;
%%
%Question 6
clear all;
close all;
clc;
F1 = 85000;
Fe = 320000;
Te = 1/Fe;
%T = 1/F1;
%M = T/Te;
T = 2*10^(-4);
M=2^6;
Tsim = T-Te;
Res = sim('SimuGuns');
echelle_freq = linspace(0,M-1,M)*(Fe/M);
r = fft(Res.carre1.data);
figure(1);
plot(Res.carre1);
grid;
hold on;
figure(2);
plot(echelle_freq,log10(abs(r/M)),'o');
grid;
%%
% Question 8
clear all;
close all;
clc;
F1 = 85000;
Fe = 320000;
Te = 1/Fe;
%T = 1/F1;
%M = T/Te;
T = 2*10^(-4);
M=2^6;
Tsim = T-Te;
p = tf('p');
Fp = 1/(1.7483e-23*p^4 + 7.6663e-18*p^3 + 1.162e-11*p^2 + 3.0332e-6*p+1);
Res = sim('SimuGuns');
echelle_freq = linspace(0,M-1,M)*(Fe/M);
r = fft(Res.carre.data);
figure(1);
plot(Res.carre);
grid;
hold on;
figure(2);
bode(Fp);
plot(bode(Fp));
%plot(echelle_freq,log10(abs(r/M)),'o');
grid;

BIN
signal/matlab/SimuGuns.slx Normal file
View file

Binary file not shown.

BIN
signal/matlab/SimulDFT.slx Normal file
View file

Binary file not shown.

40
signal/matlab/scriptDFT.m
View file

@ -1,40 +0,0 @@
clear all;
close all;
%% Paramêtres utilisatrice
%
T = 0.25; % Fenêtre d'observation [s]
M=32; % Nombre d'échantillons dans la fenêtre
Fsin = 4 ; % Fréquence d'un sinus [Hz]
%% Paramêtres déduits
Te = T/M; % Période d'échantillonnage [s]
Tsim = T-Te; % Instant final de simulation avec M points [s]
fprintf("Fréquence = %f Hz", 1/Te)
%% Calculs préliminaires
%% Lancement de simulink
tic
out=sim("simDFT");
toc
%% Visualisations temporelle
plot(out.sin_continu,'.-');
hold on;
t = out.sin_echanti.Time;
sig = out.sin_echanti.Data;
stem(t, sig , 'o');
grid on;
%% Calcul DFT
Tfd = fft(sig);
abscisses=1:length(Tfd);
%% visualisation DFT
figure()
plot(abscisses,abs(Tfd),'o-');
ylabel("Module Transformée de Fourier")
xlabel("??? indices de tableau Matlab de 1 à 32 ???")

BIN
signal/matlab/scriptDFT.mlx
View file

Binary file not shown.

BIN
signal/matlab/simDFT.slx
View file

Binary file not shown.

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

@ -1,5 +1,7 @@
PRESERVE8
THUMB
;;IMPORT LeSignal
EXPORT DFT_ModuleAuCaree
; ====================== zone de réservation de données, ======================================
@ -10,7 +12,8 @@
;Section RAM (read write):
area maram,data,readwrite
M DCD 63
Index DCD 0
; ===============================================================================================
@ -21,6 +24,44 @@
area moncode,code,readonly
; écrire le code ici
DFT_ModuleAuCaree
;;R0 et R1 sont utilises pour les arg
push{r4,r5,r6,r7,r8,r9}
mov r5,#0 ;;registre qui va contenir la somme des cos
mov r8,#0 ;;registre qui va contenir la somme des sin
mov r9,#0 ;;index pour signal64echanti et les tabs
mov r2,#0
reel
cmp r9,#63
bgt DFT_ModuleAuCarreFin
;;On lit la valeur de l'argument signal64ech
;;et on le multiplie à chaque valeur du tabCos
ldrsh r3,[r0,r9,lsl #1] ;;on recup le signal64echanti
ldr r4, =TabCos ;;on recup la neme valeur du tableau de cos
ldrsh r6, [r4,r2,lsl #1] ;;on stocke la valeur cos a la neme position
mul r4,r6,r3 ;; on fait xn*cos
add r5,r5,r4 ;;et on l'ajoute à la somme des cosinus
imag
ldr r7, =TabSin
ldrsh r8,[r7,r2,lsl #1]
mul r7,r8,r3 ; add r8,r8,r7 ;;sommre des sin
add r9,#1
add r2,r1
b reel
DFT_ModuleAuCarreFin
smull r7,r6,r5,r5
smull r7,r5,r8,r8
add r0,r6,r5
pop{r4,r5,r6,r7,r8,r9}
bx lr
@ -29,6 +70,9 @@
AREA Trigo, DATA, READONLY
; codage fractionnaire 1.15
TabCos
DCW 32767 ; 0 0x7fff 0.99997
DCW 32610 ; 1 0x7f62 0.99518
@ -163,4 +207,7 @@ TabSin
END

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

@ -1,8 +1,8 @@
#include <stdio.h>
#include "DriverJeuLaser.h"
extern int DFT_ModuleAuCaree(short int * signal , char k );
extern short int LeSignal;
int main(void)
{
@ -13,6 +13,13 @@ int main(void)
// Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers
CLOCK_Configure();
int Res_DFT[32];
char K1 = 17;
// K2 (90) = 18
// K3 (95) = 19
// K4 (100) = 20
// K5 (115) = 23
// K6 (120) = 24
@ -20,7 +27,9 @@ CLOCK_Configure();
//============================================================================
for (int k = 0; k<32;k++){
Res_DFT[k] = DFT_ModuleAuCaree(&LeSignal,1);
}
while (1)
{
}

109
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>
@ -153,7 +153,82 @@
<Name>-U066CFF574857847167074929 -O2254 -S0 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>59</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134218464</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>.\Src\DFT.s</Filename>
<ExecCommand></ExecCommand>
<Expression>\\StepDFT\Src/DFT.s\59</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>r5</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
<ItemText>r0,0x0A</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
<ItemText>r4</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
<ItemText>r3</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
<ItemText>r2</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
<ItemText>Res_DFT[k]</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
<ItemText>r6</ItemText>
</Ww>
<Ww>
<count>7</count>
<WinNumber>1</WinNumber>
<ItemText>r7</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>0</SubType>
<ItemText>r0</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
<MemoryWindow2>
<Mm>
<WinNumber>2</WinNumber>
<SubType>0</SubType>
<ItemText>r0</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow2>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
@ -267,7 +342,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -624,6 +699,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 +733,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 +753,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>

65
soft/PjtKEIL_StepDeb_1/BacASable.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>
@ -153,7 +153,47 @@
<Name>-U066CFF574857847167074929 -O2254 -S0 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>44</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134218704</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>.\Src\Delay.s</Filename>
<ExecCommand></ExecCommand>
<Expression>\\BacASable\Src/Delay.s\44</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>VarTime</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>0</SubType>
<ItemText>VarTime</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
<MemoryWindow2>
<Mm>
<WinNumber>2</WinNumber>
<SubType>0</SubType>
<ItemText>r0</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow2>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
@ -196,6 +236,18 @@
<pszMrulep></pszMrulep>
<pSingCmdsp></pSingCmdsp>
<pMultCmdsp></pMultCmdsp>
<LogicAnalyzers>
<Wi>
<IntNumber>0</IntNumber>
<FirstString>((portb &amp; 0x00000002) &gt;&gt; 1 &amp; 0x2) &gt;&gt; 1</FirstString>
<SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1000000000000000000000000000000000000000DE030008</SecondString>
</Wi>
<Wi>
<IntNumber>1</IntNumber>
<FirstString>`VarTime</FirstString>
<SecondString>0080000000000000000000000000000040772B410000000000000000000000000000000056617254696D65000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1000000000000000000000000000000000000000DC030008</SecondString>
</Wi>
</LogicAnalyzers>
<DebugDescription>
<Enable>1</Enable>
<EnableFlashSeq>0</EnableFlashSeq>
@ -339,11 +391,18 @@
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>VarTime</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>257</SubType>
<ItemText>r0</ItemText>
<ItemText>0x20000000</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>

9
soft/PjtKEIL_StepDeb_1/BacASable.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>
@ -424,7 +424,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>
@ -1338,11 +1338,6 @@
<Layers>
<Layer>
<LayName>&lt;Project Info&gt;</LayName>
<LayDesc></LayDesc>
<LayUrl></LayUrl>
<LayKeys></LayKeys>
<LayCat></LayCat>
<LayLic></LayLic>
<LayTarg>0</LayTarg>
<LayPrjMark>1</LayPrjMark>
</Layer>

26
soft/PjtKEIL_StepDeb_1/Src/Delay.s
View file

@ -10,17 +10,17 @@
;Section RAM (read write):
area maram,data,readwrite
VarTime dcd 0
VarTime dcd 0 ; short_int* VarTime = malloc() memset(VarTime,0,sizeof...)
; ===============================================================================================
;constantes (équivalent du #define en C)
TimeValue equ 900000
TimeValue equ 900000 ; #define TIMEVALUE 900000
EXPORT Delay_100ms ; la fonction Delay_100ms est rendue publique donc utilisable par d'autres modules.
EXPORT VarTime
;Section ROM code (read only) :
area moncode,code,readonly
@ -39,21 +39,23 @@ TimeValue equ 900000
;
; et donc possède un intérêt pour débuter en ASM pur
Delay_100ms proc
Delay_100ms proc ; procédure
ldr r0,=VarTime
ldr r0,=VarTime ; *r0 = VarTime (= 0)
ldr r1,=TimeValue
str r1,[r0]
ldr r1,=TimeValue ; *r1 = TimeValue
str r1,[r0] ; met la valeur TimeValue stockée dans R1 dans l'adresse mémoire
; spécifiée dans R0
BoucleTempo
ldr r1,[r0]
ldr r1,[r0] ; r1 = *r0
subs r1,#1
str r1,[r0]
bne BoucleTempo
subs r1,#1 ; r1 = r1 - 1 (avec retenue)
str r1,[r0] ; same que en haut
bne BoucleTempo ; branchement qui appelle BoucleTempo si
; l'instruction d'avant est non equal
bx lr
bx lr ; retour de fonction
endp

59
soft/PjtKEIL_StepDeb_2/BacASable.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>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -154,6 +154,55 @@
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>FlagCligno</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
<ItemText>r1</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
<ItemText>r2</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>0</SubType>
<ItemText>FlagCligno</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
<MemoryWindow2>
<Mm>
<WinNumber>2</WinNumber>
<SubType>0</SubType>
<ItemText>r1</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow2>
<MemoryWindow3>
<Mm>
<WinNumber>3</WinNumber>
<SubType>0</SubType>
<ItemText>r0</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow3>
<MemoryWindow4>
<Mm>
<WinNumber>4</WinNumber>
<SubType>0</SubType>
<ItemText>r2</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow4>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
@ -174,7 +223,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>
@ -267,7 +316,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -360,7 +409,7 @@
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
<aLwin>1</aLwin>
<aLwin>0</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>

9
soft/PjtKEIL_StepDeb_2/BacASable.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>
@ -424,7 +424,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>
@ -1338,11 +1338,6 @@
<Layers>
<Layer>
<LayName>&lt;Project Info&gt;</LayName>
<LayDesc></LayDesc>
<LayUrl></LayUrl>
<LayKeys></LayKeys>
<LayCat></LayCat>
<LayLic></LayLic>
<LayTarg>0</LayTarg>
<LayPrjMark>1</LayPrjMark>
</Layer>

27
soft/PjtKEIL_StepDeb_2/Src/Cligno.s
View file

@ -1,6 +1,6 @@
PRESERVE8
THUMB
INCLUDE Driver/DriverJeuLaser.inc
; ====================== zone de réservation de données, ======================================
;Section RAM (read only) :
@ -10,11 +10,12 @@
;Section RAM (read write):
area maram,data,readwrite
FlagCligno dcd 0
; ===============================================================================================
EXPORT FlagCligno
EXPORT callback
;Section ROM code (read only) :
@ -23,8 +24,26 @@
callback proc
push {lr}
ldr r1,=FlagCligno ; *r1 = FlagCligno
ldr r2,[r1]
cmp r2, #1
beq allume_led
mov r0, #1
str r0, [r1]
bl GPIOB_Clear
pop {lr}
bx lr
allume_led
mov r0, #0
str r0, [r1]
mov r0, #1
bl GPIOB_Set
pop {lr}
bx lr
endp
END

9
soft/PjtKEIL_StepDeb_2/Src/principal.c
View file

@ -4,6 +4,8 @@
void timer_callback(void);
extern void callback(void);
int main(void)
{
@ -19,6 +21,8 @@ CLOCK_Configure();
//** Placez votre code là ** //
Timer_1234_Init_ff(TIM4, 7200000 );
Active_IT_Debordement_Timer( TIM4, 2, callback );
// Activation des interruptions issues du Timer 4
// Association de la fonction à exécuter lors de l'interruption : timer_callback
@ -39,10 +43,11 @@ GPIO_Configure(GPIOB, 1, OUTPUT, OUTPUT_PPULL);
while (1)
{
}
}
char FlagCligno;
/*char FlagCligno;
void timer_callback(void)
{
@ -57,5 +62,5 @@ void timer_callback(void)
GPIOB_Clear(1);
}
}
} */

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

@ -0,0 +1,7 @@
#ifndef GESTIONSON_H__
#define GESTIONSON_H__
void CallbackSon(void);
void StartSon(void);
#endif

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

@ -1,6 +1,11 @@
PRESERVE8
THUMB
IMPORT LongueurSon
IMPORT PeriodeSonMicroSec
IMPORT Son
IMPORT PWM_Set_Value_TIM3_Ch3
EXPORT CallbackSon
; ====================== zone de réservation de données, ======================================
;Section RAM (read only) :
@ -10,8 +15,10 @@
;Section RAM (read write):
area maram,data,readwrite
SortieSon dcw 0
Index dcd 0
EXPORT SortieSon
; ===============================================================================================
@ -22,9 +29,51 @@
; écrire le code ici
CallbackSon proc
;; 1. Il faut pouvoir utiliser SortieSon comme index d'iteration dans le tableau bruitverre
push {r4,r5,r6,r7,lr}
ldr r1,=SortieSon ;sortie
ldr r2,=LongueurSon ;nb de sons
ldr r2,[r2]
ldr r3,=Son ;adresse du tableau de sons
ldr r7,=Index
ldr r4,[r7] ;compteur
cmp r4,r2
;moveq r4,#0
beq fin
mov r5,#(1<<15) ;registre pour operations
mov r6,#719 ;sauvegarde de 719
calcul
ldrsh r0, [r3,r4,lsl #1]
;faire +32768, ensuite x719, puis diviser par 2^16
add r0,r5
mul r0,r0,r6
lsr r0,#16
str r0,[r1]
add r4,#1
str r4,[r7]
push {r1,r2,r3}
bl PWM_Set_Value_TIM3_Ch3
pop {r1,r2,r3}
;add r4,#1
;cmp r2,r4
;bne calcul
fin
pop {r4,r5,r6,r7,lr}
bx lr
endp
StartSon proc
ldr r1,=Index
ldr r2,=LongueurSon
cmp r1,r2
bne pass
mov r1,#0
pass
bx lr
endp
END

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

@ -1,6 +1,9 @@
#include "DriverJeuLaser.h"
//#include "../Driver/DriverJeuLaser.inc"
extern void CallbackSon(void);
extern int PeriodeSonMicroSec;
@ -14,8 +17,11 @@ int main(void)
// Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers
CLOCK_Configure();
PWM_Init_ff(TIM3, 3, 720);
GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL);
Timer_1234_Init_ff(TIM4, 91*72);
Active_IT_Debordement_Timer( TIM4, 2, CallbackSon );
//============================================================================
@ -23,6 +29,7 @@ CLOCK_Configure();
while (1)
{
}
}

182
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>
@ -153,7 +153,93 @@
<Name>-U066CFF574857847167074929 -O2254 -S0 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
<Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>36</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134220444</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>\netapp2\slamnia\3MIC\2s\BE-CHTI\assembleur\chti23\soft\PjtKEIL_StepSon\Src\GestionSon.s</Filename>
<ExecCommand></ExecCommand>
<Expression>\\StepSon\Src/GestionSon.s\36</Expression>
</Bp>
</Breakpoint>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>SortieSon</ItemText>
</Ww>
<Ww>
<count>1</count>
<WinNumber>1</WinNumber>
<ItemText>r0</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
<ItemText>(portb &amp; 0x00000001)</ItemText>
</Ww>
<Ww>
<count>3</count>
<WinNumber>1</WinNumber>
<ItemText>r4</ItemText>
</Ww>
<Ww>
<count>4</count>
<WinNumber>1</WinNumber>
<ItemText>Index</ItemText>
</Ww>
<Ww>
<count>5</count>
<WinNumber>1</WinNumber>
<ItemText>r2</ItemText>
</Ww>
<Ww>
<count>6</count>
<WinNumber>1</WinNumber>
<ItemText>r3</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
<SubType>265</SubType>
<ItemText>r3</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
<MemoryWindow2>
<Mm>
<WinNumber>2</WinNumber>
<SubType>0</SubType>
<ItemText>r6</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow2>
<MemoryWindow3>
<Mm>
<WinNumber>3</WinNumber>
<SubType>0</SubType>
<ItemText>r4</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow3>
<MemoryWindow4>
<Mm>
<WinNumber>4</WinNumber>
<SubType>0</SubType>
<ItemText>r5</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow4>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
@ -174,7 +260,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 +285,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>FF0000000000000000000000000000000078864000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000700000001000000000000000000E03F1900000000000000000000000000000000000000C40A0008</SecondString>
</Wi>
<Wi>
<IntNumber>1</IntNumber>
<FirstString>((portb &amp; 0x00000001) &amp; 0x1) &gt;&gt; 0</FirstString>
<SecondString>00008000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000FFFFFFFFFFFFDF3F1900000000000000000000000000000000000000D20A0008</SecondString>
</Wi>
</LogicAnalyzers>
<DebugDescription>
@ -346,6 +437,13 @@
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>r0</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
<WinNumber>1</WinNumber>
@ -354,6 +452,30 @@
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow1>
<MemoryWindow2>
<Mm>
<WinNumber>2</WinNumber>
<SubType>0</SubType>
<ItemText>r6</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow2>
<MemoryWindow3>
<Mm>
<WinNumber>3</WinNumber>
<SubType>0</SubType>
<ItemText>r4</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow3>
<MemoryWindow4>
<Mm>
<WinNumber>4</WinNumber>
<SubType>0</SubType>
<ItemText>r5</ItemText>
<AccSizeX>0</AccSizeX>
</Mm>
</MemoryWindow4>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
@ -374,7 +496,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 +582,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -664,6 +786,50 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>4</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Driver\DriverJeuLaser.inc</PathWithFileName>
<FilenameWithoutPath>DriverJeuLaser.inc</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>
<GroupName>Son</GroupName>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<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>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>
</Group>
<Group>

73
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>
@ -408,6 +408,26 @@
<FileType>4</FileType>
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
</File>
<File>
<FileName>DriverJeuLaser.inc</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\DriverJeuLaser.inc</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>Son</GroupName>
<Files>
<File>
<FileName>bruitverre.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\bruitverre.asm</FilePath>
</File>
<File>
<FileName>GestionSon.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\GestionSon.s</FilePath>
</File>
</Files>
</Group>
<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>
@ -817,6 +837,26 @@
<FileType>4</FileType>
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
</File>
<File>
<FileName>DriverJeuLaser.inc</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\DriverJeuLaser.inc</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>Son</GroupName>
<Files>
<File>
<FileName>bruitverre.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\bruitverre.asm</FilePath>
</File>
<File>
<FileName>GestionSon.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\GestionSon.s</FilePath>
</File>
</Files>
</Group>
<Group>
@ -897,7 +937,7 @@
<TargetName>CibleSondeST</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>
@ -1295,6 +1335,26 @@
<FileType>4</FileType>
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
</File>
<File>
<FileName>DriverJeuLaser.inc</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\DriverJeuLaser.inc</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>Son</GroupName>
<Files>
<File>
<FileName>bruitverre.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\bruitverre.asm</FilePath>
</File>
<File>
<FileName>GestionSon.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\GestionSon.s</FilePath>
</File>
</Files>
</Group>
<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>