diff --git a/soft/PjtKEIL_StepDFT/Src/DFT.s b/soft/PjtKEIL_StepDFT/Src/DFT.s
index 3f6b5d4..f246e07 100644
--- a/soft/PjtKEIL_StepDFT/Src/DFT.s
+++ b/soft/PjtKEIL_StepDFT/Src/DFT.s
@@ -13,16 +13,53 @@
; ===============================================================================================
-
+ EXTERN LeSignal;
+ EXPORT DFT_ModuleAuCarre;
;Section ROM code (read only) :
area moncode,code,readonly
; écrire le code ici
+DFT_ModuleAuCarre proc
+
+ LDR r2,=LeSignal
+ mov r3,#0 ; compteur
+ push {r4}
+ push {r5}
+ push {r6}
+ push {r7}
+ push {r8}
+ push {r9}
+ LDR r4,=TabCos
+ LDR r5,=TabSin
+ MOV r8,#0 ; Xreel
+ MOV r9,#64 ; max
+
+Loop
+ LDRSH r6,[r4,r3]
+ LDRSH r7,[r2,r3]
+ MUL r6,r1,r6 ; mul cos par k
+ MUL r6,r7,r6 ; mul cos et val res en (5.27)
+
+ ADD r8,r6
-
-
+ ADD r3,#1
+ MOV r9,#64
+ CMP r3,r9
+ BNE Loop
+
+ mov r8,r0
+ pop {r9}
+ pop {r8}
+ pop {r7}
+ pop {r6}
+ pop {r4}
+ pop {r5}
+
+ bx lr
+ ENDFUNC
+
;Section ROM code (read only) :
@@ -161,6 +198,9 @@ TabSin
DCW -3212 ; 63 0xf374 -0.09802
+
+
+
END
\ No newline at end of file
diff --git a/soft/PjtKEIL_StepDFT/Src/principal.c b/soft/PjtKEIL_StepDFT/Src/principal.c
index d09be75..e258881 100644
--- a/soft/PjtKEIL_StepDFT/Src/principal.c
+++ b/soft/PjtKEIL_StepDFT/Src/principal.c
@@ -1,8 +1,7 @@
-
-
#include "DriverJeuLaser.h"
+extern int DFT_ModuleAuCarre(short int* Signal64ech, char k);
int main(void)
{
@@ -20,9 +19,12 @@ CLOCK_Configure();
//============================================================================
+ short int * x;
+ int res = DFT_ModuleAuCarre(x,1);
while (1)
{
+
}
}
diff --git a/soft/PjtKEIL_StepDFT/StepDFT.uvoptx b/soft/PjtKEIL_StepDFT/StepDFT.uvoptx
index 0d72cfc..7fee9e0 100644
--- a/soft/PjtKEIL_StepDFT/StepDFT.uvoptx
+++ b/soft/PjtKEIL_StepDFT/StepDFT.uvoptx
@@ -75,7 +75,7 @@
1
0
- 0
+ 1
18
@@ -153,7 +153,52 @@
-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)
-
+
+
+ 0
+ 0
+ 40
+ 1
+ 134218414
+ 0
+ 0
+ 0
+ 0
+ 0
+ 1
+ .\Src\DFT.s
+
+ \\StepDFT\Src/DFT.s\40
+
+
+ 1
+ 0
+ 39
+ 1
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ 0
+ .\Src\DFT.s
+
+
+
+
+
+
+ 0
+ 1
+ r6
+
+
+ 1
+ 1
+ r0
+
+
0
@@ -267,7 +312,7 @@
1
0
- 1
+ 0
18
@@ -624,6 +669,30 @@
0
0
+
+ 1
+ 2
+ 2
+ 0
+ 0
+ 0
+ .\Src\DFT.s
+ DFT.s
+ 0
+ 0
+
+
+ 1
+ 3
+ 2
+ 0
+ 0
+ 0
+ .\Src\Signal.asm
+ Signal.asm
+ 0
+ 0
+
@@ -634,7 +703,7 @@
0
2
- 2
+ 4
2
0
0
@@ -654,7 +723,7 @@
0
3
- 3
+ 5
4
0
0
diff --git a/soft/PjtKEIL_StepDFT/StepDFT.uvprojx b/soft/PjtKEIL_StepDFT/StepDFT.uvprojx
index 9031782..cec1044 100644
--- a/soft/PjtKEIL_StepDFT/StepDFT.uvprojx
+++ b/soft/PjtKEIL_StepDFT/StepDFT.uvprojx
@@ -388,6 +388,16 @@
1
.\Src\principal.c
+
+ DFT.s
+ 2
+ .\Src\DFT.s
+
+
+ Signal.asm
+ 2
+ .\Src\Signal.asm
+
@@ -797,6 +807,16 @@
1
.\Src\principal.c
+
+ DFT.s
+ 2
+ .\Src\DFT.s
+
+
+ Signal.asm
+ 2
+ .\Src\Signal.asm
+
@@ -1275,6 +1295,16 @@
1
.\Src\principal.c
+
+ DFT.s
+ 2
+ .\Src\DFT.s
+
+
+ Signal.asm
+ 2
+ .\Src\Signal.asm
+
@@ -1322,7 +1352,7 @@
- <Project Info>
+ StepDFT
0
1
diff --git a/soft/PjtKEIL_StepSon/StepSon.uvoptx b/soft/PjtKEIL_StepSon/StepSon.uvoptx
index 59b47cf..260bca8 100644
--- a/soft/PjtKEIL_StepSon/StepSon.uvoptx
+++ b/soft/PjtKEIL_StepSon/StepSon.uvoptx
@@ -75,7 +75,7 @@
1
0
- 1
+ 0
18
@@ -245,12 +245,12 @@
0
`SortieSon
- 0080000000000000000000000000000000408F4000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000001000000000000000000E03F1600000000000000000000000000000000000000540A0008
+ 0080000000000000000000000000000000408F4000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000001000000000000000000E03F1700000000000000000000000000000000000000540A0008
1
((portb & 0x00000001) & 0x1) >> 0
- 0080000000000000000000000000000000408F400000000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000002000000000000000000E03F1600000000000000000000000000000000000000B40A0008
+ 0080000000000000000000000000000000408F400000000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000002000000000000000000E03F1700000000000000000000000000000000000000B40A0008
@@ -317,7 +317,7 @@
1
0
- 0
+ 1
18