diff --git a/driver_premier_test/Listings/driver_premier_test.map b/driver_premier_test/Listings/driver_premier_test.map index b6e6541..a734071 100644 --- a/driver_premier_test/Listings/driver_premier_test.map +++ b/driver_premier_test/Listings/driver_premier_test.map @@ -228,33 +228,33 @@ Memory Map of the image Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x08000000 0x08000000 0x000000ec Data RO 116 RESET startup_stm32f10x_md.o - 0x080000ec 0x080000ec 0x00000000 Code RO 167 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) - 0x080000ec 0x080000ec 0x00000004 Code RO 170 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) - 0x080000f0 0x080000f0 0x00000004 Code RO 173 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 175 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 177 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) - 0x080000f4 0x080000f4 0x00000008 Code RO 178 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) - 0x080000fc 0x080000fc 0x00000004 Code RO 185 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) - 0x08000100 0x08000100 0x00000000 Code RO 180 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) - 0x08000100 0x08000100 0x00000000 Code RO 182 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) - 0x08000100 0x08000100 0x00000004 Code RO 171 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) - 0x08000104 0x08000104 0x00000024 Code RO 117 * .text startup_stm32f10x_md.o - 0x08000128 0x08000128 0x00000024 Code RO 186 .text mc_w.l(init.o) + 0x08000000 0x08000000 0x000000ec Data RO 119 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000000 Code RO 170 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) + 0x080000ec 0x080000ec 0x00000004 Code RO 173 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) + 0x080000f0 0x080000f0 0x00000004 Code RO 176 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 178 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 180 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) + 0x080000f4 0x080000f4 0x00000008 Code RO 181 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) + 0x080000fc 0x080000fc 0x00000004 Code RO 188 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) + 0x08000100 0x08000100 0x00000000 Code RO 183 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) + 0x08000100 0x08000100 0x00000000 Code RO 185 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) + 0x08000100 0x08000100 0x00000004 Code RO 174 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) + 0x08000104 0x08000104 0x00000024 Code RO 120 * .text startup_stm32f10x_md.o + 0x08000128 0x08000128 0x00000024 Code RO 189 .text mc_w.l(init.o) 0x0800014c 0x0800014c 0x00000018 Code RO 60 i.MyGPIO_Activate driver_gpio.o 0x08000164 0x08000164 0x000000ec Code RO 61 i.MyGPIO_Init driver_gpio.o 0x08000250 0x08000250 0x0000000c Code RO 62 i.MyGPIO_Read driver_gpio.o 0x0800025c 0x0800025c 0x0000000c Code RO 63 i.MyGPIO_Reset driver_gpio.o 0x08000268 0x08000268 0x00000008 Code RO 64 i.MyGPIO_Set driver_gpio.o - 0x08000270 0x08000270 0x00000008 Code RO 124 i.SetSysClock system_stm32f10x.o - 0x08000278 0x08000278 0x000000e0 Code RO 125 i.SetSysClockTo72 system_stm32f10x.o - 0x08000358 0x08000358 0x00000060 Code RO 127 i.SystemInit system_stm32f10x.o - 0x080003b8 0x080003b8 0x0000000e Code RO 190 i.__scatterload_copy mc_w.l(handlers.o) - 0x080003c6 0x080003c6 0x00000002 Code RO 191 i.__scatterload_null mc_w.l(handlers.o) - 0x080003c8 0x080003c8 0x0000000e Code RO 192 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x08000270 0x08000270 0x00000008 Code RO 127 i.SetSysClock system_stm32f10x.o + 0x08000278 0x08000278 0x000000e0 Code RO 128 i.SetSysClockTo72 system_stm32f10x.o + 0x08000358 0x08000358 0x00000060 Code RO 130 i.SystemInit system_stm32f10x.o + 0x080003b8 0x080003b8 0x0000000e Code RO 193 i.__scatterload_copy mc_w.l(handlers.o) + 0x080003c6 0x080003c6 0x00000002 Code RO 194 i.__scatterload_null mc_w.l(handlers.o) + 0x080003c8 0x080003c8 0x0000000e Code RO 195 i.__scatterload_zeroinit mc_w.l(handlers.o) 0x080003d6 0x080003d6 0x00000002 PAD 0x080003d8 0x080003d8 0x00000068 Code RO 4 i.main principal.o - 0x08000440 0x08000440 0x00000010 Data RO 188 Region$$Table anon$$obj.o + 0x08000440 0x08000440 0x00000010 Data RO 191 Region$$Table anon$$obj.o Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000450, Size: 0x00000000, Max: 0xffffffff, ABSOLUTE) @@ -266,7 +266,7 @@ Memory Map of the image Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 - 0x00000400 Zero RW 114 STACK startup_stm32f10x_md.o + 0x20000000 - 0x00000400 Zero RW 117 STACK startup_stm32f10x_md.o ============================================================================== @@ -277,12 +277,12 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name 292 6 0 0 0 3798 driver_gpio.o - 104 8 0 0 0 207615 principal.o + 104 8 0 0 0 207571 principal.o 36 8 236 0 1024 868 startup_stm32f10x_md.o 328 28 0 0 0 2213 system_stm32f10x.o ---------------------------------------------------------------------- - 760 50 252 0 1024 214494 Object Totals + 760 50 252 0 1024 214450 Object Totals 0 0 16 0 0 0 (incl. Generated) 0 0 0 0 0 0 (incl. Padding) @@ -322,8 +322,8 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 852 66 252 0 1024 214350 Grand Totals - 852 66 252 0 1024 214350 ELF Image Totals + 852 66 252 0 1024 214306 Grand Totals + 852 66 252 0 1024 214306 ELF Image Totals 852 66 252 0 0 0 ROM Totals ============================================================================== diff --git a/driver_premier_test/Objects/driver_premier_test.axf b/driver_premier_test/Objects/driver_premier_test.axf index 05e6d25..207f234 100644 Binary files a/driver_premier_test/Objects/driver_premier_test.axf and b/driver_premier_test/Objects/driver_premier_test.axf differ diff --git a/driver_premier_test/Objects/driver_premier_test.build_log.htm b/driver_premier_test/Objects/driver_premier_test.build_log.htm index d78f004..ff3ab06 100644 --- a/driver_premier_test/Objects/driver_premier_test.build_log.htm +++ b/driver_premier_test/Objects/driver_premier_test.build_log.htm @@ -21,16 +21,13 @@ Target DLL: STLink\ST-LINKIII-KEIL_SWO.dll V3.0.8.0 Dialog DLL: TARMSTM.DLL V1.66.0.0

