From 0d7170208c0b346db4d60732247da2b88d128784 Mon Sep 17 00:00:00 2001
From: Slamnia Enzo <slamnia@localhost>
Date: Thu, 25 May 2023 17:01:41 +0200
Subject: [PATCH] fin de la DFT

---
 soft/PjtKEIL_StepDFT/Src/DFT.s       |  9 ++++---
 soft/PjtKEIL_StepDFT/Src/principal.c |  2 +-
 soft/PjtKEIL_StepDFT/StepDFT.uvoptx  | 18 ++++++++++----
 soft/PjtKEIL_StepSon/StepSon.uvoptx  | 35 ++++++++++++++++++++++++----
 4 files changed, 50 insertions(+), 14 deletions(-)

diff --git a/soft/PjtKEIL_StepDFT/Src/DFT.s b/soft/PjtKEIL_StepDFT/Src/DFT.s
index a772ccd..3982d14 100644
--- a/soft/PjtKEIL_StepDFT/Src/DFT.s
+++ b/soft/PjtKEIL_StepDFT/Src/DFT.s
@@ -48,8 +48,7 @@ reel
 imag
 	ldr r7, =TabSin
 	ldrsh r8,[r7,r2,lsl #1] 
-	mul r7,r8,r3
-	add r8,r8,r7 ;;sommre des sin
+	mul r7,r8,r3 ; 	add r8,r8,r7 ;;sommre des sin
 	
 	add r9,#1
 	add r2,r1
@@ -57,9 +56,9 @@ imag
 	
 DFT_ModuleAuCarreFin
 	
-	mul r5,r5
-	mul r8,r8
-	add r0,r5,r8
+	smull r7,r6,r5,r5
+	smull r7,r5,r8,r8
+	add r0,r6,r5
     pop{r4,r5,r6,r7,r8,r9}
 	bx lr
 
diff --git a/soft/PjtKEIL_StepDFT/Src/principal.c b/soft/PjtKEIL_StepDFT/Src/principal.c
index 7a40a02..46c5637 100644
--- a/soft/PjtKEIL_StepDFT/Src/principal.c
+++ b/soft/PjtKEIL_StepDFT/Src/principal.c
@@ -28,7 +28,7 @@ char K1 = 17;
 //============================================================================	
 
 for (int k = 0; k<32;k++){
-Res_DFT[k] = DFT_ModuleAuCaree(&LeSignal,k);
+Res_DFT[k] = DFT_ModuleAuCaree(&LeSignal,1);
 }
 while	(1)
 	{
diff --git a/soft/PjtKEIL_StepDFT/StepDFT.uvoptx b/soft/PjtKEIL_StepDFT/StepDFT.uvoptx
index ae7aeec..077970a 100644
--- a/soft/PjtKEIL_StepDFT/StepDFT.uvoptx
+++ b/soft/PjtKEIL_StepDFT/StepDFT.uvoptx
@@ -157,18 +157,18 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>62</LineNumber>
+          <LineNumber>59</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134218472</Address>
+          <Address>134218464</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_StepDFT\Src\DFT.s</Filename>
+          <Filename>.\Src\DFT.s</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\StepDFT\Src/DFT.s\62</Expression>
+          <Expression>\\StepDFT\Src/DFT.s\59</Expression>
         </Bp>
       </Breakpoint>
       <WatchWindow1>
@@ -202,6 +202,16 @@
           <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>
diff --git a/soft/PjtKEIL_StepSon/StepSon.uvoptx b/soft/PjtKEIL_StepSon/StepSon.uvoptx
index 1859468..6ad6701 100644
--- a/soft/PjtKEIL_StepSon/StepSon.uvoptx
+++ b/soft/PjtKEIL_StepSon/StepSon.uvoptx
@@ -153,7 +153,24 @@
           <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>
@@ -180,12 +197,22 @@
           <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>0x200000A2</ItemText>
+          <ItemText>r3</ItemText>
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>
@@ -259,12 +286,12 @@
         <Wi>
           <IntNumber>0</IntNumber>
           <FirstString>`SortieSon</FirstString>
-          <SecondString>FF0000000000000000000000000000000078864000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000700000001000000000000000000E03F1500000000000000000000000000000000000000C40A0008</SecondString>
+          <SecondString>FF0000000000000000000000000000000078864000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000700000001000000000000000000E03F1900000000000000000000000000000000000000C40A0008</SecondString>
         </Wi>
         <Wi>
           <IntNumber>1</IntNumber>
           <FirstString>((portb &amp; 0x00000001) &amp; 0x1) &gt;&gt; 0</FirstString>
-          <SecondString>00008000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000FFFFFFFFFFFFDF3F1500000000000000000000000000000000000000D20A0008</SecondString>
+          <SecondString>00008000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000FFFFFFFFFFFFDF3F1900000000000000000000000000000000000000D20A0008</SecondString>
         </Wi>
       </LogicAnalyzers>
       <DebugDescription>