diff --git a/soft/PjtKEIL_StepDFT/Src/DFT.s b/soft/PjtKEIL_StepDFT/Src/DFT.s index 090cb64..d266085 100644 --- a/soft/PjtKEIL_StepDFT/Src/DFT.s +++ b/soft/PjtKEIL_StepDFT/Src/DFT.s @@ -26,20 +26,24 @@ DFTReel proc push {lr} mov r2, #0 mov r3, #0 + ;;Pour i allant de 0 à M-1 (ici, M = 64) SommeFor ;; Rsom += Signal[i] * TabCos[k*i] - ldrsh r4, [r0,r3] + ldrsh r4, [r0,r3,lsl #1] mul r5, r1, r3 and r5, #63 + mov r7, r5 + ;mul r7, r5 ldr r6, =TabCos - ldrsh r5, [r6,r5] + ldrsh r5, [r6,r5,lsl #1] + ;;smlal r2, r7, r4, r5 mla r2, r4, r5, r2 add r3, #1 cmp r3, #64 bne SommeFor ;;Fin Pour - str r2, [r0] + mov r0, r2 pop {pc} endp diff --git a/soft/PjtKEIL_StepDFT/Src/principal.c b/soft/PjtKEIL_StepDFT/Src/principal.c index 0de795c..0c78338 100644 --- a/soft/PjtKEIL_StepDFT/Src/principal.c +++ b/soft/PjtKEIL_StepDFT/Src/principal.c @@ -24,8 +24,10 @@ CLOCK_Configure(); while (1) { - for(i = 0;i<63;i++){ + for(i = 0;i<64;i++){ + //tabDFT[0] = DFTReel(&(LeSignal[0]), 0); tabDFT[i] = DFTReel(&(LeSignal[0]), i); + //tabDFT[2] = DFTReel(&(LeSignal[0]), 2); } } } diff --git a/soft/PjtKEIL_StepDFT/StepDFT.uvoptx b/soft/PjtKEIL_StepDFT/StepDFT.uvoptx index 6a5586a..c397969 100644 --- a/soft/PjtKEIL_StepDFT/StepDFT.uvoptx +++ b/soft/PjtKEIL_StepDFT/StepDFT.uvoptx @@ -153,24 +153,7 @@ -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 - 43 - 1 -
134218470
- 0 - 0 - 0 - 0 - 0 - 1 - .\Src\DFT.s - - \\StepDFT\Src/DFT.s\43 -
-
+ 0 @@ -187,7 +170,7 @@ 1 1 - 0x20000004 + 0x20000004 0