Project:

-C:\Users\chauz\Documents_non_drive\INSA\4A\S7\Microcontroleur\bateau-microcontrolleur\driver_premier_test\driver_premier_test.uvprojx +C:\Users\chauz\Documents_non_drive\INSA\4A\S7\TP_microcontroleur\driver_premier_test\driver_premier_test.uvprojx Project File Date: 09/19/2021

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' -Rebuild target 'CarteSTM32' -assembling startup_stm32f10x_md.s... +Build target 'CarteSTM32' compiling principal.c... -compiling system_stm32f10x.c... -compiling Driver_GPIO.c... linking... Program Size: Code=852 RO-data=252 RW-data=0 ZI-data=1024 ".\Objects\driver_premier_test.axf" - 0 Error(s), 0 Warning(s). @@ -60,11 +57,11 @@ Package Vendor: Keil * Component: ARM::CMSIS:CORE:5.4.0 * Component: Keil::Device:Startup:1.0.0 - Source file: Device\Source\ARM\STM32F1xx_OPT.s Include file: RTE_Driver\Config\RTE_Device.h - Source file: Device\Source\ARM\startup_stm32f10x_md.s Source file: Device\Source\system_stm32f10x.c -Build Time Elapsed: 00:00:00 + Source file: Device\Source\ARM\startup_stm32f10x_md.s + Source file: Device\Source\ARM\STM32F1xx_OPT.s +Build Time Elapsed: 00:00:01 diff --git a/driver_premier_test/Objects/driver_premier_test.htm b/driver_premier_test/Objects/driver_premier_test.htm index 29e8ecf..fcaba60 100644 --- a/driver_premier_test/Objects/driver_premier_test.htm +++ b/driver_premier_test/Objects/driver_premier_test.htm @@ -3,7 +3,7 @@ Static Call Graph - [.\Objects\driver_premier_test.axf]

Static Call Graph for image .\Objects\driver_premier_test.axf

-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Sep 20 14:37:14 2021 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Fri Sep 24 15:45:55 2021

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

Call chain for Maximum Stack Depth:

