From 2f7464c93d35b52a15277ec27ba59ffa1a30b0c1 Mon Sep 17 00:00:00 2001 From: Nathan Billard Date: Fri, 7 Apr 2023 10:47:44 +0200 Subject: [PATCH] son fini et debut dft --- soft/PjtKEIL_StepDFT/Src/DFT.s | 45 +++++++++-- .../Src/generationSignalpourAsm.m | 38 +++++++++ soft/PjtKEIL_StepDFT/Src/module_carre.h | 6 ++ soft/PjtKEIL_StepDFT/Src/principal.c | 13 +++- soft/PjtKEIL_StepDFT/StepDFT.uvoptx | 78 +++++++++++++++++-- soft/PjtKEIL_StepDFT/StepDFT.uvprojx | 47 ++++++++++- soft/PjtKEIL_StepDeb_1/BacASable.uvoptx | 39 ++++++++-- soft/PjtKEIL_StepDeb_1/BacASable.uvprojx | 11 +-- soft/PjtKEIL_StepDeb_1/Src/Delay.s | 1 + soft/PjtKEIL_StepDeb_1/Src/principal.c | 2 +- soft/PjtKEIL_StepDeb_2/BacASable.uvoptx | 6 +- soft/PjtKEIL_StepDeb_2/BacASable.uvprojx | 9 +-- soft/PjtKEIL_StepDeb_2/Src/Cligno.s | 21 +++-- soft/PjtKEIL_StepDeb_2/Src/principal.c | 10 +-- soft/PjtKEIL_StepSon/Src/GestionSon.h | 8 ++ soft/PjtKEIL_StepSon/Src/GestionSon.s | 46 +++++++++-- soft/PjtKEIL_StepSon/Src/principal.c | 22 +++++- soft/PjtKEIL_StepSon/StepSon.uvoptx | 73 +++++++++++++++-- soft/PjtKEIL_StepSon/StepSon.uvprojx | 56 +++++++++++-- 19 files changed, 454 insertions(+), 77 deletions(-) create mode 100644 soft/PjtKEIL_StepDFT/Src/generationSignalpourAsm.m create mode 100644 soft/PjtKEIL_StepDFT/Src/module_carre.h create mode 100644 soft/PjtKEIL_StepSon/Src/GestionSon.h diff --git a/soft/PjtKEIL_StepDFT/Src/DFT.s b/soft/PjtKEIL_StepDFT/Src/DFT.s index 3f6b5d4..c5349a8 100644 --- a/soft/PjtKEIL_StepDFT/Src/DFT.s +++ b/soft/PjtKEIL_StepDFT/Src/DFT.s @@ -21,8 +21,45 @@ area moncode,code,readonly ; écrire le code ici + export DFT_ModuleAuCarre - +DFT_ModuleAuCarre proc + push {r4, r5, r6, r8, r9, r10} ; on pourrait utiliser r9 au lieu de r10, mais pour maximiser l'utilisation de processeur super-scalaire, on utilise un registre de plus + eor r2, r2 ; imaginary part = 0 + eor r3, r3 ; real part = 0 + eor r7, r7 ; nk = 0 + eor r4, r4 ; n = 0 + ldr r5, =TabCos + ldr r6, =TabSin + +SumLoop + ldrsh r8, [r0, r4, lsl #1] ; r8 = LeSignal[n] + + ldrsh r9, [r5, r7, lsl #1] ; r9 = TabCos[n * k] virgule fixe signee format 0.15 + mul r9, r8, r9 + asr r9, #15 ; nombre a virgule fixe il faut remettre la virgule apres la multiplication + add r3, r3, r9 + + ;ldrsh r10, [r6, r7, lsl #1] ; r9 = TabSin[n * k] virgule fixe signee format 0.15 + ;mul r10, r8, r10 + ;asr r10, #15 ; virgule fixe + ;add r2, r2, r10 + + add r7, r1 ; nk += k + add r4, r4, #1 ; ++n; + cmp r4, #64 + bcc SumLoop ; if n < 64 then loop again + + ;mul r2, r2, r2 + ;mul r3, r3, r3 + ;add r0, r2, r3 + ;asr r0, #2 ; exp(ix) = ( cos(x) + i * sin(x) ) / 2 here, we divide by 4 because we took the square + + mov r0, r3 ; only show real part -> remove it for the final code + + pop {r4, r5, r6, r8, r9, r10} + bx lr + endp ;Section ROM code (read only) : @@ -158,9 +195,7 @@ TabSin DCW -12540 ; 60 0xcf04 -0.38269 DCW -9512 ; 61 0xdad8 -0.29028 DCW -6393 ; 62 0xe707 -0.19510 - DCW -3212 ; 63 0xf374 -0.09802 + DCW -3212 ; 63 0xf374 -0.09802 + - - - END \ No newline at end of file diff --git a/soft/PjtKEIL_StepDFT/Src/generationSignalpourAsm.m b/soft/PjtKEIL_StepDFT/Src/generationSignalpourAsm.m new file mode 100644 index 0000000..b88fee7 --- /dev/null +++ b/soft/PjtKEIL_StepDFT/Src/generationSignalpourAsm.m @@ -0,0 +1,38 @@ +clc +clear + +N = input('Nombre d''échantilllons pour ce signal : '); +Frel = input('Fréquence normalisée (nombre de périodes dans la durée totale) : '); +Ph0 = input('Phase a l''origine (en degrés) : '); +Ph0 = Ph0 * pi / 180.0; % a present en radian + +Ampl = 2048; +Offset = 2048; +%% Création du fichier .asm + +fileID = fopen(['Signal.asm'], 'w'); +fprintf(fileID,'\tAREA Signal, DATA, READONLY\n'); +fprintf(fileID,'\texport LeSignal\n'); + +fprintf(fileID,'LeSignal\n'); + +for i = 1: N + % fonction a modifier en fonction des besoins + Sig(i) = Offset + Ampl * cos( 2*pi*Frel*(i-1)/N + Ph0 ); + % arrondi + iSig = int16(Sig(i)); + % bornage du signal similaire a la sortie brute de l'ADC 12 bits + if ( iSig < 0 ) + iSig = 0; + end + if ( iSig > 4095 ) + iSig = 4095; + end + + fprintf(fileID,'\tDCW\t0x%04x\t; %2d %4d %7.5f\n',iSig, i-1, iSig, double(iSig) / 4096.0 ); + +end + +fprintf(fileID,'\tEND\n'); +fclose(fileID); +plot(Sig); \ No newline at end of file diff --git a/soft/PjtKEIL_StepDFT/Src/module_carre.h b/soft/PjtKEIL_StepDFT/Src/module_carre.h new file mode 100644 index 0000000..fecc066 --- /dev/null +++ b/soft/PjtKEIL_StepDFT/Src/module_carre.h @@ -0,0 +1,6 @@ +#ifndef MODULE_CARRE +#define MODULE_CARRE + +int DFT_ModuleAuCarre(short int* Signal64ech, char k); + +#endif diff --git a/soft/PjtKEIL_StepDFT/Src/principal.c b/soft/PjtKEIL_StepDFT/Src/principal.c index d09be75..1010f00 100644 --- a/soft/PjtKEIL_StepDFT/Src/principal.c +++ b/soft/PjtKEIL_StepDFT/Src/principal.c @@ -1,11 +1,14 @@ - - #include "DriverJeuLaser.h" +#include "module_carre.h" +extern short LeSignal; + int main(void) { + +int real_number_test = 0; // =========================================================================== // ============= INIT PERIPH (faites qu'une seule fois) ===================== @@ -14,12 +17,14 @@ int main(void) // Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers CLOCK_Configure(); - - //============================================================================ +for (int k= 0; k < 64; ++k) { + real_number_test = DFT_ModuleAuCarre(&LeSignal, k); +} + while (1) { diff --git a/soft/PjtKEIL_StepDFT/StepDFT.uvoptx b/soft/PjtKEIL_StepDFT/StepDFT.uvoptx index 0d72cfc..884b0ba 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,39 @@ -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 + 33 + 1 +
134218422
+ 0 + 0 + 0 + 0 + 0 + 1 + .\Src\DFT.s + + \\StepDFT\Src/DFT.s\33 + + + + + 0 + 1 + real_number_test + + + + + 1 + 257 + r0 + 0 + + 0 @@ -267,7 +299,7 @@ 1 0 - 1 + 0 18 @@ -624,6 +656,42 @@ 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 + + + 1 + 4 + 5 + 0 + 0 + 0 + .\Src\module_carre.h + module_carre.h + 0 + 0 + @@ -634,7 +702,7 @@ 0 2 - 2 + 5 2 0 0 @@ -654,7 +722,7 @@ 0 3 - 3 + 6 4 0 0 diff --git a/soft/PjtKEIL_StepDFT/StepDFT.uvprojx b/soft/PjtKEIL_StepDFT/StepDFT.uvprojx index 9031782..6bd2c51 100644 --- a/soft/PjtKEIL_StepDFT/StepDFT.uvprojx +++ b/soft/PjtKEIL_StepDFT/StepDFT.uvprojx @@ -388,6 +388,21 @@ 1 .\Src\principal.c + + DFT.s + 2 + .\Src\DFT.s + + + Signal.asm + 2 + .\Src\Signal.asm + + + module_carre.h + 5 + .\Src\module_carre.h + @@ -797,6 +812,21 @@ 1 .\Src\principal.c + + DFT.s + 2 + .\Src\DFT.s + + + Signal.asm + 2 + .\Src\Signal.asm + + + module_carre.h + 5 + .\Src\module_carre.h + @@ -1275,6 +1305,21 @@ 1 .\Src\principal.c + + DFT.s + 2 + .\Src\DFT.s + + + Signal.asm + 2 + .\Src\Signal.asm + + + module_carre.h + 5 + .\Src\module_carre.h + @@ -1322,7 +1367,7 @@ - <Project Info> + StepDFT 0 1 diff --git a/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx b/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx index ed76561..9fe5adf 100644 --- a/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx +++ b/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx @@ -10,7 +10,7 @@ *.s*; *.src; *.a* *.obj; *.o *.lib - *.txt; *.h; *.inc + *.txt; *.h; *.inc; *.md *.plm *.cpp 0 @@ -75,7 +75,7 @@ 1 0 - 1 + 0 18 @@ -154,6 +154,21 @@ + + + 0 + 1 + VarTime,0x0A + + + + + 1 + 0 + r0 + 0 + + 0 @@ -174,7 +189,7 @@ 0 0 0 - 0 + 1 0 0 0 @@ -196,6 +211,18 @@ + + + 0 + ((portb & 0x00000002) >> 1 & 0x2) >> 1 + FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1700000000000000000000000000000000000000D4030008 + + + 1 + `VarTime + 0000000000000000000000000000000080842E410000000000000000000000000000000056617254696D65000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000002000000000000000000E03F1700000000000000000000000000000000000000DA030008 + + 1 0 @@ -260,7 +287,7 @@ 1 0 - 0 + 1 18 @@ -342,7 +369,7 @@ 1 - 257 + 1 r0 0 @@ -367,7 +394,7 @@ 0 0 0 - 0 + 1 0 0 0 diff --git a/soft/PjtKEIL_StepDeb_1/BacASable.uvprojx b/soft/PjtKEIL_StepDeb_1/BacASable.uvprojx index 9c192f5..44dfd58 100644 --- a/soft/PjtKEIL_StepDeb_1/BacASable.uvprojx +++ b/soft/PjtKEIL_StepDeb_1/BacASable.uvprojx @@ -10,7 +10,7 @@ Simu 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -424,7 +424,7 @@ CibleSondeKEIL 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -907,7 +907,7 @@ CibleSondeST 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -1338,11 +1338,6 @@ <Project Info> - - - - - 0 1 diff --git a/soft/PjtKEIL_StepDeb_1/Src/Delay.s b/soft/PjtKEIL_StepDeb_1/Src/Delay.s index bf49175..76a7963 100644 --- a/soft/PjtKEIL_StepDeb_1/Src/Delay.s +++ b/soft/PjtKEIL_StepDeb_1/Src/Delay.s @@ -20,6 +20,7 @@ TimeValue equ 900000 EXPORT Delay_100ms ; la fonction Delay_100ms est rendue publique donc utilisable par d'autres modules. + EXPORT VarTime; ;Section ROM code (read only) : diff --git a/soft/PjtKEIL_StepDeb_1/Src/principal.c b/soft/PjtKEIL_StepDeb_1/Src/principal.c index a2e1f67..dc12449 100644 --- a/soft/PjtKEIL_StepDeb_1/Src/principal.c +++ b/soft/PjtKEIL_StepDeb_1/Src/principal.c @@ -22,7 +22,7 @@ GPIO_Configure(GPIOB, 1, OUTPUT, OUTPUT_PPULL); //============================================================================ -while (1) + while (1) { Delay_100ms(); GPIOB_Set(1); diff --git a/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx b/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx index f1315bb..db3e892 100644 --- a/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx +++ b/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx @@ -10,7 +10,7 @@ *.s*; *.src; *.a* *.obj; *.o *.lib - *.txt; *.h; *.inc + *.txt; *.h; *.inc; *.md *.plm *.cpp 0 @@ -75,7 +75,7 @@ 1 0 - 1 + 0 18 @@ -267,7 +267,7 @@ 1 0 - 0 + 1 18 diff --git a/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx b/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx index d99d0f0..f01d9e2 100644 --- a/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx +++ b/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx @@ -10,7 +10,7 @@ Simu 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -424,7 +424,7 @@ CibleSondeKEIL 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -1338,11 +1338,6 @@ <Project Info> - - - - - 0 1 diff --git a/soft/PjtKEIL_StepDeb_2/Src/Cligno.s b/soft/PjtKEIL_StepDeb_2/Src/Cligno.s index 8a75b7a..550d7db 100644 --- a/soft/PjtKEIL_StepDeb_2/Src/Cligno.s +++ b/soft/PjtKEIL_StepDeb_2/Src/Cligno.s @@ -1,30 +1,35 @@ PRESERVE8 THUMB + include Driver/DriverJeuLaser.inc ; ====================== zone de réservation de données, ====================================== ;Section RAM (read only) : area mesdata,data,readonly + ;Section RAM (read write): area maram,data,readwrite - +ClignoFlag dcb 0 ; =============================================================================================== - + EXPORT timer_callback_asm ;Section ROM code (read only) : area moncode,code,readonly ; écrire le code ici - - - - - - +timer_callback_asm proc + mov r0, #1 ; argument des fonctions GPIOB_Set et GPIOB_Clear + ldr r2,=ClignoFlag + ldrb r1, [r2] + eors r1, #1 + strb r1, [r2] + bne GPIOB_Set ; if (clignoFlag) { GPIOB_Set();} pas de bl pour ne pas changer lr afin que GPIOB_Set retourne la ou timer_callback_asm devrait retourner + b GPIOB_Clear ; else { GPIOB_Clear();} + endp END \ No newline at end of file diff --git a/soft/PjtKEIL_StepDeb_2/Src/principal.c b/soft/PjtKEIL_StepDeb_2/Src/principal.c index 4d726a1..17665e8 100644 --- a/soft/PjtKEIL_StepDeb_2/Src/principal.c +++ b/soft/PjtKEIL_StepDeb_2/Src/principal.c @@ -1,8 +1,8 @@ - - #include "DriverJeuLaser.h" +#define TICKS_IN_MS 72000 void timer_callback(void); +extern void timer_callback_asm(void); int main(void) { @@ -18,8 +18,8 @@ CLOCK_Configure(); //** Placez votre code là ** // - - +Timer_1234_Init_ff(TIM4, 100 * TICKS_IN_MS); +Active_IT_Debordement_Timer(TIM4, 2, timer_callback_asm); // Activation des interruptions issues du Timer 4 // Association de la fonction à exécuter lors de l'interruption : timer_callback // cette fonction (si écrite en ASM) doit être conforme à l'AAPCS @@ -36,7 +36,7 @@ GPIO_Configure(GPIOB, 1, OUTPUT, OUTPUT_PPULL); //============================================================================ - + while (1) { } diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.h b/soft/PjtKEIL_StepSon/Src/GestionSon.h new file mode 100644 index 0000000..171f7aa --- /dev/null +++ b/soft/PjtKEIL_StepSon/Src/GestionSon.h @@ -0,0 +1,8 @@ +#ifndef GESTION_SON +#define GESTION_SON + +void StartSon(void); +void GestionSon(void); + +#endif + diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.s b/soft/PjtKEIL_StepSon/Src/GestionSon.s index 8a75b7a..8f17f5b 100644 --- a/soft/PjtKEIL_StepSon/Src/GestionSon.s +++ b/soft/PjtKEIL_StepSon/Src/GestionSon.s @@ -1,6 +1,11 @@ PRESERVE8 THUMB + + import LongueurSon + import PeriodeSonMicroSec + import Son + include Driver/DriverJeuLaser.inc ; ====================== zone de réservation de données, ====================================== ;Section RAM (read only) : @@ -11,20 +16,49 @@ area maram,data,readwrite +Son_index dcd 0 +Sortie_son dcw 0 ; =============================================================================================== + EXPORT Son_index + EXPORT Sortie_son ;Section ROM code (read only) : area moncode,code,readonly -; écrire le code ici +; écrire le code ici + EXPORT GestionSon + EXPORT StartSon +StartSon proc + eor r0, r0 + ldr r1, =Son_index + str r0, [r1] + bx lr + endp - - - - - +GestionSon proc + ldr r2, =LongueurSon + ldr r0, [r2] + ldr r2, =Son_index + ldr r1, [r2] + cmp r0, r1 + bls EndOfSound ; if (LongeurSon <= Son_index) goto ResetGestionSon; + ldr r3, =Son + ldrsh r0, [r3, r1, lsl #1] + ; r0 = Son[Son_index] + add r0, #32768 + mov r3, #720 + mul r0, r3 + lsr r0, #16 ;x in [-32768; 32767] -> x in [0; 719] + ldr r3, =Sortie_son + str r0, [r3] ; Sortie_son = x + add r1, r1, #1 + str r1, [r2] ; Son_index++; + b PWM_Set_Value_TIM3_Ch3 +EndOfSound + bx lr + endp END \ No newline at end of file diff --git a/soft/PjtKEIL_StepSon/Src/principal.c b/soft/PjtKEIL_StepSon/Src/principal.c index d09be75..4367c6e 100644 --- a/soft/PjtKEIL_StepSon/Src/principal.c +++ b/soft/PjtKEIL_StepSon/Src/principal.c @@ -1,7 +1,13 @@ - - #include "DriverJeuLaser.h" +#include "GestionSon.h" +// #define US_IN_TICKS 72 +#define TE_IN_TICKS 6552 +#define PERIODE_PWM 720 + +// extern long PeriodeSonMicroSec; + +extern short Sortie_son; int main(void) @@ -13,8 +19,17 @@ int main(void) // Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers CLOCK_Configure(); + +// Timer_1234_Init_ff(TIM4, PeriodeSonMicroSec * US_IN_TICKS); +Timer_1234_Init_ff(TIM4, TE_IN_TICKS); +//Timer_1234_Init_ff(TIM3, PERIODE_PWM); // periode de la PWM = 10us , frequence = 100kHz +Active_IT_Debordement_Timer(TIM4, 2, GestionSon); +GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL); +PWM_Init_ff(TIM3, 3, PERIODE_PWM); +StartSon(); - +// Son_index = &Son; +// GPIOB_Set(0); @@ -26,3 +41,4 @@ while (1) } } + diff --git a/soft/PjtKEIL_StepSon/StepSon.uvoptx b/soft/PjtKEIL_StepSon/StepSon.uvoptx index a13d7da..51cdbd9 100644 --- a/soft/PjtKEIL_StepSon/StepSon.uvoptx +++ b/soft/PjtKEIL_StepSon/StepSon.uvoptx @@ -10,7 +10,7 @@ *.s*; *.src; *.a* *.obj; *.o *.lib - *.txt; *.h; *.inc + *.txt; *.h; *.inc; *.md *.plm *.cpp 0 @@ -154,6 +154,28 @@ + + + 0 + 1 + Sortie_son + + + + + 0 + 2 + Son_index + + + + + 1 + 1 + &Son + 0 + + 0 @@ -174,7 +196,7 @@ 0 0 0 - 0 + 1 0 0 0 @@ -199,8 +221,13 @@ 0 - ((portb & 0x00000002) >> 1 & 0x2) >> 1 - FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F160000000000000000000000000000000000000096020008 + ((portb & 0x00000001) & 0x1) >> 0 + 00800000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000001000000000000000000E03F0C00000000000000000000000000000000000000380A0008 + + + 1 + `Sortie_son + 008000000000000000000000000000000080864000000000000000000000000000000000536F727469655F736F6E000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000002000000000000000000E03F0C0000000000000000000000000000000000000004010008 @@ -267,7 +294,7 @@ 1 0 - 0 + 1 18 @@ -374,7 +401,7 @@ 0 0 0 - 0 + 1 0 0 0 @@ -460,7 +487,7 @@ 1 0 - 1 + 0 18 @@ -666,6 +693,38 @@ + + Son + 1 + 0 + 0 + 0 + + 4 + 4 + 2 + 0 + 0 + 0 + .\Src\bruitverre.asm + bruitverre.asm + 0 + 0 + + + 4 + 5 + 2 + 0 + 0 + 0 + .\Src\GestionSon.s + GestionSon.s + 0 + 0 + + + ::CMSIS 0 diff --git a/soft/PjtKEIL_StepSon/StepSon.uvprojx b/soft/PjtKEIL_StepSon/StepSon.uvprojx index d0b5c10..fad5a2d 100644 --- a/soft/PjtKEIL_StepSon/StepSon.uvprojx +++ b/soft/PjtKEIL_StepSon/StepSon.uvprojx @@ -10,7 +10,7 @@ Simu 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -410,6 +410,21 @@ + + Son + + + bruitverre.asm + 2 + .\Src\bruitverre.asm + + + GestionSon.s + 2 + .\Src\GestionSon.s + + + ::CMSIS @@ -419,7 +434,7 @@ CibleSondeKEIL 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -819,6 +834,21 @@ + + Son + + + bruitverre.asm + 2 + .\Src\bruitverre.asm + + + GestionSon.s + 2 + .\Src\GestionSon.s + + + ::CMSIS @@ -1297,6 +1327,21 @@ + + Son + + + bruitverre.asm + 2 + .\Src\bruitverre.asm + + + GestionSon.s + 2 + .\Src\GestionSon.s + + + ::CMSIS @@ -1322,12 +1367,7 @@ - <Project Info> - - - - - + StepSon 0 1