diff --git a/PjtKEIL_StepFini/ModuleAffichage/Affichage_Valise.h b/PjtKEIL_StepFini/Src/Affichage_Valise.h similarity index 100% rename from PjtKEIL_StepFini/ModuleAffichage/Affichage_Valise.h rename to PjtKEIL_StepFini/Src/Affichage_Valise.h diff --git a/PjtKEIL_StepFini/Src/DFT.s b/PjtKEIL_StepFini/Src/DFT.s index a41fcd0..763761b 100644 --- a/PjtKEIL_StepFini/Src/DFT.s +++ b/PjtKEIL_StepFini/Src/DFT.s @@ -36,7 +36,6 @@ export DFT_ModuleAucarre_Im export DFT_ModuleAuCarre - import LeSignal DFT_ModuleAucarre_Reel proc ; LeSignal dans r0 diff --git a/PjtKEIL_StepFini/son/GestionSon.h b/PjtKEIL_StepFini/Src/GestionSon.h similarity index 100% rename from PjtKEIL_StepFini/son/GestionSon.h rename to PjtKEIL_StepFini/Src/GestionSon.h diff --git a/PjtKEIL_StepFini/son/GestionSon.s b/PjtKEIL_StepFini/Src/GestionSon.s similarity index 82% rename from PjtKEIL_StepFini/son/GestionSon.s rename to PjtKEIL_StepFini/Src/GestionSon.s index 5ce8e7e..00bab75 100644 --- a/PjtKEIL_StepFini/son/GestionSon.s +++ b/PjtKEIL_StepFini/Src/GestionSon.s @@ -7,7 +7,7 @@ import LongueurSon include DriverJeuLaser.inc - + export IndexSon ; ====================== zone de réservation de données, ====================================== @@ -19,7 +19,7 @@ area maram,data,readwrite SortieSon dcw 0 ; reserve seulement 2 octet de memoire -Index dcw 0 +IndexSon dcw 0 ; =============================================================================================== @@ -41,7 +41,7 @@ Index dcw 0 StartSon proc - ldr r0, = Index; ; On charge la valeur d'index + ldr r0, = IndexSon; ; On charge la valeur d'index mov r1, #0 strh r1, [r0] @@ -51,19 +51,19 @@ StartSon proc CallbackSon proc push {lr} - ldr r0, = Index; ; On charge la valeur d'index + ldr r0, = IndexSon; ; On charge la valeur d'index ldr r1, [r0] ; ldr r2, = LongueurSon; ; On charge la valeur de la longueur son ldr r3, [r2] ; cmp r3, r1 ; On regarde si on est arrivé au bout du tableau - ble Sinon + ble fin ldr r2, = Son; ; On charge la valeur de la bonne ldrsh r3, [r2, r1, LSL #1] ; ligne de son - add r1, r1, #1 ; On store l'index et on l'incrémente de 1 - strh r1, [r0] + add r1, r1, #1 ; On store l'index et on l'incrémente de 1 + str r1, [r0] ;add r3, #32768 ; On ajoute 32768 mov r1, #360 ; On multiplie par 720 @@ -73,12 +73,8 @@ CallbackSon proc ldr r2, = SortieSon strh r3, [r2] ; On sauvegarde la valeur dans SortieSon - b fin - -Sinon - ;mov r1, #0 ; On remet l'index à 0 - str r0, [r1] ; On store l'index + fin EXPORT SortieSon mov r0, r3 diff --git a/PjtKEIL_StepFini/Src/Signal.asm b/PjtKEIL_StepFini/Src/Signal.asm deleted file mode 100644 index 3ec879f..0000000 --- a/PjtKEIL_StepFini/Src/Signal.asm +++ /dev/null @@ -1,68 +0,0 @@ - AREA Signal, DATA, READONLY - export LeSignal -LeSignal - DCW 0x0800 ; 0 2048 0.50000 - DCW 0x05ad ; 1 1453 0.35474 - DCW 0x038e ; 2 910 0.22217 - DCW 0x01d1 ; 3 465 0.11353 - DCW 0x009c ; 4 156 0.03809 - DCW 0x000a ; 5 10 0.00244 - DCW 0x0027 ; 6 39 0.00952 - DCW 0x00f2 ; 7 242 0.05908 - DCW 0x0258 ; 8 600 0.14648 - DCW 0x043b ; 9 1083 0.26440 - DCW 0x0670 ; 10 1648 0.40234 - DCW 0x08c9 ; 11 2249 0.54907 - DCW 0x0b10 ; 12 2832 0.69141 - DCW 0x0d13 ; 13 3347 0.81714 - DCW 0x0ea7 ; 14 3751 0.91577 - DCW 0x0fa8 ; 15 4008 0.97852 - DCW 0x0fff ; 16 4095 0.99976 - DCW 0x0fa8 ; 17 4008 0.97852 - DCW 0x0ea7 ; 18 3751 0.91577 - DCW 0x0d13 ; 19 3347 0.81714 - DCW 0x0b10 ; 20 2832 0.69141 - DCW 0x08c9 ; 21 2249 0.54907 - DCW 0x0670 ; 22 1648 0.40234 - DCW 0x043b ; 23 1083 0.26440 - DCW 0x0258 ; 24 600 0.14648 - DCW 0x00f2 ; 25 242 0.05908 - DCW 0x0027 ; 26 39 0.00952 - DCW 0x000a ; 27 10 0.00244 - DCW 0x009c ; 28 156 0.03809 - DCW 0x01d1 ; 29 465 0.11353 - DCW 0x038e ; 30 910 0.22217 - DCW 0x05ad ; 31 1453 0.35474 - DCW 0x0800 ; 32 2048 0.50000 - DCW 0x0a53 ; 33 2643 0.64526 - DCW 0x0c72 ; 34 3186 0.77783 - DCW 0x0e2f ; 35 3631 0.88647 - DCW 0x0f64 ; 36 3940 0.96191 - DCW 0x0ff6 ; 37 4086 0.99756 - DCW 0x0fd9 ; 38 4057 0.99048 - DCW 0x0f0e ; 39 3854 0.94092 - DCW 0x0da8 ; 40 3496 0.85352 - DCW 0x0bc5 ; 41 3013 0.73560 - DCW 0x0990 ; 42 2448 0.59766 - DCW 0x0737 ; 43 1847 0.45093 - DCW 0x04f0 ; 44 1264 0.30859 - DCW 0x02ed ; 45 749 0.18286 - DCW 0x0159 ; 46 345 0.08423 - DCW 0x0058 ; 47 88 0.02148 - DCW 0x0000 ; 48 0 0.00000 - DCW 0x0058 ; 49 88 0.02148 - DCW 0x0159 ; 50 345 0.08423 - DCW 0x02ed ; 51 749 0.18286 - DCW 0x04f0 ; 52 1264 0.30859 - DCW 0x0737 ; 53 1847 0.45093 - DCW 0x0990 ; 54 2448 0.59766 - DCW 0x0bc5 ; 55 3013 0.73560 - DCW 0x0da8 ; 56 3496 0.85352 - DCW 0x0f0e ; 57 3854 0.94092 - DCW 0x0fd9 ; 58 4057 0.99048 - DCW 0x0ff6 ; 59 4086 0.99756 - DCW 0x0f64 ; 60 3940 0.96191 - DCW 0x0e2f ; 61 3631 0.88647 - DCW 0x0c72 ; 62 3186 0.77783 - DCW 0x0a53 ; 63 2643 0.64526 - END diff --git a/PjtKEIL_StepFini/Src/Signal1.asm b/PjtKEIL_StepFini/Src/Signal1.asm deleted file mode 100644 index 5a79596..0000000 --- a/PjtKEIL_StepFini/Src/Signal1.asm +++ /dev/null @@ -1,68 +0,0 @@ - AREA Signal, DATA, READONLY - export LeSignal -LeSignal - DCW 0x0fff ; 0 4095 0.99976 - DCW 0x0ff6 ; 1 4086 0.99756 - DCW 0x0fd9 ; 2 4057 0.99048 - DCW 0x0fa8 ; 3 4008 0.97852 - DCW 0x0f64 ; 4 3940 0.96191 - DCW 0x0f0e ; 5 3854 0.94092 - DCW 0x0ea7 ; 6 3751 0.91577 - DCW 0x0e2f ; 7 3631 0.88647 - DCW 0x0da8 ; 8 3496 0.85352 - DCW 0x0d13 ; 9 3347 0.81714 - DCW 0x0c72 ; 10 3186 0.77783 - DCW 0x0bc5 ; 11 3013 0.73560 - DCW 0x0b10 ; 12 2832 0.69141 - DCW 0x0a53 ; 13 2643 0.64526 - DCW 0x0990 ; 14 2448 0.59766 - DCW 0x08c9 ; 15 2249 0.54907 - DCW 0x0800 ; 16 2048 0.50000 - DCW 0x0737 ; 17 1847 0.45093 - DCW 0x0670 ; 18 1648 0.40234 - DCW 0x05ad ; 19 1453 0.35474 - DCW 0x04f0 ; 20 1264 0.30859 - DCW 0x043b ; 21 1083 0.26440 - DCW 0x038e ; 22 910 0.22217 - DCW 0x02ed ; 23 749 0.18286 - DCW 0x0258 ; 24 600 0.14648 - DCW 0x01d1 ; 25 465 0.11353 - DCW 0x0159 ; 26 345 0.08423 - DCW 0x00f2 ; 27 242 0.05908 - DCW 0x009c ; 28 156 0.03809 - DCW 0x0058 ; 29 88 0.02148 - DCW 0x0027 ; 30 39 0.00952 - DCW 0x000a ; 31 10 0.00244 - DCW 0x0000 ; 32 0 0.00000 - DCW 0x000a ; 33 10 0.00244 - DCW 0x0027 ; 34 39 0.00952 - DCW 0x0058 ; 35 88 0.02148 - DCW 0x009c ; 36 156 0.03809 - DCW 0x00f2 ; 37 242 0.05908 - DCW 0x0159 ; 38 345 0.08423 - DCW 0x01d1 ; 39 465 0.11353 - DCW 0x0258 ; 40 600 0.14648 - DCW 0x02ed ; 41 749 0.18286 - DCW 0x038e ; 42 910 0.22217 - DCW 0x043b ; 43 1083 0.26440 - DCW 0x04f0 ; 44 1264 0.30859 - DCW 0x05ad ; 45 1453 0.35474 - DCW 0x0670 ; 46 1648 0.40234 - DCW 0x0737 ; 47 1847 0.45093 - DCW 0x0800 ; 48 2048 0.50000 - DCW 0x08c9 ; 49 2249 0.54907 - DCW 0x0990 ; 50 2448 0.59766 - DCW 0x0a53 ; 51 2643 0.64526 - DCW 0x0b10 ; 52 2832 0.69141 - DCW 0x0bc5 ; 53 3013 0.73560 - DCW 0x0c72 ; 54 3186 0.77783 - DCW 0x0d13 ; 55 3347 0.81714 - DCW 0x0da8 ; 56 3496 0.85352 - DCW 0x0e2f ; 57 3631 0.88647 - DCW 0x0ea7 ; 58 3751 0.91577 - DCW 0x0f0e ; 59 3854 0.94092 - DCW 0x0f64 ; 60 3940 0.96191 - DCW 0x0fa8 ; 61 4008 0.97852 - DCW 0x0fd9 ; 62 4057 0.99048 - DCW 0x0ff6 ; 63 4086 0.99756 - END diff --git a/PjtKEIL_StepFini/son/bruitverre.asm b/PjtKEIL_StepFini/Src/bruitverre.asm similarity index 100% rename from PjtKEIL_StepFini/son/bruitverre.asm rename to PjtKEIL_StepFini/Src/bruitverre.asm diff --git a/PjtKEIL_StepFini/Src/principal.c b/PjtKEIL_StepFini/Src/principal.c index 5d22b89..f766744 100644 --- a/PjtKEIL_StepFini/Src/principal.c +++ b/PjtKEIL_StepFini/Src/principal.c @@ -1,4 +1,7 @@ #include "DriverJeuLaser.h" +#include "GestionSon.h" +#include "Affichage_Valise.h" + extern int DFT_ModuleAucarre_Reel(short int * Signal64ech, char k); extern int DFT_ModuleAucarre_Im(short int * Signal64ech, char k); @@ -15,7 +18,44 @@ extern short int LeSignal[64]; // int somme_k = (int) (long long) somme_cos* (int) (long long) somme_cos + (int) (long long) somme_sin* (int) (long long) somme_sin; // return somme_k; //} -int Resultat[64]; +int Resultat[6]; +short dma_buf[64]; + +int Score [6] = { 0, 0, 0, 0, 0, 0}; +int Fre [6] = {17, 18, 19, 20, 23, 24}; +int Seuil = 2097152; + +int buff; + +void callback_Systick(){ + + + Start_DMA1(64); + Wait_On_End_Of_DMA1(); + Stop_DMA1; + + for (int k =0; k <6; k++){ + buff = DFT_ModuleAuCarre(dma_buf,Fre[k]); + Resultat[k] = buff; + } + + for (int k=0; k<6; k++) { + if (Resultat[k]>Seuil) { + Score [k] ++; + StartSon (); + } + } +} + +void callback_Affichage () { + Prepare_Afficheur (1, Score[1]); + Prepare_Afficheur (2, Score[2]); + Prepare_Afficheur (3, Score[3]); + Prepare_Afficheur (4, Score[4]); + Mise_A_Jour_Afficheurs_LED(); +} + + int main(void) { @@ -23,12 +63,36 @@ int main(void) // ============= INIT PERIPH (faites qu'une seule fois) ===================== // =========================================================================== + + + // Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers CLOCK_Configure(); + +Systick_Period_ff(360000); +Systick_Prio_IT(3,callback_Systick); + +SysTick_On; +SysTick_Enable_IT; + + +Timer_1234_Init_ff( TIM1, 91*72); +Active_IT_Debordement_Timer( TIM1, 8, callback_Affichage ); + +Timer_1234_Init_ff( TIM3, 91*72); +PWM_Init_ff( TIM3, 3, 720); +GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL); + +Timer_1234_Init_ff( TIM4, 91*72); +Active_IT_Debordement_Timer( TIM4, 5, CallbackSon ); + + +Init_TimingADC_ActiveADC_ff( ADC1, 72 ); +Single_Channel_ADC( ADC1, 2 ); +Init_Conversion_On_Trig_Timer_ff( ADC1, TIM2_CC2, 225 ); +Init_ADC1_DMA1( 0, dma_buf); + -for (int k =0; k <64; k++){ - Resultat[k] = DFT_ModuleAuCarre(LeSignal,k); -} //============================================================================ diff --git a/PjtKEIL_StepFini/StepDFT.uvprojx b/PjtKEIL_StepFini/StepDFT.uvprojx index bdf0ac3..9bf78e8 100644 --- a/PjtKEIL_StepFini/StepDFT.uvprojx +++ b/PjtKEIL_StepFini/StepDFT.uvprojx @@ -357,7 +357,7 @@ - + .\Driver @@ -414,10 +414,25 @@ son - Signal.asm + bruitverre.asm 2 - .\Src\Signal.asm + .\Src\bruitverre.asm + + GestionSon.h + 5 + .\Src\GestionSon.h + + + GestionSon.s + 2 + .\Src\GestionSon.s + + + + + DFT + DFT.s 2 @@ -425,6 +440,21 @@ + + Affichage + + + Affichage_Valise.h + 5 + .\Src\Affichage_Valise.h + + + affichage_valise.o + 3 + .\Src\affichage_valise.o + + + ::CMSIS @@ -434,7 +464,7 @@ CibleSondeKEIL 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -781,7 +811,7 @@ - + .\Driver @@ -838,10 +868,25 @@ son - Signal.asm + bruitverre.asm 2 - .\Src\Signal.asm + .\Src\bruitverre.asm + + GestionSon.h + 5 + .\Src\GestionSon.h + + + GestionSon.s + 2 + .\Src\GestionSon.s + + + + + DFT + DFT.s 2 @@ -849,6 +894,21 @@ + + Affichage + + + Affichage_Valise.h + 5 + .\Src\Affichage_Valise.h + + + affichage_valise.o + 3 + .\Src\affichage_valise.o + + + ::CMSIS @@ -1331,10 +1391,25 @@ son - Signal.asm + bruitverre.asm 2 - .\Src\Signal.asm + .\Src\bruitverre.asm + + GestionSon.h + 5 + .\Src\GestionSon.h + + + GestionSon.s + 2 + .\Src\GestionSon.s + + + + + DFT + DFT.s 2 @@ -1342,6 +1417,21 @@ + + Affichage + + + Affichage_Valise.h + 5 + .\Src\Affichage_Valise.h + + + affichage_valise.o + 3 + .\Src\affichage_valise.o + + + ::CMSIS diff --git a/PjtKEIL_StepSon/StepSon.uvguix.criquet b/PjtKEIL_StepSon/StepSon.uvguix.criquet index dce2136..0d6887b 100644 --- a/PjtKEIL_StepSon/StepSon.uvguix.criquet +++ b/PjtKEIL_StepSon/StepSon.uvguix.criquet @@ -110,8 +110,8 @@ 0 - 723 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000600000000000000010000003A553A5C334D49435C42455F434854495C417373656D626C6575725C506A744B45494C5F53746570536F6E5C5372635C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000C5D4F200FFFFFFFF3D553A5C334D49435C42455F434854495C417373656D626C6575725C506A744B45494C5F53746570536F6E5C5372635C737461727475702D727664732E73000000000E737461727475702D727664732E7300000000FFDC7800FFFFFFFF3D553A5C334D49435C42455F434854495C417373656D626C6575725C506A744B45494C5F53746570536F6E5C5372635C627275697476657272652E61736D000000000E627275697476657272652E61736D00000000BECEA100FFFFFFFF3B553A5C334D49435C42455F434854495C417373656D626C6575725C506A744B45494C5F53746570536F6E5C5372635C47657374696F6E536F6E2E73000000000C47657374696F6E536F6E2E7300000000F0A0A100FFFFFFFF42553A5C334D49435C42455F434854495C417373656D626C6575725C506A744B45494C5F53746570536F6E5C4472697665725C4472697665724A65754C617365722E6800000000104472697665724A65754C617365722E6800000000BCA8E100FFFFFFFF3B553A5C334D49435C42455F434854495C417373656D626C6575725C506A744B45494C5F53746570536F6E5C5372635C47657374696F6E536F6E2E68000000000C47657374696F6E536F6E2E68000000009CC1B600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000004010000660000008007000011030000 + 630 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000500000000000000010000003A553A5C334D49435C42455F434854495C417373656D626C6575725C506A744B45494C5F53746570536F6E5C5372635C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000C5D4F200FFFFFFFF3D553A5C334D49435C42455F434854495C417373656D626C6575725C506A744B45494C5F53746570536F6E5C5372635C737461727475702D727664732E73000000000E737461727475702D727664732E7300000000FFDC7800FFFFFFFF3B553A5C334D49435C42455F434854495C417373656D626C6575725C506A744B45494C5F53746570536F6E5C5372635C47657374696F6E536F6E2E73000000000C47657374696F6E536F6E2E7300000000BECEA100FFFFFFFF42553A5C334D49435C42455F434854495C417373656D626C6575725C506A744B45494C5F53746570536F6E5C4472697665725C4472697665724A65754C617365722E6800000000104472697665724A65754C617365722E6800000000F0A0A100FFFFFFFF3B553A5C334D49435C42455F434854495C417373656D626C6575725C506A744B45494C5F53746570536F6E5C5372635C47657374696F6E536F6E2E68000000000C47657374696F6E536F6E2E6800000000BCA8E100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD50001000000000000000200000004010000660000008007000011030000 @@ -1805,8 +1805,8 @@ 59392 File - 2570 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000756617254696D65960000000000000002000756617254696D6509436F6D706F6E656E740000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 2591 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE80300000000000000000000000000000000000000000000000100000001000000960000000200205000000000084C655369676E616C96000000000000000400084C655369676E616C024C650756617254696D6509436F6D706F6E656E7400000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3606,9 +3606,9 @@ 0 .\Src\principal.c - 32 + 0 1 - 24 + 16 1 0 @@ -3616,26 +3616,17 @@ .\Src\startup-rvds.s 0 - 132 + 97 133 0 0 - - .\Src\bruitverre.asm - 4 - 1 - 13 - 1 - - 0 - .\Src\GestionSon.s - 1 - 41 - 78 + 24 + 45 + 65 1 0