diff --git a/driver_premier_test/Objects/driver_premier_test_CarteSTM32.dep b/driver_premier_test/Objects/driver_premier_test_CarteSTM32.dep index a2b46aa..62da13b 100644 --- a/driver_premier_test/Objects/driver_premier_test_CarteSTM32.dep +++ b/driver_premier_test/Objects/driver_premier_test_CarteSTM32.dep @@ -1,6 +1,6 @@ Dependencies for Project 'driver_premier_test', Target 'CarteSTM32': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC -F (.\Source\principal.c)(0x61477803)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM32 -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d) +F (.\Source\principal.c)(0x614DD68F)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM32 -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) I (.\RTE\_CarteSTM32\RTE_Components.h)(0x61476EF1) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392) diff --git a/driver_premier_test/Objects/principal.crf b/driver_premier_test/Objects/principal.crf index 2a53880..59622fe 100644 Binary files a/driver_premier_test/Objects/principal.crf and b/driver_premier_test/Objects/principal.crf differ diff --git a/driver_premier_test/Objects/principal.o b/driver_premier_test/Objects/principal.o index 2b690e4..abd721e 100644 Binary files a/driver_premier_test/Objects/principal.o and b/driver_premier_test/Objects/principal.o differ diff --git a/driver_premier_test/Source/principal.c b/driver_premier_test/Source/principal.c index e8f7487..1cbec47 100644 --- a/driver_premier_test/Source/principal.c +++ b/driver_premier_test/Source/principal.c @@ -1,23 +1,6 @@ #include "stm32f10x.h" #include "Driver_GPIO.h" - -//mise en place des bits d'accès -#define ACCESS_BTN_BLUE (1 << 13) -#define ACCESS_LED_GREEN (1 << 5) - -//configuration du pin de la led -//GPIOA->PIN PA.5 = 4*5 (où 4 = nb bit par pin) -#define DECALAGE_PA5 (5 * 4) - -/* -typedef struct { - GPIO_TypeDef * GPIO ; - char GPIO_Pin ; - char GPIO_Conf ; -} MyGPIO_Struct_TypeDef ; -*/ - int main(void){ //la LED diff --git a/driver_premier_test/driver_premier_test.uvguix.chauz b/driver_premier_test/driver_premier_test.uvguix.chauz index 696ee15..a6e3fe0 100644 --- a/driver_premier_test/driver_premier_test.uvguix.chauz +++ b/driver_premier_test/driver_premier_test.uvguix.chauz @@ -22,17 +22,17 @@ 38003 Registers - 82 100 + 115 111 346 Code Coverage - 770 204 + 770 160 204 Performance Analyzer - 930 139 139 100 + 930 @@ -100,8 +100,8 @@ 2 3 - -32000 - -32000 + -1 + -1 -1 @@ -117,8 +117,8 @@ 0 - 675 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000300000000000000010000007C433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C4D6963726F636F6E74726F6C6575725C6261746561752D6D6963726F636F6E74726F6C6C6575725C6472697665725F7072656D6965725F746573745C536F757263655C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000C5D4F200FFFFFFFF97433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C4D6963726F636F6E74726F6C6575725C6261746561752D6D6963726F636F6E74726F6C6C6575725C6472697665725F7072656D6965725F746573745C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000FFDC7800FFFFFFFF80433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C4D6963726F636F6E74726F6C6575725C6261746561752D6D6963726F636F6E74726F6C6C6575725C6472697665725F7072656D6965725F746573745C496E636C756465735C4472697665725F4750494F2E68000000000D4472697665725F4750494F2E6800000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F0000000660000000006000067020000 + 612 + 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000003000000000000000100000067433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C54505F6D6963726F636F6E74726F6C6575725C6472697665725F7072656D6965725F746573745C536F757263655C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000C5D4F200FFFFFFFF82433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C54505F6D6963726F636F6E74726F6C6575725C6472697665725F7072656D6965725F746573745C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000FFDC7800FFFFFFFF6B433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C54505F6D6963726F636F6E74726F6C6575725C6472697665725F7072656D6965725F746573745C496E636C756465735C4472697665725F4750494F2E68000000000D4472697665725F4750494F2E6800000000BECEA100FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F0000000660000000006000067020000 @@ -1813,7 +1813,7 @@ File 2566 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000C6770696F5F74797065646566960000000000000001000C6770696F5F7479706564656600000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000C6770696F5F74797065646566960000000000000001000C6770696F5F7479706564656600000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1829,7 +1829,7 @@ Build 980 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000A436172746553544D3332960000000000000001000A436172746553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000A436172746553544D3332960000000000000001000A436172746553544D3332000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1845,7 +1845,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3615,7 +3615,7 @@ .\Source\principal.c 0 1 - 46 + 3 1 0 diff --git a/timer_act2/Includes/Driver_TIMER.c b/timer_act2/Includes/Driver_TIMER.c index 2df578e..8a20f75 100644 --- a/timer_act2/Includes/Driver_TIMER.c +++ b/timer_act2/Includes/Driver_TIMER.c @@ -13,3 +13,14 @@ void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer) { Timer -> Timer -> ARR = Timer -> ARR -1; Timer -> Timer -> PSC = Timer -> PSC -1; } + +void Activate_TIM(int i) { + if (i==1) { + //le timer1 est sur apb2enr + RCC-> APB2ENR |= 0x01 << 11 ; + } + else { + //les autres timers sont sur apb1enr + RCC-> APB1ENR |= 0x01 << (i-2) ; + } +} diff --git a/timer_act2/Includes/Driver_TIMER.h b/timer_act2/Includes/Driver_TIMER.h index 49579aa..a933ebc 100644 --- a/timer_act2/Includes/Driver_TIMER.h +++ b/timer_act2/Includes/Driver_TIMER.h @@ -10,6 +10,7 @@ typedef struct { } MyTimer_Struct_TypeDef ; void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer) ; +void Activate_TIM(int) ; #define MyTimer_Base_Start(Timer) (Timer->CR1 |= 0x1) #define MyTimer_Base_Stop(Timer) (Timer->CR1 &= ~0x1) diff --git a/timer_act2/Listings/timer_act2.map b/timer_act2/Listings/timer_act2.map index ac2e865..6518a5d 100644 --- a/timer_act2/Listings/timer_act2.map +++ b/timer_act2/Listings/timer_act2.map @@ -5,6 +5,7 @@ Component: ARM Compiler 5.06 update 7 (build 960) Tool: armlink [4d3601] Section Cross References principal.o(i.main) refers to driver_timer.o(i.MyTimer_Base_Init) for MyTimer_Base_Init + principal.o(i.main) refers to driver_timer.o(i.Activate_TIM) for Activate_TIM driver_gpio.o(i.MyGPIO_Init) refers to driver_gpio.o(i.MyGPIO_Set) for MyGPIO_Set driver_gpio.o(i.MyGPIO_Toggle) refers to driver_gpio.o(i.MyGPIO_Reset) for MyGPIO_Reset driver_gpio.o(i.MyGPIO_Toggle) refers to driver_gpio.o(i.MyGPIO_Set) for MyGPIO_Set @@ -69,12 +70,11 @@ Image Symbol Table Symbol Name Value Ov Type Size Object(Section) - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE @@ -82,8 +82,9 @@ Image Symbol Table ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE Includes\Driver_GPIO.c 0x00000000 Number 0 driver_gpio.o ABSOLUTE Includes\Driver_TIMER.c 0x00000000 Number 0 driver_timer.o ABSOLUTE Includes\\Driver_GPIO.c 0x00000000 Number 0 driver_gpio.o ABSOLUTE @@ -110,16 +111,17 @@ Image Symbol Table __lit__00000000 0x08000100 Data 4 entry2.o(.ARM.Collect$$$$00002712) .text 0x08000104 Section 36 startup_stm32f10x_md.o(.text) .text 0x08000128 Section 36 init.o(.text) - i.MyTimer_Base_Init 0x0800014c Section 0 driver_timer.o(i.MyTimer_Base_Init) - i.SetSysClock 0x0800015e Section 0 system_stm32f10x.o(i.SetSysClock) - SetSysClock 0x0800015f Thumb Code 8 system_stm32f10x.o(i.SetSysClock) - i.SetSysClockTo72 0x08000168 Section 0 system_stm32f10x.o(i.SetSysClockTo72) - SetSysClockTo72 0x08000169 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) - i.SystemInit 0x08000248 Section 0 system_stm32f10x.o(i.SystemInit) - i.__scatterload_copy 0x080002a8 Section 14 handlers.o(i.__scatterload_copy) - i.__scatterload_null 0x080002b6 Section 2 handlers.o(i.__scatterload_null) - i.__scatterload_zeroinit 0x080002b8 Section 14 handlers.o(i.__scatterload_zeroinit) - i.main 0x080002c8 Section 0 principal.o(i.main) + i.Activate_TIM 0x0800014c Section 0 driver_timer.o(i.Activate_TIM) + i.MyTimer_Base_Init 0x08000174 Section 0 driver_timer.o(i.MyTimer_Base_Init) + i.SetSysClock 0x08000186 Section 0 system_stm32f10x.o(i.SetSysClock) + SetSysClock 0x08000187 Thumb Code 8 system_stm32f10x.o(i.SetSysClock) + i.SetSysClockTo72 0x08000190 Section 0 system_stm32f10x.o(i.SetSysClockTo72) + SetSysClockTo72 0x08000191 Thumb Code 214 system_stm32f10x.o(i.SetSysClockTo72) + i.SystemInit 0x08000270 Section 0 system_stm32f10x.o(i.SystemInit) + i.__scatterload_copy 0x080002d0 Section 14 handlers.o(i.__scatterload_copy) + i.__scatterload_null 0x080002de Section 2 handlers.o(i.__scatterload_null) + i.__scatterload_zeroinit 0x080002e0 Section 14 handlers.o(i.__scatterload_zeroinit) + i.main 0x080002f0 Section 0 principal.o(i.main) STACK 0x20000000 Section 1024 startup_stm32f10x_md.o(STACK) Global Symbols @@ -202,14 +204,15 @@ Image Symbol Table WWDG_IRQHandler 0x0800011f Thumb Code 0 startup_stm32f10x_md.o(.text) __scatterload 0x08000129 Thumb Code 28 init.o(.text) __scatterload_rt2 0x08000129 Thumb Code 0 init.o(.text) - MyTimer_Base_Init 0x0800014d Thumb Code 18 driver_timer.o(i.MyTimer_Base_Init) - SystemInit 0x08000249 Thumb Code 78 system_stm32f10x.o(i.SystemInit) - __scatterload_copy 0x080002a9 Thumb Code 14 handlers.o(i.__scatterload_copy) - __scatterload_null 0x080002b7 Thumb Code 2 handlers.o(i.__scatterload_null) - __scatterload_zeroinit 0x080002b9 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) - main 0x080002c9 Thumb Code 44 principal.o(i.main) - Region$$Table$$Base 0x080002f8 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x08000308 Number 0 anon$$obj.o(Region$$Table) + Activate_TIM 0x0800014d Thumb Code 36 driver_timer.o(i.Activate_TIM) + MyTimer_Base_Init 0x08000175 Thumb Code 18 driver_timer.o(i.MyTimer_Base_Init) + SystemInit 0x08000271 Thumb Code 78 system_stm32f10x.o(i.SystemInit) + __scatterload_copy 0x080002d1 Thumb Code 14 handlers.o(i.__scatterload_copy) + __scatterload_null 0x080002df Thumb Code 2 handlers.o(i.__scatterload_null) + __scatterload_zeroinit 0x080002e1 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) + main 0x080002f1 Thumb Code 50 principal.o(i.main) + Region$$Table$$Base 0x08000328 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x08000338 Number 0 anon$$obj.o(Region$$Table) __initial_sp 0x20000400 Data 0 startup_stm32f10x_md.o(STACK) @@ -220,48 +223,49 @@ Memory Map of the image Image Entry point : 0x08000105 - Load Region LR_1 (Base: 0x08000000, Size: 0x00000308, Max: 0xffffffff, ABSOLUTE) + Load Region LR_1 (Base: 0x08000000, Size: 0x00000338, Max: 0xffffffff, ABSOLUTE) - Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000308, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000338, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x08000000 0x08000000 0x000000ec Data RO 143 RESET startup_stm32f10x_md.o - 0x080000ec 0x080000ec 0x00000000 Code RO 194 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) - 0x080000ec 0x080000ec 0x00000004 Code RO 197 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) - 0x080000f0 0x080000f0 0x00000004 Code RO 200 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 202 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 204 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) - 0x080000f4 0x080000f4 0x00000008 Code RO 205 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) - 0x080000fc 0x080000fc 0x00000004 Code RO 212 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) - 0x08000100 0x08000100 0x00000000 Code RO 207 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) - 0x08000100 0x08000100 0x00000000 Code RO 209 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) - 0x08000100 0x08000100 0x00000004 Code RO 198 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) - 0x08000104 0x08000104 0x00000024 Code RO 144 * .text startup_stm32f10x_md.o - 0x08000128 0x08000128 0x00000024 Code RO 213 .text mc_w.l(init.o) - 0x0800014c 0x0800014c 0x00000012 Code RO 117 i.MyTimer_Base_Init driver_timer.o - 0x0800015e 0x0800015e 0x00000008 Code RO 151 i.SetSysClock system_stm32f10x.o - 0x08000166 0x08000166 0x00000002 PAD - 0x08000168 0x08000168 0x000000e0 Code RO 152 i.SetSysClockTo72 system_stm32f10x.o - 0x08000248 0x08000248 0x00000060 Code RO 154 i.SystemInit system_stm32f10x.o - 0x080002a8 0x080002a8 0x0000000e Code RO 217 i.__scatterload_copy mc_w.l(handlers.o) - 0x080002b6 0x080002b6 0x00000002 Code RO 218 i.__scatterload_null mc_w.l(handlers.o) - 0x080002b8 0x080002b8 0x0000000e Code RO 219 i.__scatterload_zeroinit mc_w.l(handlers.o) - 0x080002c6 0x080002c6 0x00000002 PAD - 0x080002c8 0x080002c8 0x00000030 Code RO 4 i.main principal.o - 0x080002f8 0x080002f8 0x00000010 Data RO 215 Region$$Table anon$$obj.o + 0x08000000 0x08000000 0x000000ec Data RO 149 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000000 Code RO 200 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) + 0x080000ec 0x080000ec 0x00000004 Code RO 203 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) + 0x080000f0 0x080000f0 0x00000004 Code RO 206 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 208 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 210 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) + 0x080000f4 0x080000f4 0x00000008 Code RO 211 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) + 0x080000fc 0x080000fc 0x00000004 Code RO 218 .ARM.Collect$$$$0000000E mc_w.l(entry12b.o) + 0x08000100 0x08000100 0x00000000 Code RO 213 .ARM.Collect$$$$0000000F mc_w.l(entry10a.o) + 0x08000100 0x08000100 0x00000000 Code RO 215 .ARM.Collect$$$$00000011 mc_w.l(entry11a.o) + 0x08000100 0x08000100 0x00000004 Code RO 204 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) + 0x08000104 0x08000104 0x00000024 Code RO 150 * .text startup_stm32f10x_md.o + 0x08000128 0x08000128 0x00000024 Code RO 219 .text mc_w.l(init.o) + 0x0800014c 0x0800014c 0x00000028 Code RO 117 i.Activate_TIM driver_timer.o + 0x08000174 0x08000174 0x00000012 Code RO 118 i.MyTimer_Base_Init driver_timer.o + 0x08000186 0x08000186 0x00000008 Code RO 157 i.SetSysClock system_stm32f10x.o + 0x0800018e 0x0800018e 0x00000002 PAD + 0x08000190 0x08000190 0x000000e0 Code RO 158 i.SetSysClockTo72 system_stm32f10x.o + 0x08000270 0x08000270 0x00000060 Code RO 160 i.SystemInit system_stm32f10x.o + 0x080002d0 0x080002d0 0x0000000e Code RO 223 i.__scatterload_copy mc_w.l(handlers.o) + 0x080002de 0x080002de 0x00000002 Code RO 224 i.__scatterload_null mc_w.l(handlers.o) + 0x080002e0 0x080002e0 0x0000000e Code RO 225 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x080002ee 0x080002ee 0x00000002 PAD + 0x080002f0 0x080002f0 0x00000038 Code RO 4 i.main principal.o + 0x08000328 0x08000328 0x00000010 Data RO 221 Region$$Table anon$$obj.o - Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000308, Size: 0x00000000, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000338, Size: 0x00000000, Max: 0xffffffff, ABSOLUTE) **** No section assigned to this execution region **** - Execution Region ER_ZI (Exec base: 0x20000000, Load base: 0x08000308, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_ZI (Exec base: 0x20000000, Load base: 0x08000338, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 - 0x00000400 Zero RW 141 STACK startup_stm32f10x_md.o + 0x20000000 - 0x00000400 Zero RW 147 STACK startup_stm32f10x_md.o ============================================================================== @@ -271,13 +275,13 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 18 0 0 0 0 1408 driver_timer.o - 48 4 0 0 0 207495 principal.o - 36 8 236 0 1024 860 startup_stm32f10x_md.o - 328 28 0 0 0 2181 system_stm32f10x.o + 58 4 0 0 0 1839 driver_timer.o + 56 6 0 0 0 207455 principal.o + 36 8 236 0 1024 840 startup_stm32f10x_md.o + 328 28 0 0 0 2101 system_stm32f10x.o ---------------------------------------------------------------------- - 432 40 252 0 1024 211944 Object Totals + 480 46 252 0 1024 212235 Object Totals 0 0 16 0 0 0 (incl. Generated) 2 0 0 0 0 0 (incl. Padding) @@ -317,15 +321,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 524 56 252 0 1024 212008 Grand Totals - 524 56 252 0 1024 212008 ELF Image Totals - 524 56 252 0 0 0 ROM Totals + 572 62 252 0 1024 212247 Grand Totals + 572 62 252 0 1024 212247 ELF Image Totals + 572 62 252 0 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 776 ( 0.76kB) + Total RO Size (Code + RO Data) 824 ( 0.80kB) Total RW Size (RW Data + ZI Data) 1024 ( 1.00kB) - Total ROM Size (Code + RO Data + RW Data) 776 ( 0.76kB) + Total ROM Size (Code + RO Data + RW Data) 824 ( 0.80kB) ============================================================================== diff --git a/timer_act2/Objects/driver_gpio.o b/timer_act2/Objects/driver_gpio.o index fe662ee..8ee0283 100644 Binary files a/timer_act2/Objects/driver_gpio.o and b/timer_act2/Objects/driver_gpio.o differ diff --git a/timer_act2/Objects/driver_timer.crf b/timer_act2/Objects/driver_timer.crf index a841b48..acb619b 100644 Binary files a/timer_act2/Objects/driver_timer.crf and b/timer_act2/Objects/driver_timer.crf differ diff --git a/timer_act2/Objects/driver_timer.o b/timer_act2/Objects/driver_timer.o index f4f3376..8af7eb6 100644 Binary files a/timer_act2/Objects/driver_timer.o and b/timer_act2/Objects/driver_timer.o differ diff --git a/timer_act2/Objects/principal.crf b/timer_act2/Objects/principal.crf index aa55c73..a59650a 100644 Binary files a/timer_act2/Objects/principal.crf and b/timer_act2/Objects/principal.crf differ diff --git a/timer_act2/Objects/principal.o b/timer_act2/Objects/principal.o index 21c19fe..1ea8550 100644 Binary files a/timer_act2/Objects/principal.o and b/timer_act2/Objects/principal.o differ diff --git a/timer_act2/Objects/startup_stm32f10x_md.o b/timer_act2/Objects/startup_stm32f10x_md.o index 65e1cc1..af001dc 100644 Binary files a/timer_act2/Objects/startup_stm32f10x_md.o and b/timer_act2/Objects/startup_stm32f10x_md.o differ diff --git a/timer_act2/Objects/system_stm32f10x.o b/timer_act2/Objects/system_stm32f10x.o index 82e6e23..c579ac0 100644 Binary files a/timer_act2/Objects/system_stm32f10x.o and b/timer_act2/Objects/system_stm32f10x.o differ diff --git a/timer_act2/Objects/timer_act2.axf b/timer_act2/Objects/timer_act2.axf index 35453c8..e0e5695 100644 Binary files a/timer_act2/Objects/timer_act2.axf and b/timer_act2/Objects/timer_act2.axf differ diff --git a/timer_act2/Objects/timer_act2.build_log.htm b/timer_act2/Objects/timer_act2.build_log.htm index 86c0b1a..0ec7340 100644 --- a/timer_act2/Objects/timer_act2.build_log.htm +++ b/timer_act2/Objects/timer_act2.build_log.htm @@ -21,19 +21,19 @@ Target DLL: UL2CM3.DLL V1.163.9.0 Dialog DLL: TARMSTM.DLL V1.66.0.0

