diff --git a/soft/PjtKEIL_StepDFT/Src/principal.c b/soft/PjtKEIL_StepDFT/Src/principal.c index d09be75..1a347ae 100644 --- a/soft/PjtKEIL_StepDFT/Src/principal.c +++ b/soft/PjtKEIL_StepDFT/Src/principal.c @@ -20,6 +20,12 @@ CLOCK_Configure(); //============================================================================ +/* Algo DFT module au carre + + + +*/ + while (1) { diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.s b/soft/PjtKEIL_StepSon/Src/GestionSon.s index edcfd13..681e042 100644 --- a/soft/PjtKEIL_StepSon/Src/GestionSon.s +++ b/soft/PjtKEIL_StepSon/Src/GestionSon.s @@ -62,13 +62,14 @@ CallbackSon proc mov r0, #92 udiv r1, r0 ;Sortir la valeur PWM en fonction de R0 - ;ldr r5, =SortieSon - str r1, [r0] + ldr r5, =SortieSon + str r1, [r5] + mov r0, r1 bl PWM_Set_Value_TIM3_Ch3 ;Indice++ add r4, #1 str r4,[r3] - pop {pc} + ;} Depassement diff --git a/soft/PjtKEIL_StepSon/StepSon.uvoptx b/soft/PjtKEIL_StepSon/StepSon.uvoptx index 9dd4fed..6bbbbac 100644 --- a/soft/PjtKEIL_StepSon/StepSon.uvoptx +++ b/soft/PjtKEIL_StepSon/StepSon.uvoptx @@ -75,7 +75,7 @@ 1 0 - 1 + 0 18 @@ -165,15 +165,12 @@ 1 SortieSon - - - + + 2 1 - 10 - 0x200000A0 - 0 - - + PB.0 + + 0 @@ -219,8 +216,13 @@ 0 - `portb - 00800000000000000000000000000000E0FFEF4000000000000000000000000000000000706F7274620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F1A00000000000000000000000000000000000000B40A0008 + (portb & 0x00000001) + 00800000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F0B00000000000000000000000000000000000000E60A0008 + + + 1 + `SortieSon + 000080000000000000000000000000000080864000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000002000000000000000000E03F0B00000000000000000000000000000000000000E60A0008 @@ -480,7 +482,7 @@ 1 0 - 0 + 1 18 @@ -636,7 +638,7 @@ 1 1 1 - 0 + 1 0 0 .\Src\principal.c @@ -708,7 +710,7 @@ 4 5 2 - 0 + 1 0 0 .\Src\GestionSon.s