diff --git a/PjtKEIL_Integration/Obj/ExtDll.iex b/PjtKEIL_Integration/Obj/ExtDll.iex new file mode 100644 index 0000000..6c0896e --- /dev/null +++ b/PjtKEIL_Integration/Obj/ExtDll.iex @@ -0,0 +1,2 @@ +[EXTDLL] +Count=0 diff --git a/PjtKEIL_Integration/Obj/StepDFT.axf b/PjtKEIL_Integration/Obj/StepDFT.axf index 4907c75..ea352e4 100644 Binary files a/PjtKEIL_Integration/Obj/StepDFT.axf and b/PjtKEIL_Integration/Obj/StepDFT.axf differ diff --git a/PjtKEIL_Integration/Obj/StepDFT.build_log.htm b/PjtKEIL_Integration/Obj/StepDFT.build_log.htm index e51d2a9..af28efd 100644 --- a/PjtKEIL_Integration/Obj/StepDFT.build_log.htm +++ b/PjtKEIL_Integration/Obj/StepDFT.build_log.htm @@ -17,42 +17,29 @@ Library Manager: ArmAr.exe V5.06 update 7 (build 960) Hex Converter: FromElf.exe V5.06 update 7 (build 960) CPU DLL: SARMCM3.DLL V5.34.0.0 Dialog DLL: DARMSTM.DLL V1.68.0.0 -Target DLL: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.8.0 +Target DLL: UL2CM3.DLL V1.163.9.0 Dialog DLL: TCM.DLL V1.48.0.0

Project:

-U:\Documents\3MIC\BE CHTI\ASM\Raphael_lacroix-Aurelia_lejeune-BE_CHTI\PjtKEIL_Integration\StepDFT.uvprojx -Project File Date: 05/08/2022 +U:\Documents\3MIC\S2\BE_CHTI\Assembleur\Raphael_lacroix-Aurelia_lejeune-BE_CHTI\PjtKEIL_Integration\StepDFT.uvprojx +Project File Date: 05/10/2022

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' -Rebuild target 'Simu' -Note: source file '.\Src\DFT.s' - object file renamed from '.\Obj\DFT.o' to '.\Obj\dft_1.o'. -Note: source file '.\Src\Signal.asm' - object file renamed from '.\Obj\Signal.o' to '.\Obj\signal_1.o'. +Rebuild target 'CibleSondeKEIL' Note: source file '.\Src\startup-rvds.s' - object file renamed from '.\Obj\startup-rvds.o' to '.\Obj\startup-rvds_1.o'. -Note: source file '.\Src\startup-rvds.s' - object file renamed from '.\Obj\startup-rvds.o' to '.\Obj\startup-rvds_1.o'. -Note: source file '.\Src\Signal.asm' - object file renamed from '.\Obj\Signal.o' to '.\Obj\signal_1.o'. -Note: source file '.\Src\DFT.s' - object file renamed from '.\Obj\DFT.o' to '.\Obj\dft_1.o'. assembling DFT.s... Src\DFT.s(106): warning: A1581W: Added 2 bytes of padding at address 0x52 -assembling Signal.asm... -assembling Signal.asm... -assembling DFT.s... -Src\DFT.s(106): warning: A1581W: Added 2 bytes of padding at address 0x52 -assembling startup-rvds.s... -assembling startup-rvds.s... +assembling bruitverre.asm... assembling GestionSon.s... Src\GestionSon.s(17): warning: A1581W: Added 2 bytes of padding at address 0x2 -assembling bruitverre.asm... +assembling Signal.asm... +assembling startup-rvds.s... compiling principal.c... linking... -.\Obj\StepDFT.axf: Warning: L6304W: Duplicate input file .\obj\startup-rvds_1.o ignored. -.\Obj\StepDFT.axf: Warning: L6304W: Duplicate input file .\obj\signal_1.o ignored. -.\Obj\StepDFT.axf: Warning: L6304W: Duplicate input file .\obj\dft_1.o ignored. Program Size: Code=2844 RO-data=524 RW-data=188 ZI-data=1508 -Finished: 0 information, 3 warning and 0 error messages. FromELF: creating hex file... -".\Obj\StepDFT.axf" - 0 Error(s), 6 Warning(s). +".\Obj\StepDFT.axf" - 0 Error(s), 2 Warning(s).

