diff --git a/PjtKEIL_StepDFT/Obj/StepDFT.axf b/PjtKEIL_StepDFT/Obj/StepDFT.axf index a84f45b..d7b5445 100644 Binary files a/PjtKEIL_StepDFT/Obj/StepDFT.axf and b/PjtKEIL_StepDFT/Obj/StepDFT.axf differ diff --git a/PjtKEIL_StepDFT/Obj/StepDFT.build_log.htm b/PjtKEIL_StepDFT/Obj/StepDFT.build_log.htm index 94e8162..f609afd 100644 --- a/PjtKEIL_StepDFT/Obj/StepDFT.build_log.htm +++ b/PjtKEIL_StepDFT/Obj/StepDFT.build_log.htm @@ -21,8 +21,8 @@ Target DLL: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.8.0 Dialog DLL: TCM.DLL V1.48.0.0

Project:

-U:\Documents\3MIC\BE CHTI\ASM\Raphael_lacroix-Aurelia_lejeune-BE_CHTI\PjtKEIL_StepDFT\StepDFT.uvprojx -Project File Date: 04/21/2022 +U:\Documents\3MIC\S2\BE_CHTI\Assembleur\Raphael_lacroix-Aurelia_lejeune-BE_CHTI\PjtKEIL_StepDFT\StepDFT.uvprojx +Project File Date: 04/06/2022

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' @@ -61,7 +61,7 @@ Package Vendor: Keil

Collection of Component Files used:

* Component: ARM::CMSIS:CORE:5.4.0 -Build Time Elapsed: 00:00:01 +Build Time Elapsed: 00:00:03 diff --git a/PjtKEIL_StepDFT/Obj/StepDFT.hex b/PjtKEIL_StepDFT/Obj/StepDFT.hex index f64f2e6..40d43d8 100644 --- a/PjtKEIL_StepDFT/Obj/StepDFT.hex +++ b/PjtKEIL_StepDFT/Obj/StepDFT.hex @@ -50,15 +50,15 @@ :10030000C4FB0410C5FB0510BDE8F00F00BD0000E4 :10031000B803000838040008B804000800000020F2 :10032000040000005C020008BC0400080400002077 -:10033000040400006C020008FF0FF60FD90FA80F8D -:10034000640F0E0FA70E2F0EA80D130D720CC50B08 -:10035000100B530A9009C908000837077006AD054D -:10036000F0043B048E03ED025802D1015901F20062 -:100370009C00580027000A0000000A0027005800CF -:100380009C00F2005901D1015802ED028E033B049A -:10039000F004AD05700637070008C9089009530A34 -:1003A000100BC50B720C130DA80D2F0EA70E0E0F00 -:1003B000640FA80FD90FF60FFF7F627F8A7D7D7AC9 +:10033000040400006C020008EE0E120A00044600DD +:100340001201EE05000CBA0FEE0E120A0004460070 +:100350001201EE05000CBA0FEE0E120A0004460060 +:100360001201EE05000CBA0FEE0E120A0004460050 +:100370001201EE05000CBA0FEE0E120A0004460040 +:100380001201EE05000CBA0FEE0E120A0004460030 +:100390001201EE05000CBA0FEE0E120A0004460020 +:1003A0001201EE05000CBA0FEE0E120A0004460010 +:1003B0001201EE05000CBA0FFF7F627F8A7D7D7A05 :1003C0004276E3706E6AF262825A34511D47573C9E :1003D000FC302825F9188C0C000074F307E7D8DAF4 :1003E00004CFA9C3E3B8CCAE7EA50E9D92951D8F18 diff --git a/PjtKEIL_StepDFT/Obj/StepDFT.htm b/PjtKEIL_StepDFT/Obj/StepDFT.htm index c254714..90d8b68 100644 --- a/PjtKEIL_StepDFT/Obj/StepDFT.htm +++ b/PjtKEIL_StepDFT/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: Thu Apr 21 22:27:04 2022 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Fri Apr 22 09:45:51 2022

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

Call chain for Maximum Stack Depth:

diff --git a/PjtKEIL_StepDFT/Obj/StepDFT.map b/PjtKEIL_StepDFT/Obj/StepDFT.map index 4d31fdd..d33df4b 100644 --- a/PjtKEIL_StepDFT/Obj/StepDFT.map +++ b/PjtKEIL_StepDFT/Obj/StepDFT.map @@ -263,13 +263,13 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 100 10 256 0 0 380 dft.o - 56 10 0 4 0 2279 principal.o + 100 10 256 0 0 388 dft.o + 56 10 0 4 0 2299 principal.o 0 0 128 0 0 0 signal.o - 76 20 236 0 1024 840 startup-rvds.o + 76 20 236 0 1024 852 startup-rvds.o ---------------------------------------------------------------------- - 232 40 652 4 1028 3499 Object Totals + 232 40 652 4 1028 3539 Object Totals 0 0 32 0 0 0 (incl. Generated) 0 0 0 0 4 0 (incl. Padding) @@ -311,8 +311,8 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 556 68 652 4 1028 3711 Grand Totals - 556 68 652 4 1028 3711 ELF Image Totals + 556 68 652 4 1028 3751 Grand Totals + 556 68 652 4 1028 3751 ELF Image Totals 556 68 652 4 0 0 ROM Totals ============================================================================== diff --git a/PjtKEIL_StepDFT/Obj/StepDFT_Simu.dep b/PjtKEIL_StepDFT/Obj/StepDFT_Simu.dep index 2709bd8..38fff44 100644 --- a/PjtKEIL_StepDFT/Obj/StepDFT_Simu.dep +++ b/PjtKEIL_StepDFT/Obj/StepDFT_Simu.dep @@ -1,16 +1,16 @@ Dependencies for Project 'StepDFT', Target 'Simu': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC -F (.\Src\principal.c)(0x6261BC3D)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Src -I .\Driver --C99 -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 -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)(0x6255E3A5) +F (.\Src\principal.c)(0x626259C3)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Src -I .\Driver --C99 -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 -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\_Simu\RTE_Components.h)(0x6255E3A5) +I (.\RTE\_Simu\RTE_Components.h)(0x62446F31) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582) I (C:\Keil_v5\ARM\ARMCC\include\stdint.h)(0x5E8E9122) I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h)(0x5E8F2582) 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)(0x6255E3A5)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -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 --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)(0x6255E3A5)() -F (.\Src\Signal.asm)(0x6255E3A5)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -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 --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\DFT.s)(0x6261BE15)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -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 --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\startup-rvds.s)(0x5FE38AC6)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -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 --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 .\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 --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\DFT.s)(0x626259C3)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -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 --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) diff --git a/PjtKEIL_StepDFT/Obj/dft.o b/PjtKEIL_StepDFT/Obj/dft.o index fbc6f66..516eefc 100644 Binary files a/PjtKEIL_StepDFT/Obj/dft.o and b/PjtKEIL_StepDFT/Obj/dft.o differ diff --git a/PjtKEIL_StepDFT/Obj/principal.crf b/PjtKEIL_StepDFT/Obj/principal.crf index 807ed64..47b19d7 100644 Binary files a/PjtKEIL_StepDFT/Obj/principal.crf and b/PjtKEIL_StepDFT/Obj/principal.crf differ diff --git a/PjtKEIL_StepDFT/Obj/principal.o b/PjtKEIL_StepDFT/Obj/principal.o index 9a77c87..e2b13cc 100644 Binary files a/PjtKEIL_StepDFT/Obj/principal.o and b/PjtKEIL_StepDFT/Obj/principal.o differ diff --git a/PjtKEIL_StepDFT/Obj/signal.o b/PjtKEIL_StepDFT/Obj/signal.o index 415769a..24d4084 100644 Binary files a/PjtKEIL_StepDFT/Obj/signal.o and b/PjtKEIL_StepDFT/Obj/signal.o differ diff --git a/PjtKEIL_StepDFT/Obj/startup-rvds.o b/PjtKEIL_StepDFT/Obj/startup-rvds.o index 7327dbf..b896d74 100644 Binary files a/PjtKEIL_StepDFT/Obj/startup-rvds.o and b/PjtKEIL_StepDFT/Obj/startup-rvds.o differ diff --git a/PjtKEIL_StepDFT/Src/DFT.s b/PjtKEIL_StepDFT/Src/DFT.s index 63440c4..b84283f 100644 --- a/PjtKEIL_StepDFT/Src/DFT.s +++ b/PjtKEIL_StepDFT/Src/DFT.s @@ -78,16 +78,10 @@ start b start Out - - ;pour que ca marche avec les types de format on utilise un smlal il faut donc initialiser les registres r0 et r1 à 0 + ; on récupère r0 sur les bits de poids forts - mov r0, #0 - mov r1, #0 - - ; on récupère r0 sur les bits de poids faibles - - smlal r1,r0,r4,r4 ;; r0 += Xreel^2 + smull r1,r0,r4,r4 ;; r0 = Xreel^2 smlal r1,r0,r5,r5 ;; r0 += Ximag^2 pop {r4-r11} diff --git a/PjtKEIL_StepDFT/Src/Signal.asm b/PjtKEIL_StepDFT/Src/Signal.asm index 5a79596..736e55c 100644 --- a/PjtKEIL_StepDFT/Src/Signal.asm +++ b/PjtKEIL_StepDFT/Src/Signal.asm @@ -1,68 +1,68 @@ AREA Signal, DATA, READONLY export LeSignal LeSignal - DCW 0x0fff ; 0 4095 0.99976 - DCW 0x0ff6 ; 1 4086 0.99756 - DCW 0x0fd9 ; 2 4057 0.99048 - DCW 0x0fa8 ; 3 4008 0.97852 - DCW 0x0f64 ; 4 3940 0.96191 - DCW 0x0f0e ; 5 3854 0.94092 - DCW 0x0ea7 ; 6 3751 0.91577 - DCW 0x0e2f ; 7 3631 0.88647 - DCW 0x0da8 ; 8 3496 0.85352 - DCW 0x0d13 ; 9 3347 0.81714 - DCW 0x0c72 ; 10 3186 0.77783 - DCW 0x0bc5 ; 11 3013 0.73560 - DCW 0x0b10 ; 12 2832 0.69141 - DCW 0x0a53 ; 13 2643 0.64526 - DCW 0x0990 ; 14 2448 0.59766 - DCW 0x08c9 ; 15 2249 0.54907 - DCW 0x0800 ; 16 2048 0.50000 - DCW 0x0737 ; 17 1847 0.45093 - DCW 0x0670 ; 18 1648 0.40234 - DCW 0x05ad ; 19 1453 0.35474 - DCW 0x04f0 ; 20 1264 0.30859 - DCW 0x043b ; 21 1083 0.26440 - DCW 0x038e ; 22 910 0.22217 - DCW 0x02ed ; 23 749 0.18286 - DCW 0x0258 ; 24 600 0.14648 - DCW 0x01d1 ; 25 465 0.11353 - DCW 0x0159 ; 26 345 0.08423 - DCW 0x00f2 ; 27 242 0.05908 - DCW 0x009c ; 28 156 0.03809 - DCW 0x0058 ; 29 88 0.02148 - DCW 0x0027 ; 30 39 0.00952 - DCW 0x000a ; 31 10 0.00244 - DCW 0x0000 ; 32 0 0.00000 - DCW 0x000a ; 33 10 0.00244 - DCW 0x0027 ; 34 39 0.00952 - DCW 0x0058 ; 35 88 0.02148 - DCW 0x009c ; 36 156 0.03809 - DCW 0x00f2 ; 37 242 0.05908 - DCW 0x0159 ; 38 345 0.08423 - DCW 0x01d1 ; 39 465 0.11353 - DCW 0x0258 ; 40 600 0.14648 - DCW 0x02ed ; 41 749 0.18286 - DCW 0x038e ; 42 910 0.22217 - DCW 0x043b ; 43 1083 0.26440 - DCW 0x04f0 ; 44 1264 0.30859 - DCW 0x05ad ; 45 1453 0.35474 - DCW 0x0670 ; 46 1648 0.40234 - DCW 0x0737 ; 47 1847 0.45093 - DCW 0x0800 ; 48 2048 0.50000 - DCW 0x08c9 ; 49 2249 0.54907 - DCW 0x0990 ; 50 2448 0.59766 - DCW 0x0a53 ; 51 2643 0.64526 - DCW 0x0b10 ; 52 2832 0.69141 - DCW 0x0bc5 ; 53 3013 0.73560 - DCW 0x0c72 ; 54 3186 0.77783 - DCW 0x0d13 ; 55 3347 0.81714 - DCW 0x0da8 ; 56 3496 0.85352 - DCW 0x0e2f ; 57 3631 0.88647 - DCW 0x0ea7 ; 58 3751 0.91577 - DCW 0x0f0e ; 59 3854 0.94092 - DCW 0x0f64 ; 60 3940 0.96191 - DCW 0x0fa8 ; 61 4008 0.97852 - DCW 0x0fd9 ; 62 4057 0.99048 - DCW 0x0ff6 ; 63 4086 0.99756 + DCW 0x0eee ; 0 3822 0.93311 + DCW 0x0a12 ; 1 2578 0.62939 + DCW 0x0400 ; 2 1024 0.25000 + DCW 0x0046 ; 3 70 0.01709 + DCW 0x0112 ; 4 274 0.06689 + DCW 0x05ee ; 5 1518 0.37061 + DCW 0x0c00 ; 6 3072 0.75000 + DCW 0x0fba ; 7 4026 0.98291 + DCW 0x0eee ; 8 3822 0.93311 + DCW 0x0a12 ; 9 2578 0.62939 + DCW 0x0400 ; 10 1024 0.25000 + DCW 0x0046 ; 11 70 0.01709 + DCW 0x0112 ; 12 274 0.06689 + DCW 0x05ee ; 13 1518 0.37061 + DCW 0x0c00 ; 14 3072 0.75000 + DCW 0x0fba ; 15 4026 0.98291 + DCW 0x0eee ; 16 3822 0.93311 + DCW 0x0a12 ; 17 2578 0.62939 + DCW 0x0400 ; 18 1024 0.25000 + DCW 0x0046 ; 19 70 0.01709 + DCW 0x0112 ; 20 274 0.06689 + DCW 0x05ee ; 21 1518 0.37061 + DCW 0x0c00 ; 22 3072 0.75000 + DCW 0x0fba ; 23 4026 0.98291 + DCW 0x0eee ; 24 3822 0.93311 + DCW 0x0a12 ; 25 2578 0.62939 + DCW 0x0400 ; 26 1024 0.25000 + DCW 0x0046 ; 27 70 0.01709 + DCW 0x0112 ; 28 274 0.06689 + DCW 0x05ee ; 29 1518 0.37061 + DCW 0x0c00 ; 30 3072 0.75000 + DCW 0x0fba ; 31 4026 0.98291 + DCW 0x0eee ; 32 3822 0.93311 + DCW 0x0a12 ; 33 2578 0.62939 + DCW 0x0400 ; 34 1024 0.25000 + DCW 0x0046 ; 35 70 0.01709 + DCW 0x0112 ; 36 274 0.06689 + DCW 0x05ee ; 37 1518 0.37061 + DCW 0x0c00 ; 38 3072 0.75000 + DCW 0x0fba ; 39 4026 0.98291 + DCW 0x0eee ; 40 3822 0.93311 + DCW 0x0a12 ; 41 2578 0.62939 + DCW 0x0400 ; 42 1024 0.25000 + DCW 0x0046 ; 43 70 0.01709 + DCW 0x0112 ; 44 274 0.06689 + DCW 0x05ee ; 45 1518 0.37061 + DCW 0x0c00 ; 46 3072 0.75000 + DCW 0x0fba ; 47 4026 0.98291 + DCW 0x0eee ; 48 3822 0.93311 + DCW 0x0a12 ; 49 2578 0.62939 + DCW 0x0400 ; 50 1024 0.25000 + DCW 0x0046 ; 51 70 0.01709 + DCW 0x0112 ; 52 274 0.06689 + DCW 0x05ee ; 53 1518 0.37061 + DCW 0x0c00 ; 54 3072 0.75000 + DCW 0x0fba ; 55 4026 0.98291 + DCW 0x0eee ; 56 3822 0.93311 + DCW 0x0a12 ; 57 2578 0.62939 + DCW 0x0400 ; 58 1024 0.25000 + DCW 0x0046 ; 59 70 0.01709 + DCW 0x0112 ; 60 274 0.06689 + DCW 0x05ee ; 61 1518 0.37061 + DCW 0x0c00 ; 62 3072 0.75000 + DCW 0x0fba ; 63 4026 0.98291 END diff --git a/PjtKEIL_StepDFT/Src/Untitled.m b/PjtKEIL_StepDFT/Src/Untitled.m new file mode 100644 index 0000000..462a43a --- /dev/null +++ b/PjtKEIL_StepDFT/Src/Untitled.m @@ -0,0 +1,38 @@ +clc +clear + +N = input('Nombre d''�chantilllons pour ce signal : '); +Frel = input('Fr�quence normalis�e (nombre de p�riodes dans la dur�e totale) : '); +Ph0 = input('Phase a l''origine (en degr�s) : '); +Ph0 = Ph0 * pi / 180.0; % a present en radian + +Ampl = 2048; +Offset = 2048; +%% Cr�ation du fichier .asm + +fileID = fopen(['Signal.asm'], 'w'); +fprintf(fileID,'\tAREA Signal, DATA, READONLY\n'); +fprintf(fileID,'\texport LeSignal\n'); + +fprintf(fileID,'LeSignal\n'); + +for i = 1: N + % fonction a modifier en fonction des besoins + Sig(i) = Offset + Ampl * cos( 2*pi*Frel*(i-1)/N + Ph0 ); + % arrondi + iSig = int16(Sig(i)); + % bornage du signal similaire a la sortie brute de l'ADC 12 bits + if ( iSig < 0 ) + iSig = 0; + end + if ( iSig > 4095 ) + iSig = 4095; + end + + fprintf(fileID,'\tDCW\t0x%04x\t; %2d %4d %7.5f\n',iSig, i-1, iSig, double(iSig) / 4096.0 ); + +end + +fprintf(fileID,'\tEND\n'); +fclose(fileID); +plot(Sig); \ No newline at end of file diff --git a/PjtKEIL_StepDFT/StepDFT.uvguix.alejeune b/PjtKEIL_StepDFT/StepDFT.uvguix.alejeune index 172301e..49782b1 100644 --- a/PjtKEIL_StepDFT/StepDFT.uvguix.alejeune +++ b/PjtKEIL_StepDFT/StepDFT.uvguix.alejeune @@ -101,10 +101,10 @@ -1 - 190 - 156 - 1596 - 864 + 319 + 240 + 1680 + 1078 @@ -1806,7 +1806,7 @@ File 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020000001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1871,11 +1871,11 @@ 0 16 - F40000004F0000008007000051000000 + F40000004F0000008007000022010000 16 - F50000006E000000BF030000DF010000 + F50000006E000000BF03000041010000 @@ -1931,7 +1931,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -1951,7 +1951,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -1971,7 +1971,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -1991,7 +1991,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2031,7 +2031,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2051,7 +2051,7 @@ 0 16 - F7000000660000007D07000066000000 + F7000000660000007D07000009010000 16 @@ -2071,7 +2071,7 @@ 0 16 - F7000000660000007D07000066000000 + F7000000660000007D07000009010000 16 @@ -2091,7 +2091,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2111,7 +2111,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2131,7 +2131,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2151,7 +2151,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2171,7 +2171,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2291,7 +2291,7 @@ 0 16 - F7000000660000007D07000066000000 + F7000000660000007D07000009010000 16 @@ -2311,7 +2311,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2371,7 +2371,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2391,7 +2391,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2411,7 +2411,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2431,7 +2431,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2451,7 +2451,7 @@ 0 16 - F7000000660000007D07000066000000 + F7000000660000007D07000009010000 16 @@ -2951,7 +2951,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -2971,7 +2971,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -3031,7 +3031,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -3531,7 +3531,7 @@ 0 16 - F700000066000000BB030000A7010000 + F700000066000000BB03000009010000 16 @@ -3540,14 +3540,14 @@ 3225 - 000000000A000000000000000020000001000000FFFFFFFFFFFFFFFFF40000005100000080070000550000000100000001000010040000000100000091FEFFFF4E010000FFFFFFFF17000000CB00000057010000CC000000F08B00005A01000079070000D6010000458900008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000FFFF02000B004354616262656450616E650020000001000000F50000006E000000BF030000DF010000F40000004F00000080070000510000000000000040280056170000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657201000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF1343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF03000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A0040000E5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A10400006E0000009105000004020000A00400004F00000090050000E501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F400000017030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000010000006E000000F10000002D030000000000004F000000F0000000170300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000017030000800700001B030000010000000100001004000000010000008AFEFFFF3500000000000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFFDF010000EB020000E3010000DD03000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000E501000090050000E9010000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000000000000100000008020000910500008702000000000000E901000090050000680200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000A000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000220100008007000026010000010000000100001004000000010000009EFFFFFF52020000FFFFFFFF17000000CB00000057010000CC000000F08B00005A01000079070000D6010000458900008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000FFFF02000B004354616262656450616E650020000001000000F50000006E000000BF03000041010000F40000004F00000080070000220100000000000040280056170000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657201000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF1343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0D000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A0040000E5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A10400006E0000009105000004020000A00400004F00000090050000E501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F400000017030000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000010000006E000000F10000002D030000000000004F000000F0000000170300000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000017030000800700001B030000010000000100001004000000010000008AFEFFFF3500000000000000000000000000000001000000C60000000000000001000000000000000000000001000000FFFFFFFFDF010000EB020000E3010000DD03000000000000020000000400000000000000000000000000000000000000000000000000000001000000C600000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000E501000090050000E9010000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF01000077940000018000800000000000000100000008020000910500008702000000000000E901000090050000680200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 File 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000000000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000400160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3563,7 +3563,7 @@ Build 955 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3606,27 +3606,27 @@ 0 .\Src\DFT.s - 21 - 25 - 64 + 4 + 79 + 86 1 0 .\Src\Signal.asm - 19 + 2 1 - 2 + 3 1 0 .\Src\principal.c - 0 + 8 1 - 31 + 7 1 0 diff --git a/PjtKEIL_StepDFT/StepDFT.uvoptx b/PjtKEIL_StepDFT/StepDFT.uvoptx index 22ff0fe..88bad5b 100644 --- a/PjtKEIL_StepDFT/StepDFT.uvoptx +++ b/PjtKEIL_StepDFT/StepDFT.uvoptx @@ -163,7 +163,7 @@ 1 1 - tab[64] + tab 2 @@ -180,6 +180,11 @@ 1 a + + 5 + 1 + tab[k] + @@ -235,17 +240,22 @@ 0 `a - FF0000000000C033D43ADFC10000C0BFF313DF410000000000000000000000000000000061000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000565555555555D53F0E000000000000000000000000000000000000007C020008 + FF0000000000C033D43ADFC10000C0BFF313DF410000000000000000000000000000000061000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000D03F0D000000000000000000000000000000000000007C020008 1 `a - 00800000000000000000E0C10000C0FFFFFFDF410000000000000000000000000000000061000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000565555555555D53F0E000000000000000000000000000000000000007C020008 + 00800000000000000000E0C10000C0FFFFFFDF410000000000000000000000000000000061000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000D03F0D000000000000000000000000000000000000007C020008 2 `a - 00008000000000000000E0C10000C0FFFFFFDF410000000000000000000000000000000061000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000003000000555555555555D53F0E000000000000000000000000000000000000007C020008 + 00008000000000000000E0C10000C0FFFFFFDF410000000000000000000000000000000061000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000003000000000000000000D03F0D000000000000000000000000000000000000007C020008 + + + 3 + `a + 00000000000000000000E0C10000C0FFFFFFDF410000000000000000000000000000000061000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000004000000000000000000D03F0D000000000000000000000000000000000000007C020008 diff --git a/PjtKEIL_StepDFT/signal.lst b/PjtKEIL_StepDFT/signal.lst index 602ab1a..040ee9d 100644 --- a/PjtKEIL_StepDFT/signal.lst +++ b/PjtKEIL_StepDFT/signal.lst @@ -7,76 +7,76 @@ ARM Macro Assembler Page 1 1 00000000 AREA Signal, DATA, READONLY 2 00000000 export LeSignal 3 00000000 LeSignal - 4 00000000 FF 0F DCW 0x0fff ; 0 4095 0.99976 - 5 00000002 F6 0F DCW 0x0ff6 ; 1 4086 0.99756 - 6 00000004 D9 0F DCW 0x0fd9 ; 2 4057 0.99048 - 7 00000006 A8 0F DCW 0x0fa8 ; 3 4008 0.97852 - 8 00000008 64 0F DCW 0x0f64 ; 4 3940 0.96191 - 9 0000000A 0E 0F DCW 0x0f0e ; 5 3854 0.94092 - 10 0000000C A7 0E DCW 0x0ea7 ; 6 3751 0.91577 - 11 0000000E 2F 0E DCW 0x0e2f ; 7 3631 0.88647 - 12 00000010 A8 0D DCW 0x0da8 ; 8 3496 0.85352 - 13 00000012 13 0D DCW 0x0d13 ; 9 3347 0.81714 - 14 00000014 72 0C DCW 0x0c72 ; 10 3186 0.77783 - 15 00000016 C5 0B DCW 0x0bc5 ; 11 3013 0.73560 - 16 00000018 10 0B DCW 0x0b10 ; 12 2832 0.69141 - 17 0000001A 53 0A DCW 0x0a53 ; 13 2643 0.64526 - 18 0000001C 90 09 DCW 0x0990 ; 14 2448 0.59766 - 19 0000001E C9 08 DCW 0x08c9 ; 15 2249 0.54907 - 20 00000020 00 08 DCW 0x0800 ; 16 2048 0.50000 - 21 00000022 37 07 DCW 0x0737 ; 17 1847 0.45093 - 22 00000024 70 06 DCW 0x0670 ; 18 1648 0.40234 - 23 00000026 AD 05 DCW 0x05ad ; 19 1453 0.35474 - 24 00000028 F0 04 DCW 0x04f0 ; 20 1264 0.30859 - 25 0000002A 3B 04 DCW 0x043b ; 21 1083 0.26440 - 26 0000002C 8E 03 DCW 0x038e ; 22 910 0.22217 - 27 0000002E ED 02 DCW 0x02ed ; 23 749 0.18286 - 28 00000030 58 02 DCW 0x0258 ; 24 600 0.14648 - 29 00000032 D1 01 DCW 0x01d1 ; 25 465 0.11353 - 30 00000034 59 01 DCW 0x0159 ; 26 345 0.08423 - 31 00000036 F2 00 DCW 0x00f2 ; 27 242 0.05908 - 32 00000038 9C 00 DCW 0x009c ; 28 156 0.03809 - 33 0000003A 58 00 DCW 0x0058 ; 29 88 0.02148 - 34 0000003C 27 00 DCW 0x0027 ; 30 39 0.00952 - 35 0000003E 0A 00 DCW 0x000a ; 31 10 0.00244 - 36 00000040 00 00 DCW 0x0000 ; 32 0 0.00000 - 37 00000042 0A 00 DCW 0x000a ; 33 10 0.00244 - 38 00000044 27 00 DCW 0x0027 ; 34 39 0.00952 - 39 00000046 58 00 DCW 0x0058 ; 35 88 0.02148 - 40 00000048 9C 00 DCW 0x009c ; 36 156 0.03809 - 41 0000004A F2 00 DCW 0x00f2 ; 37 242 0.05908 - 42 0000004C 59 01 DCW 0x0159 ; 38 345 0.08423 - 43 0000004E D1 01 DCW 0x01d1 ; 39 465 0.11353 - 44 00000050 58 02 DCW 0x0258 ; 40 600 0.14648 - 45 00000052 ED 02 DCW 0x02ed ; 41 749 0.18286 - 46 00000054 8E 03 DCW 0x038e ; 42 910 0.22217 - 47 00000056 3B 04 DCW 0x043b ; 43 1083 0.26440 - 48 00000058 F0 04 DCW 0x04f0 ; 44 1264 0.30859 - 49 0000005A AD 05 DCW 0x05ad ; 45 1453 0.35474 - 50 0000005C 70 06 DCW 0x0670 ; 46 1648 0.40234 - 51 0000005E 37 07 DCW 0x0737 ; 47 1847 0.45093 - 52 00000060 00 08 DCW 0x0800 ; 48 2048 0.50000 - 53 00000062 C9 08 DCW 0x08c9 ; 49 2249 0.54907 - 54 00000064 90 09 DCW 0x0990 ; 50 2448 0.59766 - 55 00000066 53 0A DCW 0x0a53 ; 51 2643 0.64526 - 56 00000068 10 0B DCW 0x0b10 ; 52 2832 0.69141 - 57 0000006A C5 0B DCW 0x0bc5 ; 53 3013 0.73560 - 58 0000006C 72 0C DCW 0x0c72 ; 54 3186 0.77783 - 59 0000006E 13 0D DCW 0x0d13 ; 55 3347 0.81714 + 4 00000000 EE 0E DCW 0x0eee ; 0 3822 0.93311 + 5 00000002 12 0A DCW 0x0a12 ; 1 2578 0.62939 + 6 00000004 00 04 DCW 0x0400 ; 2 1024 0.25000 + 7 00000006 46 00 DCW 0x0046 ; 3 70 0.01709 + 8 00000008 12 01 DCW 0x0112 ; 4 274 0.06689 + 9 0000000A EE 05 DCW 0x05ee ; 5 1518 0.37061 + 10 0000000C 00 0C DCW 0x0c00 ; 6 3072 0.75000 + 11 0000000E BA 0F DCW 0x0fba ; 7 4026 0.98291 + 12 00000010 EE 0E DCW 0x0eee ; 8 3822 0.93311 + 13 00000012 12 0A DCW 0x0a12 ; 9 2578 0.62939 + 14 00000014 00 04 DCW 0x0400 ; 10 1024 0.25000 + 15 00000016 46 00 DCW 0x0046 ; 11 70 0.01709 + 16 00000018 12 01 DCW 0x0112 ; 12 274 0.06689 + 17 0000001A EE 05 DCW 0x05ee ; 13 1518 0.37061 + 18 0000001C 00 0C DCW 0x0c00 ; 14 3072 0.75000 + 19 0000001E BA 0F DCW 0x0fba ; 15 4026 0.98291 + 20 00000020 EE 0E DCW 0x0eee ; 16 3822 0.93311 + 21 00000022 12 0A DCW 0x0a12 ; 17 2578 0.62939 + 22 00000024 00 04 DCW 0x0400 ; 18 1024 0.25000 + 23 00000026 46 00 DCW 0x0046 ; 19 70 0.01709 + 24 00000028 12 01 DCW 0x0112 ; 20 274 0.06689 + 25 0000002A EE 05 DCW 0x05ee ; 21 1518 0.37061 + 26 0000002C 00 0C DCW 0x0c00 ; 22 3072 0.75000 + 27 0000002E BA 0F DCW 0x0fba ; 23 4026 0.98291 + 28 00000030 EE 0E DCW 0x0eee ; 24 3822 0.93311 + 29 00000032 12 0A DCW 0x0a12 ; 25 2578 0.62939 + 30 00000034 00 04 DCW 0x0400 ; 26 1024 0.25000 + 31 00000036 46 00 DCW 0x0046 ; 27 70 0.01709 + 32 00000038 12 01 DCW 0x0112 ; 28 274 0.06689 + 33 0000003A EE 05 DCW 0x05ee ; 29 1518 0.37061 + 34 0000003C 00 0C DCW 0x0c00 ; 30 3072 0.75000 + 35 0000003E BA 0F DCW 0x0fba ; 31 4026 0.98291 + 36 00000040 EE 0E DCW 0x0eee ; 32 3822 0.93311 + 37 00000042 12 0A DCW 0x0a12 ; 33 2578 0.62939 + 38 00000044 00 04 DCW 0x0400 ; 34 1024 0.25000 + 39 00000046 46 00 DCW 0x0046 ; 35 70 0.01709 + 40 00000048 12 01 DCW 0x0112 ; 36 274 0.06689 + 41 0000004A EE 05 DCW 0x05ee ; 37 1518 0.37061 + 42 0000004C 00 0C DCW 0x0c00 ; 38 3072 0.75000 + 43 0000004E BA 0F DCW 0x0fba ; 39 4026 0.98291 + 44 00000050 EE 0E DCW 0x0eee ; 40 3822 0.93311 + 45 00000052 12 0A DCW 0x0a12 ; 41 2578 0.62939 + 46 00000054 00 04 DCW 0x0400 ; 42 1024 0.25000 + 47 00000056 46 00 DCW 0x0046 ; 43 70 0.01709 + 48 00000058 12 01 DCW 0x0112 ; 44 274 0.06689 + 49 0000005A EE 05 DCW 0x05ee ; 45 1518 0.37061 + 50 0000005C 00 0C DCW 0x0c00 ; 46 3072 0.75000 + 51 0000005E BA 0F DCW 0x0fba ; 47 4026 0.98291 + 52 00000060 EE 0E DCW 0x0eee ; 48 3822 0.93311 + 53 00000062 12 0A DCW 0x0a12 ; 49 2578 0.62939 + 54 00000064 00 04 DCW 0x0400 ; 50 1024 0.25000 + 55 00000066 46 00 DCW 0x0046 ; 51 70 0.01709 + 56 00000068 12 01 DCW 0x0112 ; 52 274 0.06689 + 57 0000006A EE 05 DCW 0x05ee ; 53 1518 0.37061 + 58 0000006C 00 0C DCW 0x0c00 ; 54 3072 0.75000 + 59 0000006E BA 0F DCW 0x0fba ; 55 4026 0.98291 ARM Macro Assembler Page 2 - 60 00000070 A8 0D DCW 0x0da8 ; 56 3496 0.85352 - 61 00000072 2F 0E DCW 0x0e2f ; 57 3631 0.88647 - 62 00000074 A7 0E DCW 0x0ea7 ; 58 3751 0.91577 - 63 00000076 0E 0F DCW 0x0f0e ; 59 3854 0.94092 - 64 00000078 64 0F DCW 0x0f64 ; 60 3940 0.96191 - 65 0000007A A8 0F DCW 0x0fa8 ; 61 4008 0.97852 - 66 0000007C D9 0F DCW 0x0fd9 ; 62 4057 0.99048 - 67 0000007E F6 0F DCW 0x0ff6 ; 63 4086 0.99756 + 60 00000070 EE 0E DCW 0x0eee ; 56 3822 0.93311 + 61 00000072 12 0A DCW 0x0a12 ; 57 2578 0.62939 + 62 00000074 00 04 DCW 0x0400 ; 58 1024 0.25000 + 63 00000076 46 00 DCW 0x0046 ; 59 70 0.01709 + 64 00000078 12 01 DCW 0x0112 ; 60 274 0.06689 + 65 0000007A EE 05 DCW 0x05ee ; 61 1518 0.37061 + 66 0000007C 00 0C DCW 0x0c00 ; 62 3072 0.75000 + 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.d -o.\obj\signal.o -I.\Src -I.\RTE\_Simu -IC:\Program diff --git a/README.md b/README.md index be5b136..25c3d1c 100644 --- a/README.md +++ b/README.md @@ -8,4 +8,10 @@ Terminée Terminée ## Partie Son : -Début du projet assembleur BE CHTI, partie encore non terminée. Notre boucle continue à lire la RAM après la fin du fichier du son. +Projet son finalise. Nous lisons bien la bonne partie de la RAM + +## DFT 1ere partie : +Finie et testée avec le signal produit par matlab contenu dans PjtKEIL_StepDFT/Src/Signal.asm +Nous obtenons les valeurs attendues en format 10.22 + +