From d2139e6cf4af13947d781820e13953c33ee0607a Mon Sep 17 00:00:00 2001 From: alejeune Date: Tue, 10 May 2022 16:34:16 +0200 Subject: [PATCH] =?UTF-8?q?Premiere=20version=20finale=20:=20ne=20contient?= =?UTF-8?q?=20que=20la=20mise=20=C3=A0=20jour=20du=20tableau=20des=20score?= =?UTF-8?q?s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- PjtKEIL_Integration/Obj/ExtDll.iex | 2 + PjtKEIL_Integration/Obj/StepDFT.axf | Bin 27072 -> 27156 bytes PjtKEIL_Integration/Obj/StepDFT.build_log.htm | 33 ++----- PjtKEIL_Integration/Obj/StepDFT.hex | 2 +- PjtKEIL_Integration/Obj/StepDFT.htm | 4 +- PjtKEIL_Integration/Obj/StepDFT.lnp | 7 +- PjtKEIL_Integration/Obj/StepDFT.map | 40 ++++---- .../Obj/StepDFT_CibleSondeKEIL.dep | 15 ++- PjtKEIL_Integration/Obj/bruitverre.o | Bin 12132 -> 12132 bytes PjtKEIL_Integration/Obj/dft.o | Bin 2756 -> 2764 bytes PjtKEIL_Integration/Obj/dft_1.o | Bin 2756 -> 2764 bytes PjtKEIL_Integration/Obj/gestionson.o | Bin 2820 -> 2832 bytes PjtKEIL_Integration/Obj/principal.crf | Bin 241504 -> 241544 bytes PjtKEIL_Integration/Obj/principal.d | 2 +- PjtKEIL_Integration/Obj/principal.o | Bin 260696 -> 260864 bytes PjtKEIL_Integration/Obj/signal.o | Bin 1164 -> 1164 bytes PjtKEIL_Integration/Obj/signal_1.o | Bin 1164 -> 1164 bytes PjtKEIL_Integration/Obj/startup-rvds.o | Bin 6000 -> 6012 bytes PjtKEIL_Integration/Obj/startup-rvds_1.o | Bin 6000 -> 6012 bytes PjtKEIL_Integration/Src/principal.c | 5 +- PjtKEIL_Integration/StepDFT.uvguix.alejeune | 16 ++-- PjtKEIL_Integration/StepDFT.uvoptx | 83 ++-------------- PjtKEIL_Integration/StepDFT.uvprojx | 90 ------------------ PjtKEIL_Integration/bruitverre.lst | 12 +-- PjtKEIL_Integration/dft.lst | 12 +-- PjtKEIL_Integration/gestionson.lst | 12 +-- PjtKEIL_Integration/signal.lst | 12 +-- PjtKEIL_Integration/startup-rvds.lst | 12 +-- 28 files changed, 101 insertions(+), 258 deletions(-) create mode 100644 PjtKEIL_Integration/Obj/ExtDll.iex 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 4907c759954014ab95336a2bcfef554c8a94641c..ea352e4a678c4583e94c5be1cbd4fc6a45346622 100644 GIT binary patch delta 1084 zcmah|Ur1A76hGg+-Z7oR*rrW4=jOnf0n z)kAgm5?B#E1ir~$jSMP?Acz!v*h5A_KK2m!Al12>)=Se5&i&5sch2{_=R2Hl>oY5C zv-?INvj|Ywu(YZ8=cB6Puxhq}UBzemT%)fqaM=|c9`(BeL+P{_pNomv6b6k07;J97 ze!w)lz`-?-=#v%`;TUN4fHD3Cr!g`n0Dp(md;;0QvNH($8b>GCAe`UjmXcZ00<~!w zD2ua#DLtP|i4{;|%1CiBnaxz7(iB-ZcI!c2M+`{yXLF`{g~g2)2jc<0077IubYalkQfxF&F!li> z7G&*sXerIII-hIG?J@V{9rJx+ZWnVH85yxF_4_dr=G)!N@Lr)$PSKey>pOd0e zfJPCwCe{u1i1{=*rQKog2{^?Z@{{kX>D7{6y8L!X^2I~1;w)9p?!ZUhk5%-RsO$J@ z%88}v_2RaFMav54idwmTGcH9t*lm0ewF%$a0i5`f=uRtsC3+KUB^z7CUdhHeM{q{! Y5JDpWdAuoE^}7oIYgFaQDo+G~KMrvtCjbBd delta 996 zcmaJ&p^};4i?}k)=@!E+3Y%P~ZhCWbIXCekDx)5H zi;gcr5P{F3?4^gOs7Oc<`a^#pu%4oa!Uw?@i_X29MLN20?)Uxvob!F(`M&wL_~Z@V zv`NYsfP2YNV-~+W6*HaY!D95%y^0z0@h+vaC+GfWBtbzbj-bg?j zn+(Um@*WVyO|)1LB@nL&mSxZ72msa*K!gPntCBnSm07N8LHtZVs}nn8O1 z@-BJN5>)SQ~qFOgr5+DvZMMeDr>XwiR8e@|+2)2L$j^W|NlGyWI(E1J3D zwDI8oE$Y}N|5taGzW1-@tsBd<1&6E{q}$_8VWWl~jn_#%wE!V1(MoA+T$UCX9cAQ{ oKJbhT-mA$Nqd~168|b=LFKl$veXUNCPjZLpBU`UU0q*G5-}A@<$N&HU 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]
  • entry9a.o(.ARM.Collect$$$$0000000B)