Project:

-C:\Users\chauz\Documents_non_drive\INSA\4A\S7\Microcontroleur\bateau-microcontrolleur\timer_act2\timer_act2.uvprojx +C:\Users\chauz\Documents_non_drive\INSA\4A\S7\TP_microcontroleur\timer_act2\timer_act2.uvprojx Project File Date: 09/20/2021

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' -Build target 'Simulation' +Rebuild target 'Simulation' assembling startup_stm32f10x_md.s... compiling principal.c... +compiling system_stm32f10x.c... compiling Driver_TIMER.c... compiling Driver_GPIO.c... -compiling system_stm32f10x.c... linking... -Program Size: Code=524 RO-data=252 RW-data=0 ZI-data=1024 +Program Size: Code=572 RO-data=252 RW-data=0 ZI-data=1024 ".\Objects\timer_act2.axf" - 0 Error(s), 0 Warning(s).

Software Packages used:

@@ -62,8 +62,8 @@ Package Vendor: Keil * Component: Keil::Device:Startup:1.0.0 Source file: Device\Source\ARM\startup_stm32f10x_md.s - Include file: RTE_Driver\Config\RTE_Device.h Source file: Device\Source\system_stm32f10x.c + Include file: RTE_Driver\Config\RTE_Device.h Source file: Device\Source\ARM\STM32F1xx_OPT.s Build Time Elapsed: 00:00:00 diff --git a/timer_act2/Objects/timer_act2.htm b/timer_act2/Objects/timer_act2.htm index 2b0ad5a..c6c324b 100644 --- a/timer_act2/Objects/timer_act2.htm +++ b/timer_act2/Objects/timer_act2.htm @@ -3,7 +3,7 @@ Static Call Graph - [.\Objects\timer_act2.axf]