Software Packages used:

@@ -68,14 +55,14 @@ Package Vendor: Keil STMicroelectronics STM32F1 Series Device Support, Drivers and Examples

Collection of Component include folders:

- .\RTE\_Simu + .\RTE\_CibleSondeKEIL C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

Collection of Component Files used:

* Component: ARM::CMSIS:CORE:5.4.0 -Build Time Elapsed: 00:00:01 +Build Time Elapsed: 00:00:02 diff --git a/PjtKEIL_Integration/Obj/StepDFT.hex b/PjtKEIL_Integration/Obj/StepDFT.hex index 77b7cba..f59b080 100644 --- a/PjtKEIL_Integration/Obj/StepDFT.hex +++ b/PjtKEIL_Integration/Obj/StepDFT.hex @@ -175,7 +175,7 @@ :100AD0000C4901EB0411486064200A4901EB041140 :100AE000886008E0074800EB04108068401E054954 :100AF00001EB04118860641C042CCDDB10BD0000E8 -:100B000000000240BC0000201C020020E1C20300E3 +:100B000000000240BC0000201C020020A3480B0093 :100B1000002014E000211F4A02EB001251601D4A20 :100B200002EB001291601B4A02EB0012D1601A49DD :100B300051F82010174A02EB00121160401C0628E1 diff --git a/PjtKEIL_Integration/Obj/StepDFT.htm b/PjtKEIL_Integration/Obj/StepDFT.htm index b7db58b..24eb269 100644 --- a/PjtKEIL_Integration/Obj/StepDFT.htm +++ b/PjtKEIL_Integration/Obj/StepDFT.htm @@ -3,7 +3,7 @@ Static Call Graph - [.\Obj\StepDFT.axf]

Static Call Graph for image .\Obj\StepDFT.axf

-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Sun May 08 21:32:30 2022 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Tue May 10 16:29:54 2022

Maximum Stack Usage = 56 bytes + Unknown(Cycles, Untraceable Function Pointers)

Call chain for Maximum Stack Depth:

@@ -433,7 +433,7 @@ Global Symbols
[Address Reference Count : 1] -

DFT_ModuleAuCarre (Thumb, 82 bytes, Stack size 0 bytes, dft_1.o(moncode)) +

DFT_ModuleAuCarre (Thumb, 82 bytes, Stack size 0 bytes, dft.o(moncode))

[Called By]

