Premiere version finale : ne contient que la mise à jour du tableau des scores

This commit is contained in:
alejeune 2022-05-10 16:34:16 +02:00
parent d822f3b7fd
commit d2139e6cf4
28 changed files with 101 additions and 258 deletions

View file

@ -0,0 +1,2 @@
[EXTDLL]
Count=0

Binary file not shown.

View file

@ -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
<h2>Project:</h2>
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
<h2>Output:</h2>
*** 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).
<h2>Software Packages used:</h2>
@ -68,14 +55,14 @@ Package Vendor: Keil
STMicroelectronics STM32F1 Series Device Support, Drivers and Examples
<h2>Collection of Component include folders:</h2>
.\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
<h2>Collection of Component Files used:</h2>
* Component: ARM::CMSIS:CORE:5.4.0
Build Time Elapsed: 00:00:01
Build Time Elapsed: 00:00:02
</pre>
</body>
</html>

View file

@ -175,7 +175,7 @@
:100AD0000C4901EB0411486064200A4901EB041140
:100AE000886008E0074800EB04108068401E054954
:100AF00001EB04118860641C042CCDDB10BD0000E8
:100B000000000240BC0000201C020020E1C20300E3
:100B000000000240BC0000201C020020A3480B0093
:100B1000002014E000211F4A02EB001251601D4A20
:100B200002EB001291601B4A02EB0012D1601A49DD
:100B300051F82010174A02EB00121160401C0628E1

View file

@ -3,7 +3,7 @@
<title>Static Call Graph - [.\Obj\StepDFT.axf]</title></head>
<body><HR>
<H1>Static Call Graph for image .\Obj\StepDFT.axf</H1><HR>
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060960: Last Updated: Sun May 08 21:32:30 2022
<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060960: Last Updated: Tue May 10 16:29:54 2022
<BR><P>
<H3>Maximum Stack Usage = 56 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
Call chain for Maximum Stack Depth:</H3>
@ -433,7 +433,7 @@ Global Symbols
</UL>
<BR>[Address Reference Count : 1]<UL><LI> entry9a.o(.ARM.Collect$$$$0000000B)
</UL>
<P><STRONG><a name="[47]"></a>DFT_ModuleAuCarre</STRONG> (Thumb, 82 bytes, Stack size 0 bytes, dft_1.o(moncode))
<P><STRONG><a name="[47]"></a>DFT_ModuleAuCarre</STRONG> (Thumb, 82 bytes, Stack size 0 bytes, dft.o(moncode))
<BR><BR>[Called By]<UL><LI><a href="#[38]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;fTick
</UL>
<P>

View file

@ -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

View file

@ -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
==============================================================================

View file

@ -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)()

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -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

Binary file not shown.

Binary file not shown.

Binary file not shown.

View file

@ -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;

File diff suppressed because one or more lines are too long

View file

@ -75,7 +75,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -302,7 +302,7 @@
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
<IsCurrentTarget>1</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
@ -392,6 +392,11 @@
<WinNumber>1</WinNumber>
<ItemText>dma_buf</ItemText>
</Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
<ItemText>tabJoueur</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1>
<Mm>
@ -731,18 +736,6 @@
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>1</GroupNumber>
<FileNumber>7</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Src\startup-rvds.s</PathWithFileName>
<FilenameWithoutPath>startup-rvds.s</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>
@ -753,7 +746,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>2</GroupNumber>
<FileNumber>8</FileNumber>
<FileNumber>7</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -773,7 +766,7 @@
<RteFlg>0</RteFlg>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>9</FileNumber>
<FileNumber>8</FileNumber>
<FileType>4</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -785,31 +778,7 @@
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>10</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Driver\Affichage_Valise.h</PathWithFileName>
<FilenameWithoutPath>Affichage_Valise.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>11</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Driver\DriverJeuLaser.h</PathWithFileName>
<FilenameWithoutPath>DriverJeuLaser.h</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>12</FileNumber>
<FileNumber>9</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
@ -821,38 +790,6 @@
</File>
</Group>
<Group>
<GroupName>New Group</GroupName>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>13</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Src\Signal.asm</PathWithFileName>
<FilenameWithoutPath>Signal.asm</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>4</GroupNumber>
<FileNumber>14</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Src\DFT.s</PathWithFileName>
<FilenameWithoutPath>DFT.s</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>
<GroupName>::CMSIS</GroupName>
<tvExp>0</tvExp>

View file

@ -413,11 +413,6 @@
<FileType>2</FileType>
<FilePath>.\Src\Signal.asm</FilePath>
</File>
<File>
<FileName>startup-rvds.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\startup-rvds.s</FilePath>
</File>
</Files>
</Group>
<Group>
@ -438,16 +433,6 @@
<FileType>4</FileType>
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
</File>
<File>
<FileName>Affichage_Valise.h</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\Affichage_Valise.h</FilePath>
</File>
<File>
<FileName>DriverJeuLaser.h</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\DriverJeuLaser.h</FilePath>
</File>
<File>
<FileName>DriverJeuLaser.inc</FileName>
<FileType>5</FileType>
@ -455,21 +440,6 @@
</File>
</Files>
</Group>
<Group>
<GroupName>New Group</GroupName>
<Files>
<File>
<FileName>Signal.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\Signal.asm</FilePath>
</File>
<File>
<FileName>DFT.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\DFT.s</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>::CMSIS</GroupName>
</Group>
@ -882,11 +852,6 @@
<FileType>2</FileType>
<FilePath>.\Src\Signal.asm</FilePath>
</File>
<File>
<FileName>startup-rvds.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\startup-rvds.s</FilePath>
</File>
</Files>
</Group>
<Group>
@ -907,16 +872,6 @@
<FileType>4</FileType>
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
</File>
<File>
<FileName>Affichage_Valise.h</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\Affichage_Valise.h</FilePath>
</File>
<File>
<FileName>DriverJeuLaser.h</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\DriverJeuLaser.h</FilePath>
</File>
<File>
<FileName>DriverJeuLaser.inc</FileName>
<FileType>5</FileType>
@ -924,21 +879,6 @@
</File>
</Files>
</Group>
<Group>
<GroupName>New Group</GroupName>
<Files>
<File>
<FileName>Signal.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\Signal.asm</FilePath>
</File>
<File>
<FileName>DFT.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\DFT.s</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>::CMSIS</GroupName>
<GroupOption>
@ -1420,11 +1360,6 @@
<FileType>2</FileType>
<FilePath>.\Src\Signal.asm</FilePath>
</File>
<File>
<FileName>startup-rvds.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\startup-rvds.s</FilePath>
</File>
</Files>
</Group>
<Group>
@ -1445,16 +1380,6 @@
<FileType>4</FileType>
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
</File>
<File>
<FileName>Affichage_Valise.h</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\Affichage_Valise.h</FilePath>
</File>
<File>
<FileName>DriverJeuLaser.h</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\DriverJeuLaser.h</FilePath>
</File>
<File>
<FileName>DriverJeuLaser.inc</FileName>
<FileType>5</FileType>
@ -1462,21 +1387,6 @@
</File>
</Files>
</Group>
<Group>
<GroupName>New Group</GroupName>
<Files>
<File>
<FileName>Signal.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\Signal.asm</FilePath>
</File>
<File>
<FileName>DFT.s</FileName>
<FileType>2</FileType>
<FilePath>.\Src\DFT.s</FilePath>
</File>
</Files>
</Group>
<Group>
<GroupName>::CMSIS</GroupName>
</Group>

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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

View file

@ -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