-

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]

  • >>   fTick

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 64976c4b159927c59598524f74446a64a1f2168f..2ee6d351b42fa60e9ecdc563ead1e81dcb6862f1 100644 GIT binary patch delta 40 wcmaD7_attEkFIb~h-*x|b7oRbYH)sDN~*W3r_baCx{8zQbOSeE)Sb)-08H!;xc~qF delta 37 tcmaD7_attEkFH>FQL=)rr(R4@h-*xIaAt1l~lvJk~zP|i8`-ZxG&_nh;cbH4kX_uhTtDRI!NUT*sKl==#;R5_6y%TK2Z zskvMxKUJv|H&#l;o$a9CSsV5MIBmck`)1(5_(%3W@NV*t`mHmo)KC4_U35B@bLo5` zwN5nI^5$xBKAl+z&b_{%>J{p*UZ?8102ED%CE?gG5S`bPH)8vd$8i{& zz(bO#sasndE}|5kYNXZT)*m9qp$Z33Go?_V-?Be;NLw_+0R2& zijmkT`6Ju7l_QdnR?y(hZ>imL$ox@s3Cc^9bOc&SEP|-qBOAy9?dY{VvbB8>c4B9>(U*9_5|A`Y@9qhAuBoBa~~brmOqbD|lxIOmTVpszW! UNqmMekM_td0u9=Nt0{f_0eA{NssI20 delta 816 zcmZ8fJ4*vW5T3nUE*BzsfFXhi7qHWag@uJkd<0Dq5HICHiWDL!2Ek4^3(-bUToEg) z6cKDBjfH}RWg06B3sc0(KjF;I?nNEAop0XX>|QVbn!oTw@1b}qL|@*Cz0`8WTUoDH zgC)NvOV-vDfCB(l2H=r&3gAiW7t#rUcWr-kpRF|^2Hm(_vvU4^(<@bHg3Wp*X!zT^ z2eRW7<%!d*g=RKpT8Q9*Oh*oxY-X@?z?h586TPWYDw9T@0HlJgI75Vdt?*{0K_ z(R$9%%X!$Cd(zdm>L%=lgko4a6B!yTVly!YqAb^9Yrc6)y$#rDjK9j$=gc*p#G^5cP?!T#Z2PSI7?eO;Zi8 z(k6%t=v1};BzeB+h=@WQ&i^`;#Tny_1#B>AnV8njVhTPZ-!Eba)!d0Fn1y@5A6yH@ Fe*o?JIc5L= diff --git a/PjtKEIL_Integration/Obj/dft_1.o b/PjtKEIL_Integration/Obj/dft_1.o index bc773a32f0fbc2a6fe55e8ed3f7c2ce0d7e9e948..db0bc8bce4266d61dfc60964246d8f3566fca8a4 100644 GIT binary patch delta 829 zcmYjPK`TU26#njeZG(cZ+U{m-E RVjk_4TLc=i1y@ss@drfBJyrk! delta 816 zcmZ8fJ4*vW5T3nUE*BzsfFXhi7qHWag@uJk)C5f-sF%(I3kwkxMX(djLJ&kyToEg) z6cN%$8Vdyr%QRLN7N&@mf5Mra-HSSKJKwy&*}YEwHGk=e&O`B3h_1XBd#U-Vx3E;N z1#|wgELmG)01g0H8GuL9DS#)fUq~ka-nISFezq2c=(Xeas+IE(Hoa19B3P?egAIRs z_fWQ+qC9ift)SBWatgw+XRr`t*&USKL_A}Wh0?I;ypwNG2T@yRl5IL& z8m;H_y_|=QxhGxie%*xKkWdUu`@E@9dI#4dF?-o+8$X9GoNRWaGQf9Z88QGoLh3+W z#n0@6T@b2wU{_c%AY5Pf@hdKaT&h#y571A-PdiiMzv8iR@=YNCY%6fuPmKS=PS5Mp6z5xFLn zScr{f{1bvH{0kQT0t*ETXJ&VEIB@f3-t0bRX78rI)?XV`vv=ud^?TPm@5_xB=Ciw* zrTlVXu2Lx;?U#yY<#0`vr+{_G zM}=MPfa&#tdYu$LZ_e81n2?;65tqJVT2S8Ep4B}#=yrRU8WrBN&jUO#!MA(qGb*v+tGqe|V*MXCP;B%}~I F7k`e}I~4!` delta 781 zcmZ8fJxc>Y5Pf@>c!}Y}5D0=I7qC!JD+`67MiVfF5>1p8fe5A%B1rI~5zoTXBH=8o z#6m={%nwkou+iSaA0QTDky@PD-P1D*JM-qv?9A@WHj}5xrX!|WsXOu2dO3(K<=vQEWAu4;hspY6YxkFr552xv0NZLPvU{LD!>m@ ztL6jj`bb@fEaMkRSIF-GUyc)5uwB&Tjq8$9qHa_AqEE0v2PrD9C_|;m`2oW55%*&6 z&(KI$m3I;6(?BT@;%e+a=$+~~h-r2Th|1&KjVs#YvfGmCmoa@(nyM={k3-IcB-I;{ yP9<)!K}>L*VRpkiSiJZiJA6)fd15kB+ zcbp)|SnoTrILG+0&QojrR`hs^0;J-My(i%LnNvfI`CZ$b=VX z(D&ZtbYbJ?14dQN=)&qkdM#jSM}I8b*PrN(CHlH|*2mz|%uVoxp`h_r&_E|>P+zLl z5A6U5;OS`T+#G^teQKC`nzM>tga?avKBRL3>NJa#}x&gyfT)_C>=C;?}k8BN}mD{5`zTs$T5v_#m(5y$s2eOkd0 z-tEVI@c@#f8{nps>uA!XK9tDn&B_W z)DLCoz|!tB&QylJE?O*T$~k$7COn>6kxJL~3)8f|_@?g5&cSJl@c-E;*ClgwU&SJ0 z^X_sOW!mer@|K07)#;j}9shAZq0eV&c!B>{CwYZlrp0PJdiE+EUH~*YBiE?=6SLFC zAN7roj4|_Z8@u$0F{7$>n~iPmGB~R6U9@rscf>7%V+u#m+9&nn3J*$M4s%pz$BcVT zky@$m88@m-xry6#>$tJrl>2y6zcOyzpUZyNCuO&(%f=tvVmPI6kZj!GGMp}?e7B9S z3iBC-Z&KdmdD;A2;X8ukY8#(-N=_K%w0onCx4Ax;RqVC6&c*1lVf`zgv9j@fsn03)i&JULDlW6QTqMh|D~j*1SRuF5YFYlRc!kA{25+G< zw+yZ-UTN`$-N+k>n+$HFA-R)lidRVwaRc(Bbk41Y>x#<-hdH7`T__4ITS&SDCIdQM zFZ`o;t;OvabUkoGai#U4Or2M338Bed=B!}s0N-WtHuE#L3I+pQX9c+qxz1P^fVshq qq6xVPzYwB50e;w;ckhIu0Ea9NA&0~Pa+~NAXSqKzY03iw>;45|vpRPG delta 1066 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 B;2!`0 diff --git a/PjtKEIL_Integration/Obj/signal.o b/PjtKEIL_Integration/Obj/signal.o index 24d4084e0fa2aabb5711cd1b2bdc2d3c7ff2d338..fb13b2f6080516505e513851fae9a1cb0c4bbaac 100644 GIT binary patch delta 40 wcmeC-?BU#y%_JNY;u;h0oSBr98l0b(lIrd1=`(phlj7vLOp%*^Fil|u02dk#KmY&$ delta 41 xcmeC-?BU#y%_JCHl&qlZsTUIz;u;eloS9oX`5=?x3sciEPrYVd7;ff5; delta 41 xcmeC-?BU#y&m4Z{Ec diff --git a/PjtKEIL_Integration/Obj/startup-rvds.o b/PjtKEIL_Integration/Obj/startup-rvds.o index a5973920de5cbaab181b9ed249d82a4a54ab73ce..80d98313e50299bb1ac689408206ab4b7f1e3a64 100644 GIT binary patch delta 1042 zcmY*YJ!lkB5dQYZ%dRGO=e?v7;Q~QL24=F&=gbG`pMSo1nSL3;fn@If&G zJ`z7EjsV}8{~-P${w0>=L|tcyr-?OULTnIQ#OsQwEWAUaL);gVL%GH&+Y!cPw`@Cm1CrY9>^fVU-f}JK2g-oEB}6f%^O|f9$nDEJ z`ldd!H5bUc5gXdT2_46>vj5E{wyn1Tkt}9w@k)V%Xezg*PEA^hSw-{cDBG%%B+AH} zQK#qI)13r;!?>qz$Sj%V`wY%M^C&yQTl>KyC5%0GBC}>ecW(JiRK}R4DMVrsus4&Z zNQE0rVtmSWyEPgHqk2)aDp2XxC-fJfj0LG2J7R48f_TnX^B~`KK<{cnx?d7q>icNF? delta 1035 zcmZvaJxE(o6vzMfy?neVG1@p3M0`R(2Mq`cf>O~Esh}W@9V!6_T?7qL6dZ)-Hpeeqb>A(>aK eo5cju!V>A)a!cgYJztmRPNY&gj>Y5}YWfcVP(>X8 diff --git a/PjtKEIL_Integration/Obj/startup-rvds_1.o b/PjtKEIL_Integration/Obj/startup-rvds_1.o index 9bb59bf01fd01598f57c597c8f6424292c46378b..689a0af5c904fbe44eee95467097d2978c35246c 100644 GIT binary patch delta 1042 zcmY*YJ!lkB5dQYZ%dRGOm)isj5iSr!G+ZGmq6Fa#3m&EjxpXcZ#9Sf77!m|Q;Zj;y z4h%@hfdwWhX-^@4j-urgm+h3KF%4XR~ z-i<}x;E4lxQ1hLRQ@Y)G>6J$7SCSiXW9H^UEvc@rH}5SjHy^BZKX|K73&=^Yn+Lus z2EZP1UvU69V*Z2phxnIRkP~%XM7%_-5MyGE*dX3fOl09B5-s8;@fqu6{M~hO?_C#e_hWGRbTq#ZCyklA^6mBeD@)B=ac#D9H5%)jjcVP+=)BXO%eS`t zY56K3kP(Wqp1HuZC0?gof0+|cOTddPgs8Fh)0ItpCc<8nD>B)x`mg|8kW-)A+hd!( z9+S-akjaRWgLXA)N%yHt7PRLUCxRk|3{4>ti-6s0 zS&Brs-XuoGO}Aa6p*N@(MJofPc6C&L0m_(@%DFRuu=;X?wmt&3%$e>G&Wf*HF_fXbwhN 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