Static Call Graph for image .\Objects\timer_act2.axf

-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Sep 20 16:19:48 2021 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Fri Sep 24 16:10:21 2021

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

Call chain for Maximum Stack Depth:

@@ -90,7 +90,7 @@ Global Symbols

__main (Thumb, 0 bytes, Stack size unknown bytes, entry.o(.ARM.Collect$$$$00000000))
[Address Reference Count : 1]

  • startup_stm32f10x_md.o(.text)
-

_main_stk (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001)) +

_main_stk (Thumb, 0 bytes, Stack size unknown bytes, entry2.o(.ARM.Collect$$$$00000001))

_main_scatterload (Thumb, 0 bytes, Stack size unknown bytes, entry5.o(.ARM.Collect$$$$00000004))

[Calls]

  • >>   __scatterload @@ -100,17 +100,17 @@ Global Symbols

    [Called By]
    • >>   __scatterload
    -

    _main_clock (Thumb, 0 bytes, Stack size unknown bytes, entry7b.o(.ARM.Collect$$$$00000008)) +

    _main_clock (Thumb, 0 bytes, Stack size unknown bytes, entry7b.o(.ARM.Collect$$$$00000008)) -

    _main_cpp_init (Thumb, 0 bytes, Stack size unknown bytes, entry8b.o(.ARM.Collect$$$$0000000A)) +

    _main_cpp_init (Thumb, 0 bytes, Stack size unknown bytes, entry8b.o(.ARM.Collect$$$$0000000A)) -

    _main_init (Thumb, 0 bytes, Stack size unknown bytes, entry9a.o(.ARM.Collect$$$$0000000B)) +

    _main_init (Thumb, 0 bytes, Stack size unknown bytes, entry9a.o(.ARM.Collect$$$$0000000B)) -

    __rt_lib_shutdown_fini (Thumb, 0 bytes, Stack size unknown bytes, entry12b.o(.ARM.Collect$$$$0000000E)) +

    __rt_lib_shutdown_fini (Thumb, 0 bytes, Stack size unknown bytes, entry12b.o(.ARM.Collect$$$$0000000E)) -

    __rt_final_cpp (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000F)) +

    __rt_final_cpp (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000F)) -

    __rt_final_exit (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$00000011)) +

    __rt_final_exit (Thumb, 0 bytes, Stack size unknown bytes, entry11a.o(.ARM.Collect$$$$00000011))

    Reset_Handler (Thumb, 8 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text)) @@ -316,7 +316,11 @@ Global Symbols
    [Called By]

    • >>   _main_scatterload
    -

    __scatterload_rt2 (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED) +

    __scatterload_rt2 (Thumb, 0 bytes, Stack size 0 bytes, init.o(.text), UNUSED) + +

    Activate_TIM (Thumb, 36 bytes, Stack size 0 bytes, driver_timer.o(i.Activate_TIM)) +

    [Called By]

    • >>   main +

    MyTimer_Base_Init (Thumb, 18 bytes, Stack size 0 bytes, driver_timer.o(i.MyTimer_Base_Init))

    [Called By]

    • >>   main @@ -329,16 +333,17 @@ Global Symbols

    [Address Reference Count : 1]
    • startup_stm32f10x_md.o(.text)
    -

    __scatterload_copy (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_copy), UNUSED) +

    __scatterload_copy (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_copy), UNUSED) -

    __scatterload_null (Thumb, 2 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_null), UNUSED) +

    __scatterload_null (Thumb, 2 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_null), UNUSED) -

    __scatterload_zeroinit (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED) +

    __scatterload_zeroinit (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED) -

    main (Thumb, 44 bytes, Stack size 16 bytes, principal.o(i.main)) +

    main (Thumb, 50 bytes, Stack size 16 bytes, principal.o(i.main))

    [Stack]

    • Max Depth = 16
    • Call Chain = main

    [Calls]
    • >>   MyTimer_Base_Init +
    • >>   Activate_TIM

    [Address Reference Count : 1]
    • entry9a.o(.ARM.Collect$$$$0000000B)

    diff --git a/timer_act2/Objects/timer_act2_Simulation.dep b/timer_act2/Objects/timer_act2_Simulation.dep index ebd874f..123ffca 100644 --- a/timer_act2/Objects/timer_act2_Simulation.dep +++ b/timer_act2/Objects/timer_act2_Simulation.dep @@ -1,6 +1,6 @@ Dependencies for Project 'timer_act2', Target 'Simulation': (DO NOT MODIFY !) CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC -F (.\Source\principal.c)(0x61489856)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes -I.\RTE\Device\STM32F103RB -I.\RTE\_Simulation -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d) +F (.\Source\principal.c)(0x614DDC4B)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes -I.\RTE\Device\STM32F103RB -I.\RTE\_Simulation -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) I (.\RTE\_Simulation\RTE_Components.h)(0x61487B1E) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392) @@ -9,7 +9,7 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E836932) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) -I (.\Includes\Driver_TIMER.h)(0x61489859) +I (.\Includes\Driver_TIMER.h)(0x614DD6EB) F (.\Includes\Driver_GPIO.c)(0x61489146)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes -I.\RTE\Device\STM32F103RB -I.\RTE\_Simulation -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\driver_gpio.o --omf_browse .\objects\driver_gpio.crf --depend .\objects\driver_gpio.d) I (Includes\Driver_GPIO.h)(0x61476D7E) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) @@ -21,8 +21,8 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) F (.\Includes\Driver_GPIO.h)(0x61476D7E)() -F (.\Includes\Driver_TIMER.c)(0x6148985E)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes -I.\RTE\Device\STM32F103RB -I.\RTE\_Simulation -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\driver_timer.o --omf_browse .\objects\driver_timer.crf --depend .\objects\driver_timer.d) -I (Includes\Driver_TIMER.h)(0x61489859) +F (.\Includes\Driver_TIMER.c)(0x614DD6E5)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes -I.\RTE\Device\STM32F103RB -I.\RTE\_Simulation -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\driver_timer.o --omf_browse .\objects\driver_timer.crf --depend .\objects\driver_timer.d) +I (Includes\Driver_TIMER.h)(0x614DD6EB) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) I (.\RTE\_Simulation\RTE_Components.h)(0x61487B1E) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392) @@ -31,7 +31,7 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E836932) I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) -F (.\Includes\Driver_TIMER.h)(0x61489859)() +F (.\Includes\Driver_TIMER.h)(0x614DD6EB)() F (RTE\Device\STM32F103RB\RTE_Device.h)(0x59284216)() F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x58259ADC)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1" -I.\RTE\Device\STM32F103RB -I.\RTE\_Simulation -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --pd "__UVISION_VERSION SETA 533" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1" --list .\listings\startup_stm32f10x_md.lst --xref -o .\objects\startup_stm32f10x_md.o --depend .\objects\startup_stm32f10x_md.d) F (RTE\Device\STM32F103RB\system_stm32f10x.c)(0x58259ADC)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes -I.\RTE\Device\STM32F103RB -I.\RTE\_Simulation -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\system_stm32f10x.o --omf_browse .\objects\system_stm32f10x.crf --depend .\objects\system_stm32f10x.d) diff --git a/timer_act2/Source/principal.c b/timer_act2/Source/principal.c index 48a90c4..97c7f05 100644 --- a/timer_act2/Source/principal.c +++ b/timer_act2/Source/principal.c @@ -10,12 +10,16 @@ int main(void) { uint16_t PSC ; } MyTimer_Struct_TypeDef ; */ -//activer la clock du timer + MyTimer_Struct_TypeDef MonTimer ; MonTimer.Timer = TIM1 ; - MonTimer.ARR = 65454; - MonTimer.PSC = 550 ; + //méthode PGCD + //MonTimer.ARR = 65454; + //MonTimer.PSC = 550 ; + MonTimer.ARR = 18000; + MonTimer.PSC = 2000 ; MyTimer_Base_Init(&MonTimer); + Activate_TIM(1); MyTimer_Base_Start(MonTimer.Timer); diff --git a/timer_act2/timer_act2.uvguix.chauz b/timer_act2/timer_act2.uvguix.chauz index b941e68..9c90d02 100644 --- a/timer_act2/timer_act2.uvguix.chauz +++ b/timer_act2/timer_act2.uvguix.chauz @@ -15,17 +15,17 @@ 38003 Registers - 115 67 + 115 100 346 Code Coverage - 770 160 + 770 560 204 Performance Analyzer - 280 139 139 372 + 280 139 139 772 @@ -110,8 +110,8 @@ 0 - 1126 - 01000000040000000100000001000000010000000100000000000000020000000000000001000000010000000000000028000000280000000100000006000000000000000100000073433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C4D6963726F636F6E74726F6C6575725C6261746561752D6D6963726F636F6E74726F6C6C6575725C74696D65725F616374325C536F757263655C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000C5D4F200FFFFFFFF78433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C4D6963726F636F6E74726F6C6575725C6261746561752D6D6963726F636F6E74726F6C6C6575725C74696D65725F616374325C496E636C756465735C4472697665725F54494D45522E68000000000E4472697665725F54494D45522E6800000000FFDC7800FFFFFFFF77433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C4D6963726F636F6E74726F6C6575725C6261746561752D6D6963726F636F6E74726F6C6C6575725C74696D65725F616374325C496E636C756465735C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000BECEA100FFFFFFFF78433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C4D6963726F636F6E74726F6C6575725C6261746561752D6D6963726F636F6E74726F6C6C6575725C74696D65725F616374325C496E636C756465735C4472697665725F54494D45522E63000000000E4472697665725F54494D45522E6300000000F0A0A100FFFFFFFF8E433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C4D6963726F636F6E74726F6C6575725C6261746561752D6D6963726F636F6E74726F6C6C6575725C74696D65725F616374325C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000BCA8E100FFFFFFFF8A433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C4D6963726F636F6E74726F6C6575725C6261746561752D6D6963726F636F6E74726F6C6C6575725C74696D65725F616374325C5254455C4465766963655C53544D33324631303352425C73797374656D5F73746D3332663130782E63000000001273797374656D5F73746D3332663130782E63000000009CC1B600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F0000000660000000006000067020000 + 1000 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000600000000000000010000005E433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C54505F6D6963726F636F6E74726F6C6575725C74696D65725F616374325C536F757263655C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000C5D4F200FFFFFFFF63433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C54505F6D6963726F636F6E74726F6C6575725C74696D65725F616374325C496E636C756465735C4472697665725F54494D45522E68000000000E4472697665725F54494D45522E6800000000FFDC7800FFFFFFFF62433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C54505F6D6963726F636F6E74726F6C6575725C74696D65725F616374325C496E636C756465735C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000BECEA100FFFFFFFF63433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C54505F6D6963726F636F6E74726F6C6575725C74696D65725F616374325C496E636C756465735C4472697665725F54494D45522E63000000000E4472697665725F54494D45522E6300000000F0A0A100FFFFFFFF79433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C54505F6D6963726F636F6E74726F6C6575725C74696D65725F616374325C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000BCA8E100FFFFFFFF75433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C54505F6D6963726F636F6E74726F6C6575725C74696D65725F616374325C5254455C4465766963655C53544D33324631303352425C73797374656D5F73746D3332663130782E63000000001273797374656D5F73746D3332663130782E63000000009CC1B600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F0000000660000000006000067020000 @@ -1806,7 +1806,7 @@ File 2566 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000C6770696F5F74797065646566960000000000000001000C6770696F5F7479706564656600000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000000000C0000000000000000000000000000000001000000010000000180F4B00000000000000D000000000000000000000000000000000100000001000000018036B10000000000000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000C6770696F5F74797065646566960000000000000001000C6770696F5F7479706564656600000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 993 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000A53696D756C6174696F6E960000000000000002000A53696D756C6174696F6E08636172746553544D00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050000000000A53696D756C6174696F6E960000000000000002000A53696D756C6174696F6E08636172746553544D00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1875,7 +1875,7 @@ 16 - C40000006600000070040000D4000000 + C40000006600000000060000D4010000 @@ -1911,7 +1911,7 @@ 0 16 - 0300000066000000BD00000078010000 + 0300000066000000BD0000006F020000 16 @@ -1951,7 +1951,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -1971,7 +1971,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -1991,7 +1991,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -2031,7 +2031,7 @@ 0 16 - C7000000660000006D040000A4000000 + C700000066000000FD050000A4010000 16 @@ -2071,7 +2071,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -2091,7 +2091,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -2111,7 +2111,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -2131,7 +2131,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -2151,7 +2151,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -2171,7 +2171,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -2191,7 +2191,7 @@ 0 16 - 0300000066000000BD00000078010000 + 0300000066000000BD0000006F020000 16 @@ -2211,7 +2211,7 @@ 0 16 - 0300000066000000BD00000078010000 + 0300000066000000BD0000006F020000 16 @@ -2311,7 +2311,7 @@ 0 16 - C7000000660000006D040000A4000000 + C700000066000000FD050000A4010000 16 @@ -2371,7 +2371,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -2391,7 +2391,7 @@ 0 16 - C7000000660000006D040000A4000000 + C700000066000000FD050000A4010000 16 @@ -2411,7 +2411,7 @@ 0 16 - C7000000660000006D040000A4000000 + C700000066000000FD050000A4010000 16 @@ -2431,7 +2431,7 @@ 0 16 - C7000000660000006D040000A4000000 + C700000066000000FD050000A4010000 16 @@ -2951,7 +2951,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -2971,7 +2971,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -3031,7 +3031,7 @@ 0 16 - C7000000660000006D040000A4000000 + C700000066000000FD050000A4010000 16 @@ -3531,7 +3531,7 @@ 0 16 - 07030000A302000035050000F5020000 + 07030000A3020000FD050000F5020000 16 @@ -3540,7 +3540,7 @@ 3311 - 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFC4000000BD01000000060000C101000001000000010000000400000001000000D4FEFFFF02010000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000C40000006600000070040000D4000000C40000004F00000000060000BD0100000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657201000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF03000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000B00300006600000070040000BC010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFC00000004F000000C400000088020000010000000200000004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000C0000000A8010000000000004F000000C0000000880200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000088020000000600008C02000001000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB090000018000800000010000003C020000AC010000700400002E020000040300008C020000000600000E03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFF000300008C020000040300000E03000001000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000A501000070040000A9010000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000000000000000000C0010000700400002E02000000000000A901000070040000170200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFC4000000BD01000000060000C101000001000000010000100400000001000000D4FEFFFF02010000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000C40000006600000000060000D4010000C40000004F00000000060000BD0100000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657201000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF03000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFFAC0300004F000000B0030000A5010000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000B00300006600000070040000BC010000B00300004F00000070040000A501000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFC00000004F000000C400000088020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000C00000009F020000000000004F000000C0000000880200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF0000000088020000000600008C02000001000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB0900000180008000000100000004030000A30200000006000025030000040300008C020000000600000E03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFF000300008C020000040300000E03000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF00000000A501000070040000A9010000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000000000000000000C0010000700400002E02000000000000A901000070040000170200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 @@ -3563,7 +3563,7 @@ Build 955 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000000002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050FFFFFFFF00960000000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000000240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3606,9 +3606,9 @@ 0 .\Source\principal.c - 28 + 10 1 - 13 + 21 1 0 @@ -3617,25 +3617,25 @@ .\Includes\Driver_TIMER.h 0 1 - 18 + 19 1 0 .\Includes\Driver_GPIO.c - 0 - 56 - 61 + 3 + 1 + 13 1 0 .\Includes\Driver_TIMER.c - 1 + 17 1 - 15 + 17 1 0 @@ -3661,4 +3661,8 @@ + + .\Source\principal.c 4 + + diff --git a/timer_act2/timer_act2.uvoptx b/timer_act2/timer_act2.uvoptx index 35084ed..d226992 100644 --- a/timer_act2/timer_act2.uvoptx +++ b/timer_act2/timer_act2.uvoptx @@ -125,7 +125,7 @@ 0 DLGDARM - (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0) + (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=91,141,311,601,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=791,113,1385,864,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0) 0 @@ -185,7 +185,7 @@ 0 `TIM1_CNT - FF00000000000000000000000000E0FFFFFFEF410000000000000000000000000000000054494D315F434E540000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F180000000000000000000000000000000000000004010008 + FF000000000000000000000000000000C093D1400000000000000000000000000000000054494D315F434E540000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F180000000000000000000000000000000000000004010008