diff --git a/PjtKEIL_Integration/Obj/StepDFT.lnp b/PjtKEIL_Integration/Obj/StepDFT.lnp index c95d406..2567a35 100644 --- a/PjtKEIL_Integration/Obj/StepDFT.lnp +++ b/PjtKEIL_Integration/Obj/StepDFT.lnp @@ -1,14 +1,11 @@ --cpu Cortex-M3 ".\obj\principal.o" ".\obj\bruitverre.o" -".\obj\dft_1.o" +".\obj\dft.o" ".\obj\gestionson.o" -".\obj\signal_1.o" -".\obj\startup-rvds_1.o" +".\obj\signal.o" ".\obj\startup-rvds_1.o" ".\Driver\DriverJeuLaser.lib" -".\obj\signal_1.o" -".\obj\dft_1.o" --library_type=microlib --strict --scatter ".\Obj\StepDFT.sct" --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols --info sizes --info totals --info unused --info veneers diff --git a/PjtKEIL_Integration/Obj/StepDFT.map b/PjtKEIL_Integration/Obj/StepDFT.map index 7bca1f5..900add9 100644 --- a/PjtKEIL_Integration/Obj/StepDFT.map +++ b/PjtKEIL_Integration/Obj/StepDFT.map @@ -6,7 +6,7 @@ Section Cross References principal.o(i.fTick) refers to adc_dma.o(i.Start_DMA1) for Start_DMA1 principal.o(i.fTick) refers to adc_dma.o(i.Wait_On_End_Of_DMA1) for Wait_On_End_Of_DMA1 - principal.o(i.fTick) refers to dft_1.o(moncode) for DFT_ModuleAuCarre + principal.o(i.fTick) refers to dft.o(moncode) for DFT_ModuleAuCarre principal.o(i.fTick) refers to principal.o(.bss) for tabJoueur principal.o(i.main) refers to clock.o(i.CLOCK_Configure) for CLOCK_Configure principal.o(i.main) refers to timer_systick.o(i.Systick_Period_ff) for Systick_Period_ff @@ -18,7 +18,7 @@ Section Cross References principal.o(i.main) refers to principal.o(.bss) for tabJoueur principal.o(i.main) refers to principal.o(.data) for valK principal.o(i.main) refers to principal.o(i.fTick) for fTick - dft_1.o(moncode) refers to dft_1.o(Trigo) for TabCos + dft.o(moncode) refers to dft.o(Trigo) for TabCos gestionson.o(mesdata) refers (Special) to gpio.o(i.GPIOA_Clear) for GPIOA_Clear gestionson.o(mesdata) refers (Special) to gpio.o(i.GPIOA_Set) for GPIOA_Set gestionson.o(mesdata) refers (Special) to gpio.o(i.GPIOB_Clear) for GPIOB_Clear @@ -154,12 +154,12 @@ Removing Unused input sections from the image. Removing principal.o(.revsh_text), (4 bytes). Removing principal.o(.rrx_text), (6 bytes). Removing bruitverre.o(SecSon), (11032 bytes). - Removing dft_1.o(mesdata), (0 bytes). - Removing dft_1.o(maram), (0 bytes). + Removing dft.o(mesdata), (0 bytes). + Removing dft.o(maram), (0 bytes). Removing gestionson.o(mesdata), (0 bytes). Removing gestionson.o(maram), (8 bytes). Removing gestionson.o(moncode), (96 bytes). - Removing signal_1.o(Signal), (128 bytes). + Removing signal.o(Signal), (128 bytes). Removing startup-rvds_1.o(HEAP), (512 bytes). Removing adc_dma.o(.rev16_text), (4 bytes). Removing adc_dma.o(.revsh_text), (4 bytes). @@ -270,9 +270,9 @@ Image Symbol Table Lib\\Timer_Systick.c 0x00000000 Number 0 timer_systick.o ABSOLUTE Lib\\clock.c 0x00000000 Number 0 clock.o ABSOLUTE Lib\clock.c 0x00000000 Number 0 clock.o ABSOLUTE - Src\DFT.s 0x00000000 Number 0 dft_1.o ABSOLUTE + Src\DFT.s 0x00000000 Number 0 dft.o ABSOLUTE Src\GestionSon.s 0x00000000 Number 0 gestionson.o ABSOLUTE - Src\Signal.asm 0x00000000 Number 0 signal_1.o ABSOLUTE + Src\Signal.asm 0x00000000 Number 0 signal.o ABSOLUTE Src\\principal.c 0x00000000 Number 0 principal.o ABSOLUTE Src\bruitverre.asm 0x00000000 Number 0 bruitverre.o ABSOLUTE Src\principal.c 0x00000000 Number 0 principal.o ABSOLUTE @@ -321,10 +321,10 @@ Image Symbol Table i.__scatterload_zeroinit 0x08000a6c Section 14 handlers.o(i.__scatterload_zeroinit) i.fTick 0x08000a7c Section 0 principal.o(i.fTick) i.main 0x08000b10 Section 0 principal.o(i.main) - moncode 0x08000bac Section 92 dft_1.o(moncode) - Trigo 0x08000c28 Section 256 dft_1.o(Trigo) - TabCos 0x08000c28 Data 0 dft_1.o(Trigo) - TabSin 0x08000ca8 Data 0 dft_1.o(Trigo) + moncode 0x08000bac Section 92 dft.o(moncode) + Trigo 0x08000c28 Section 256 dft.o(Trigo) + TabCos 0x08000c28 Data 0 dft.o(Trigo) + TabSin 0x08000ca8 Data 0 dft.o(Trigo) .data 0x20000000 Section 24 principal.o(.data) .data 0x20000018 Section 160 timer_1234.o(.data) Ptr_TIM1 0x20000028 Data 4 timer_1234.o(.data) @@ -460,7 +460,7 @@ Image Symbol Table __scatterload_zeroinit 0x08000a6d Thumb Code 14 handlers.o(i.__scatterload_zeroinit) fTick 0x08000a7d Thumb Code 130 principal.o(i.fTick) main 0x08000b11 Thumb Code 132 principal.o(i.main) - DFT_ModuleAuCarre 0x08000bad Thumb Code 82 dft_1.o(moncode) + DFT_ModuleAuCarre 0x08000bad Thumb Code 82 dft.o(moncode) Region$$Table$$Base 0x08000c08 Number 0 anon$$obj.o(Region$$Table) Region$$Table$$Limit 0x08000c28 Number 0 anon$$obj.o(Region$$Table) valK 0x20000000 Data 24 principal.o(.data) @@ -540,9 +540,9 @@ Memory Map of the image 0x08000a7a 0x08000a7a 0x00000002 PAD 0x08000a7c 0x08000a7c 0x00000094 Code RO 4 i.fTick principal.o 0x08000b10 0x08000b10 0x0000009c Code RO 5 i.main principal.o - 0x08000bac 0x08000bac 0x0000005c Code RO 77 moncode dft_1.o + 0x08000bac 0x08000bac 0x0000005c Code RO 77 moncode dft.o 0x08000c08 0x08000c08 0x00000020 Data RO 277 Region$$Table anon$$obj.o - 0x08000c28 0x08000c28 0x00000100 Data RO 78 Trigo dft_1.o + 0x08000c28 0x08000c28 0x00000100 Data RO 78 Trigo dft.o Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08000d28, Size: 0x000006a0, Max: 0x00005000, ABSOLUTE) @@ -564,12 +564,12 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 92 10 256 0 0 380 dft_1.o - 304 42 0 24 480 3475 principal.o - 76 20 236 0 1024 844 startup-rvds_1.o + 92 10 256 0 0 388 dft.o + 304 42 0 24 480 3535 principal.o + 76 20 236 0 1024 856 startup-rvds_1.o ---------------------------------------------------------------------- - 472 72 524 24 1508 4699 Object Totals + 472 72 524 24 1508 4779 Object Totals 0 0 32 0 0 0 (incl. Generated) 0 0 0 0 4 0 (incl. Padding) @@ -614,8 +614,8 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 2844 304 524 188 1508 5459 Grand Totals - 2844 304 524 188 1508 5459 ELF Image Totals + 2844 304 524 188 1508 5539 Grand Totals + 2844 304 524 188 1508 5539 ELF Image Totals 2844 304 524 188 0 0 ROM Totals ============================================================================== diff --git a/PjtKEIL_Integration/Obj/StepDFT_CibleSondeKEIL.dep b/PjtKEIL_Integration/Obj/StepDFT_CibleSondeKEIL.dep index 72cdf5e..53d894d 100644 --- a/PjtKEIL_Integration/Obj/StepDFT_CibleSondeKEIL.dep +++ b/PjtKEIL_Integration/Obj/StepDFT_CibleSondeKEIL.dep @@ -1,6 +1,6 @@ Dependencies for Project 'StepDFT', Target 'CibleSondeKEIL': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC -F (.\Src\principal.c)(0x6262710C)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Driver --C99 -I.\RTE\_CibleSondeKEIL -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -DSTM32F103xB -DUSE_FULL_LL_DRIVER -o .\obj\principal.o --omf_browse .\obj\principal.crf --depend .\obj\principal.d) +F (.\Src\principal.c)(0x627A76E2)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Driver --C99 -I.\RTE\_CibleSondeKEIL -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -DSTM32F103xB -DUSE_FULL_LL_DRIVER -o .\obj\principal.o --omf_browse .\obj\principal.crf --depend .\obj\principal.d) I (.\Driver\DriverJeuLaser.h)(0x6037C015) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC) I (.\RTE\_CibleSondeKEIL\RTE_Components.h)(0x62626DA0) @@ -10,7 +10,14 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_versio I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582) I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC) -F (.\Src\startup-rvds.s)(0x5FE38AC6)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\_CibleSondeKEIL -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list startup-rvds.lst --xref -o .\obj\startup-rvds.o --depend .\obj\startup-rvds.d) -F (.\Driver\DriverJeuLaser.lib)(0x6037BEDF)() -F (.\Src\Signal.asm)(0x62625D0F)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\_CibleSondeKEIL -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list signal.lst --xref -o .\obj\signal.o --depend .\obj\signal.d) +I (Src\GestionSon.h)(0x627A6C1D) +I (.\Driver\Affichage_Valise.h)(0x627A6C1C) +F (.\Src\bruitverre.asm)(0x623CCB64)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\_CibleSondeKEIL -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list bruitverre.lst --xref -o .\obj\bruitverre.o --depend .\obj\bruitverre.d) F (.\Src\DFT.s)(0x62626560)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\_CibleSondeKEIL -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list dft.lst --xref -o .\obj\dft.o --depend .\obj\dft.d) +F (.\Src\GestionSon.h)(0x627A6C1D)() +F (.\Src\GestionSon.s)(0x6244612F)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\_CibleSondeKEIL -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list gestionson.lst --xref -o .\obj\gestionson.o --depend .\obj\gestionson.d) +I (.\Driver\DriverJeuLaser.inc)(0x6037BEDF) +F (.\Src\Signal.asm)(0x62625D0F)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\_CibleSondeKEIL -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list signal.lst --xref -o .\obj\signal.o --depend .\obj\signal.d) +F (.\Src\startup-rvds.s)(0x5FE38AC6)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\_CibleSondeKEIL -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 534" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list startup-rvds.lst --xref -o .\obj\startup-rvds_1.o --depend .\obj\startup-rvds_1.d) +F (.\Driver\DriverJeuLaser.lib)(0x6037BEDF)() +F (.\Driver\DriverJeuLaser.inc)(0x6037BEDF)() diff --git a/PjtKEIL_Integration/Obj/bruitverre.o b/PjtKEIL_Integration/Obj/bruitverre.o index 64976c4..2ee6d35 100644 Binary files a/PjtKEIL_Integration/Obj/bruitverre.o and b/PjtKEIL_Integration/Obj/bruitverre.o differ diff --git a/PjtKEIL_Integration/Obj/dft.o b/PjtKEIL_Integration/Obj/dft.o index a07bd7e..ad4a376 100644 Binary files a/PjtKEIL_Integration/Obj/dft.o and b/PjtKEIL_Integration/Obj/dft.o differ diff --git a/PjtKEIL_Integration/Obj/dft_1.o b/PjtKEIL_Integration/Obj/dft_1.o index bc773a3..db0bc8b 100644 Binary files a/PjtKEIL_Integration/Obj/dft_1.o and b/PjtKEIL_Integration/Obj/dft_1.o differ diff --git a/PjtKEIL_Integration/Obj/gestionson.o b/PjtKEIL_Integration/Obj/gestionson.o index 096225c..b0d6b5e 100644 Binary files a/PjtKEIL_Integration/Obj/gestionson.o and b/PjtKEIL_Integration/Obj/gestionson.o differ diff --git a/PjtKEIL_Integration/Obj/principal.crf b/PjtKEIL_Integration/Obj/principal.crf index 96c3e6a..19a1253 100644 Binary files a/PjtKEIL_Integration/Obj/principal.crf and b/PjtKEIL_Integration/Obj/principal.crf differ diff --git a/PjtKEIL_Integration/Obj/principal.d b/PjtKEIL_Integration/Obj/principal.d index cafd64a..0644d02 100644 --- a/PjtKEIL_Integration/Obj/principal.d +++ b/PjtKEIL_Integration/Obj/principal.d @@ -1,7 +1,7 @@ .\obj\principal.o: Src\principal.c .\obj\principal.o: .\Driver\DriverJeuLaser.h .\obj\principal.o: C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h -.\obj\principal.o: .\RTE\_Simu\RTE_Components.h +.\obj\principal.o: .\RTE\_CibleSondeKEIL\RTE_Components.h .\obj\principal.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h .\obj\principal.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h .\obj\principal.o: C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h diff --git a/PjtKEIL_Integration/Obj/principal.o b/PjtKEIL_Integration/Obj/principal.o index e60e16d..f9f4723 100644 Binary files a/PjtKEIL_Integration/Obj/principal.o and b/PjtKEIL_Integration/Obj/principal.o differ diff --git a/PjtKEIL_Integration/Obj/signal.o b/PjtKEIL_Integration/Obj/signal.o index 24d4084..fb13b2f 100644 Binary files a/PjtKEIL_Integration/Obj/signal.o and b/PjtKEIL_Integration/Obj/signal.o differ diff --git a/PjtKEIL_Integration/Obj/signal_1.o b/PjtKEIL_Integration/Obj/signal_1.o index 6cbcdca..469a674 100644 Binary files a/PjtKEIL_Integration/Obj/signal_1.o and b/PjtKEIL_Integration/Obj/signal_1.o differ diff --git a/PjtKEIL_Integration/Obj/startup-rvds.o b/PjtKEIL_Integration/Obj/startup-rvds.o index a597392..80d9831 100644 Binary files a/PjtKEIL_Integration/Obj/startup-rvds.o and b/PjtKEIL_Integration/Obj/startup-rvds.o differ diff --git a/PjtKEIL_Integration/Obj/startup-rvds_1.o b/PjtKEIL_Integration/Obj/startup-rvds_1.o index 9bb59bf..689a0af 100644 Binary files a/PjtKEIL_Integration/Obj/startup-rvds_1.o and b/PjtKEIL_Integration/Obj/startup-rvds_1.o differ diff --git a/PjtKEIL_Integration/Src/principal.c b/PjtKEIL_Integration/Src/principal.c index 0328c68..d9c7229 100644 --- a/PjtKEIL_Integration/Src/principal.c +++ b/PjtKEIL_Integration/Src/principal.c @@ -7,6 +7,9 @@ #define BASE_TIMEOUT 100 #define NB_JOUEUR 4 +#define SEUIL 0x3c2e1*3 +/* on augmente le seuil pour eviter que le score des autres joueurs augmente lorsqu'un joueur touche la cible. +Après test, cette valeur permet de n'avoir aucun faux positifs et aucun faux negatifs */ extern int DFT_ModuleAuCarre(short int * LeSignal, int k); @@ -47,7 +50,7 @@ void fTick(){ tabJoueur[k].dft = DFT_ModuleAuCarre((short *) &dma_buf[0], tabJoueur[k].k); // si la DFT est au dessus d'un certain seuil on augmente le score et on lance le timeout - if (tabJoueur[k].dft >= 0x3c2e1){ + if (tabJoueur[k].dft >= SEUIL){ tabJoueur[k].score ++; tabJoueur[k].timeout = BASE_TIMEOUT; diff --git a/PjtKEIL_Integration/StepDFT.uvguix.alejeune b/PjtKEIL_Integration/StepDFT.uvguix.alejeune index d8f89bb..afdd0c5 100644 --- a/PjtKEIL_Integration/StepDFT.uvguix.alejeune +++ b/PjtKEIL_Integration/StepDFT.uvguix.alejeune @@ -1821,8 +1821,8 @@ 59399 Build - 1004 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000453696D75960000000000000003000453696D750E4369626C65536F6E64654B45494C0C4369626C65536F6E646553540000000000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 1014 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000E4369626C65536F6E64654B45494C960000000000000003000453696D750E4369626C65536F6E64654B45494C0C4369626C65536F6E646553540000000000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3547,7 +3547,7 @@ File 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3563,7 +3563,7 @@ Build 955 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3624,9 +3624,9 @@ .\Src\principal.c - 2 - 32 - 53 + 23 + 1 + 10 1 0 diff --git a/PjtKEIL_Integration/StepDFT.uvoptx b/PjtKEIL_Integration/StepDFT.uvoptx index 90d89d2..051bed4 100644 --- a/PjtKEIL_Integration/StepDFT.uvoptx +++ b/PjtKEIL_Integration/StepDFT.uvoptx @@ -75,7 +75,7 @@ 1 0 - 1 + 0 18 @@ -302,7 +302,7 @@ 1 0 - 0 + 1 18 @@ -392,6 +392,11 @@ 1 dma_buf + + 2 + 1 + tabJoueur + @@ -731,18 +736,6 @@ 0 0 - - 1 - 7 - 2 - 0 - 0 - 0 - .\Src\startup-rvds.s - startup-rvds.s - 0 - 0 - @@ -753,7 +746,7 @@ 0 2 - 8 + 7 2 0 0 @@ -773,7 +766,7 @@ 0 3 - 9 + 8 4 0 0 @@ -785,31 +778,7 @@ 3 - 10 - 5 - 0 - 0 - 0 - .\Driver\Affichage_Valise.h - Affichage_Valise.h - 0 - 0 - - - 3 - 11 - 5 - 0 - 0 - 0 - .\Driver\DriverJeuLaser.h - DriverJeuLaser.h - 0 - 0 - - - 3 - 12 + 9 5 0 0 @@ -821,38 +790,6 @@ - - New Group - 1 - 0 - 0 - 0 - - 4 - 13 - 2 - 0 - 0 - 0 - .\Src\Signal.asm - Signal.asm - 0 - 0 - - - 4 - 14 - 2 - 0 - 0 - 0 - .\Src\DFT.s - DFT.s - 0 - 0 - - - ::CMSIS 0 diff --git a/PjtKEIL_Integration/StepDFT.uvprojx b/PjtKEIL_Integration/StepDFT.uvprojx index d1615d5..a9b86bb 100644 --- a/PjtKEIL_Integration/StepDFT.uvprojx +++ b/PjtKEIL_Integration/StepDFT.uvprojx @@ -413,11 +413,6 @@ 2 .\Src\Signal.asm - - startup-rvds.s - 2 - .\Src\startup-rvds.s - @@ -438,16 +433,6 @@ 4 .\Driver\DriverJeuLaser.lib - - Affichage_Valise.h - 5 - .\Driver\Affichage_Valise.h - - - DriverJeuLaser.h - 5 - .\Driver\DriverJeuLaser.h - DriverJeuLaser.inc 5 @@ -455,21 +440,6 @@ - - New Group - - - Signal.asm - 2 - .\Src\Signal.asm - - - DFT.s - 2 - .\Src\DFT.s - - - ::CMSIS @@ -882,11 +852,6 @@ 2 .\Src\Signal.asm - - startup-rvds.s - 2 - .\Src\startup-rvds.s - @@ -907,16 +872,6 @@ 4 .\Driver\DriverJeuLaser.lib - - Affichage_Valise.h - 5 - .\Driver\Affichage_Valise.h - - - DriverJeuLaser.h - 5 - .\Driver\DriverJeuLaser.h - DriverJeuLaser.inc 5 @@ -924,21 +879,6 @@ - - New Group - - - Signal.asm - 2 - .\Src\Signal.asm - - - DFT.s - 2 - .\Src\DFT.s - - - ::CMSIS @@ -1420,11 +1360,6 @@ 2 .\Src\Signal.asm - - startup-rvds.s - 2 - .\Src\startup-rvds.s - @@ -1445,16 +1380,6 @@ 4 .\Driver\DriverJeuLaser.lib - - Affichage_Valise.h - 5 - .\Driver\Affichage_Valise.h - - - DriverJeuLaser.h - 5 - .\Driver\DriverJeuLaser.h - DriverJeuLaser.inc 5 @@ -1462,21 +1387,6 @@ - - New Group - - - Signal.asm - 2 - .\Src\Signal.asm - - - DFT.s - 2 - .\Src\DFT.s - - - ::CMSIS diff --git a/PjtKEIL_Integration/bruitverre.lst b/PjtKEIL_Integration/bruitverre.lst index e685ed1..d9e9558 100644 --- a/PjtKEIL_Integration/bruitverre.lst +++ b/PjtKEIL_Integration/bruitverre.lst @@ -6093,12 +6093,12 @@ ARM Macro Assembler Page 94 5525 00002B16 06 F7 DCW -2298 5526 00002B18 END Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw -ork --depend=.\obj\bruitverre.d -o.\obj\bruitverre.o -I.\Src -I.\RTE\_Simu -IC: -\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata -\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SET -A 1" --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 534" - --predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ -SETA 1" --list=bruitverre.lst Src\bruitverre.asm +ork --depend=.\obj\bruitverre.d -o.\obj\bruitverre.o -I.\RTE\_CibleSondeKEIL -I +C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programda +ta\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL S +ETA 1" --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 534" + --predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE +_ SETA 1" --list=bruitverre.lst Src\bruitverre.asm diff --git a/PjtKEIL_Integration/dft.lst b/PjtKEIL_Integration/dft.lst index 2b5026e..0256528 100644 --- a/PjtKEIL_Integration/dft.lst +++ b/PjtKEIL_Integration/dft.lst @@ -418,12 +418,12 @@ ARM Macro Assembler Page 7 242 00000100 243 00000100 END Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw -ork --depend=.\obj\dft_1.d -o.\obj\dft_1.o -I.\Src -I.\RTE\_Simu -IC:\Programda -ta\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\ -Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SETA 1" --pre -define="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 534" --predefine -="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1" -- -list=dft.lst Src\DFT.s +ork --depend=.\obj\dft.d -o.\obj\dft.o -I.\RTE\_CibleSondeKEIL -IC:\Programdata +\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\Arm\Pa +cks\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SETA 1" --prede +fine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 534" --predefine=" +_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1" --li +st=dft.lst Src\DFT.s diff --git a/PjtKEIL_Integration/gestionson.lst b/PjtKEIL_Integration/gestionson.lst index a43cea1..b2b3a50 100644 --- a/PjtKEIL_Integration/gestionson.lst +++ b/PjtKEIL_Integration/gestionson.lst @@ -199,12 +199,12 @@ Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw ARM Macro Assembler Page 4 -ork --depend=.\obj\gestionson.d -o.\obj\gestionson.o -I.\Src -I.\RTE\_Simu -IC: -\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata -\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SET -A 1" --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 534" - --predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ -SETA 1" --list=gestionson.lst Src\GestionSon.s +ork --depend=.\obj\gestionson.d -o.\obj\gestionson.o -I.\RTE\_CibleSondeKEIL -I +C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programda +ta\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL S +ETA 1" --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 534" + --predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE +_ SETA 1" --list=gestionson.lst Src\GestionSon.s diff --git a/PjtKEIL_Integration/signal.lst b/PjtKEIL_Integration/signal.lst index f9601a5..b4e084d 100644 --- a/PjtKEIL_Integration/signal.lst +++ b/PjtKEIL_Integration/signal.lst @@ -79,12 +79,12 @@ ARM Macro Assembler Page 2 67 0000007E BA 0F DCW 0x0fba ; 63 4026 0.98291 68 00000080 END Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw -ork --depend=.\obj\signal_1.d -o.\obj\signal_1.o -I.\Src -I.\RTE\_Simu -IC:\Pro -gramdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Kei -l\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SETA 1" - --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 534" --pre -define="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA - 1" --list=signal.lst Src\Signal.asm +ork --depend=.\obj\signal.d -o.\obj\signal.o -I.\RTE\_CibleSondeKEIL -IC:\Progr +amdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Programdata\Keil\ +Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SETA 1" - +-predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 534" --prede +fine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1 +" --list=signal.lst Src\Signal.asm diff --git a/PjtKEIL_Integration/startup-rvds.lst b/PjtKEIL_Integration/startup-rvds.lst index d5b8b48..8f6cadc 100644 --- a/PjtKEIL_Integration/startup-rvds.lst +++ b/PjtKEIL_Integration/startup-rvds.lst @@ -511,12 +511,12 @@ ARM Macro Assembler Page 8 05FA0300 00000000 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw -ork --depend=.\obj\startup-rvds_1.d -o.\obj\startup-rvds_1.o -I.\Src -I.\RTE\_S -imu -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Pro -gramdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__ -EVAL SETA 1" --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SET -A 534" --predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine -="_RTE_ SETA 1" --list=startup-rvds.lst Src\startup-rvds.s +ork --depend=.\obj\startup-rvds_1.d -o.\obj\startup-rvds_1.o -I.\RTE\_CibleSond +eKEIL -IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\P +rogramdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine=" +__EVAL SETA 1" --predefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION S +ETA 534" --predefine="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefi +ne="_RTE_ SETA 1" --list=startup-rvds.lst Src\startup-rvds.s