From b34457b9157b563f1acd5f0791cdfe947e1ddea5 Mon Sep 17 00:00:00 2001 From: Robin M Date: Mon, 20 Mar 2023 10:02:17 +0100 Subject: [PATCH] Driver_Timer Done ! Need further test notheless --- drivers/Driver_Timer.c | 33 ++++++ drivers/Driver_Timer.h | 7 +- projet_1/Listings/tp_sim.map | 125 +++++++++++--------- projet_1/Objects/driver_timer.d | 2 +- projet_1/Objects/driver_timer.o | Bin 0 -> 5288 bytes projet_1/Objects/main.d | 2 +- projet_1/Objects/main.o | Bin 3408 -> 4964 bytes projet_1/Objects/tp_board.dep | 14 ++- projet_1/Objects/tp_sim.axf | Bin 14180 -> 17904 bytes projet_1/Objects/tp_sim.build_log.htm | 3 +- projet_1/Objects/tp_sim.dep | 40 ++++++- projet_1/Objects/tp_sim.htm | 46 +++++--- projet_1/Objects/tp_sim.lnp | 1 + projet_1/src/main.c | 21 ++++ projet_1/tp.uvguix.robin | 157 ++++++++++++++------------ projet_1/tp.uvoptx | 66 ++++++++++- projet_1/tp.uvprojx | 22 +++- 17 files changed, 377 insertions(+), 162 deletions(-) create mode 100644 projet_1/Objects/driver_timer.o diff --git a/drivers/Driver_Timer.c b/drivers/Driver_Timer.c index e69de29..ad01a9e 100644 --- a/drivers/Driver_Timer.c +++ b/drivers/Driver_Timer.c @@ -0,0 +1,33 @@ +#include "Driver_Timer.h" + + +void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer) +{ + // Activation de l'horloge correspondante au Timer + if (Timer->Timer == TIM1) { + RCC->APB2ENR |= RCC_APB2ENR_TIM1EN; // Voir p140 du manual + } else if (Timer->Timer == TIM2) { + RCC->APB1ENR |= RCC_APB1ENR_TIM2EN; + } else if (Timer->Timer == TIM3) { + RCC->APB1ENR |= RCC_APB1ENR_TIM3EN; + } else if (Timer->Timer == TIM4) { + RCC->APB1ENR |= RCC_APB1ENR_TIM4EN; + } else if (Timer->Timer == TIM5) { + //RCC->APB1ENR |= RCC_APB1ENR_TIM5EN; + } + + // Configuration du Timer + // Le compteur du registre PSC commence à zéro, donc on soustrait 1 pour éviter les débordements. + Timer->Timer->PSC = Timer->PSC - 1; // Valeur du prescaler + Timer->Timer->ARR = Timer->ARR - 1; // Valeur de l'autoreload -> Quand cette valeur est atteinte le timer est réinitialisé + Timer->Timer->CR1 |= TIM_CR1_ARPE; // Active "Autoreload preload" pour prendre en compte immédiatement les modifications de la valeur de l'autoreload (ARR) lors du prochain cycle de Timer. + +} + +void MyTimer_Base_Start(MyTimer_Struct_TypeDef * Timer) { + Timer->Timer->CR1 |= TIM_CR1_CEN; // Démarre le Timer +} + +void MyTimer_Base_Stop(MyTimer_Struct_TypeDef * Timer) { + Timer->Timer->CR1 &= ~TIM_CR1_CEN; // Arrête le Timer +} \ No newline at end of file diff --git a/drivers/Driver_Timer.h b/drivers/Driver_Timer.h index a9f306b..abb16c4 100644 --- a/drivers/Driver_Timer.h +++ b/drivers/Driver_Timer.h @@ -13,8 +13,11 @@ typedef struct void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer); +void MyTimer_Base_Start(MyTimer_Struct_TypeDef * Timer); +void MyTimer_Base_Stop(MyTimer_Struct_TypeDef * Timer); -#define MyTimer_Base_Start(Timer) -#define MyTimer_Base_Stop(Timer) + +//#define MyTimer_Base_Start(Timer) +//#define MyTimer_Base_Stop(Timer) #endif \ No newline at end of file diff --git a/projet_1/Listings/tp_sim.map b/projet_1/Listings/tp_sim.map index 3ac9316..813fda8 100644 --- a/projet_1/Listings/tp_sim.map +++ b/projet_1/Listings/tp_sim.map @@ -6,14 +6,19 @@ Section Cross References main.o(.ARM.exidx.text.delay) refers to main.o(.text.delay) for [Anonymous Symbol] main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Init) for MyGPIO_Init - main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Read) for MyGPIO_Read + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Base_Init) for MyTimer_Base_Init + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Base_Start) for MyTimer_Base_Start main.o(.text.main) refers to driver_gpio.o(.text.MyGPIO_Toggle) for MyGPIO_Toggle + main.o(.text.main) refers to driver_timer.o(.text.MyTimer_Base_Stop) for MyTimer_Base_Stop main.o(.ARM.exidx.text.main) refers to main.o(.text.main) for [Anonymous Symbol] driver_gpio.o(.ARM.exidx.text.MyGPIO_Init) refers to driver_gpio.o(.text.MyGPIO_Init) for [Anonymous Symbol] driver_gpio.o(.ARM.exidx.text.MyGPIO_Read) refers to driver_gpio.o(.text.MyGPIO_Read) for [Anonymous Symbol] driver_gpio.o(.ARM.exidx.text.MyGPIO_Set) refers to driver_gpio.o(.text.MyGPIO_Set) for [Anonymous Symbol] driver_gpio.o(.ARM.exidx.text.MyGPIO_Reset) refers to driver_gpio.o(.text.MyGPIO_Reset) for [Anonymous Symbol] driver_gpio.o(.ARM.exidx.text.MyGPIO_Toggle) refers to driver_gpio.o(.text.MyGPIO_Toggle) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.MyTimer_Base_Init) refers to driver_timer.o(.text.MyTimer_Base_Init) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.MyTimer_Base_Start) refers to driver_timer.o(.text.MyTimer_Base_Start) for [Anonymous Symbol] + driver_timer.o(.ARM.exidx.text.MyTimer_Base_Stop) refers to driver_timer.o(.text.MyTimer_Base_Stop) for [Anonymous Symbol] startup_stm32f10x_md.o(RESET) refers to startup_stm32f10x_md.o(STACK) for __initial_sp startup_stm32f10x_md.o(RESET) refers to startup_stm32f10x_md.o(.text) for Reset_Handler startup_stm32f10x_md.o(.text) refers to system_stm32f10x.o(.text.SystemInit) for SystemInit @@ -50,12 +55,17 @@ Removing Unused input sections from the image. Removing main.o(.ARM.use_no_argv), (4 bytes). Removing driver_gpio.o(.text), (0 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Init), (8 bytes). + Removing driver_gpio.o(.text.MyGPIO_Read), (10 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Read), (8 bytes). Removing driver_gpio.o(.text.MyGPIO_Set), (14 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Set), (8 bytes). Removing driver_gpio.o(.text.MyGPIO_Reset), (10 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Reset), (8 bytes). Removing driver_gpio.o(.ARM.exidx.text.MyGPIO_Toggle), (8 bytes). + Removing driver_timer.o(.text), (0 bytes). + Removing driver_timer.o(.ARM.exidx.text.MyTimer_Base_Init), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.MyTimer_Base_Start), (8 bytes). + Removing driver_timer.o(.ARM.exidx.text.MyTimer_Base_Stop), (8 bytes). Removing startup_stm32f10x_md.o(HEAP), (512 bytes). Removing system_stm32f10x.o(.text), (0 bytes). Removing system_stm32f10x.o(.ARM.exidx.text.SystemInit), (8 bytes). @@ -64,7 +74,7 @@ Removing Unused input sections from the image. Removing system_stm32f10x.o(.data.SystemCoreClock), (4 bytes). Removing system_stm32f10x.o(.rodata.AHBPrescTable), (16 bytes). -20 unused section(s) (total 744 bytes) removed from the image. +25 unused section(s) (total 778 bytes) removed from the image. ============================================================================== @@ -88,6 +98,7 @@ Image Symbol Table ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE Driver_GPIO.c 0x00000000 Number 0 driver_gpio.o ABSOLUTE + Driver_Timer.c 0x00000000 Number 0 driver_timer.o ABSOLUTE RTE/Device/STM32F103RB/startup_stm32f10x_md.s 0x00000000 Number 0 startup_stm32f10x_md.o ABSOLUTE dc.s 0x00000000 Number 0 dc.o ABSOLUTE handlers.s 0x00000000 Number 0 handlers.o ABSOLUTE @@ -108,13 +119,15 @@ Image Symbol Table .text 0x08000100 Section 36 startup_stm32f10x_md.o(.text) .text 0x08000124 Section 36 init.o(.text) [Anonymous Symbol] 0x08000148 Section 0 driver_gpio.o(.text.MyGPIO_Init) - [Anonymous Symbol] 0x080001c8 Section 0 driver_gpio.o(.text.MyGPIO_Read) - [Anonymous Symbol] 0x080001d4 Section 0 driver_gpio.o(.text.MyGPIO_Toggle) - [Anonymous Symbol] 0x080001e4 Section 0 system_stm32f10x.o(.text.SystemInit) - [Anonymous Symbol] 0x080002f4 Section 0 main.o(.text.main) - i.__scatterload_copy 0x0800033a Section 14 handlers.o(i.__scatterload_copy) - i.__scatterload_null 0x08000348 Section 2 handlers.o(i.__scatterload_null) - i.__scatterload_zeroinit 0x0800034a Section 14 handlers.o(i.__scatterload_zeroinit) + [Anonymous Symbol] 0x080001c8 Section 0 driver_gpio.o(.text.MyGPIO_Toggle) + [Anonymous Symbol] 0x080001d8 Section 0 driver_timer.o(.text.MyTimer_Base_Init) + [Anonymous Symbol] 0x08000270 Section 0 driver_timer.o(.text.MyTimer_Base_Start) + [Anonymous Symbol] 0x0800027c Section 0 driver_timer.o(.text.MyTimer_Base_Stop) + [Anonymous Symbol] 0x08000288 Section 0 system_stm32f10x.o(.text.SystemInit) + [Anonymous Symbol] 0x08000398 Section 0 main.o(.text.main) + i.__scatterload_copy 0x08000406 Section 14 handlers.o(i.__scatterload_copy) + i.__scatterload_null 0x08000414 Section 2 handlers.o(i.__scatterload_null) + i.__scatterload_zeroinit 0x08000416 Section 14 handlers.o(i.__scatterload_zeroinit) STACK 0x20000000 Section 1024 startup_stm32f10x_md.o(STACK) Global Symbols @@ -195,15 +208,17 @@ Image Symbol Table __scatterload 0x08000125 Thumb Code 28 init.o(.text) __scatterload_rt2 0x08000125 Thumb Code 0 init.o(.text) MyGPIO_Init 0x08000149 Thumb Code 112 driver_gpio.o(.text.MyGPIO_Init) - MyGPIO_Read 0x080001c9 Thumb Code 10 driver_gpio.o(.text.MyGPIO_Read) - MyGPIO_Toggle 0x080001d5 Thumb Code 14 driver_gpio.o(.text.MyGPIO_Toggle) - SystemInit 0x080001e5 Thumb Code 272 system_stm32f10x.o(.text.SystemInit) - main 0x080002f5 Thumb Code 70 main.o(.text.main) - __scatterload_copy 0x0800033b Thumb Code 14 handlers.o(i.__scatterload_copy) - __scatterload_null 0x08000349 Thumb Code 2 handlers.o(i.__scatterload_null) - __scatterload_zeroinit 0x0800034b Thumb Code 14 handlers.o(i.__scatterload_zeroinit) - Region$$Table$$Base 0x08000358 Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x08000368 Number 0 anon$$obj.o(Region$$Table) + MyGPIO_Toggle 0x080001c9 Thumb Code 14 driver_gpio.o(.text.MyGPIO_Toggle) + MyTimer_Base_Init 0x080001d9 Thumb Code 152 driver_timer.o(.text.MyTimer_Base_Init) + MyTimer_Base_Start 0x08000271 Thumb Code 12 driver_timer.o(.text.MyTimer_Base_Start) + MyTimer_Base_Stop 0x0800027d Thumb Code 12 driver_timer.o(.text.MyTimer_Base_Stop) + SystemInit 0x08000289 Thumb Code 272 system_stm32f10x.o(.text.SystemInit) + main 0x08000399 Thumb Code 110 main.o(.text.main) + __scatterload_copy 0x08000407 Thumb Code 14 handlers.o(i.__scatterload_copy) + __scatterload_null 0x08000415 Thumb Code 2 handlers.o(i.__scatterload_null) + __scatterload_zeroinit 0x08000417 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) + Region$$Table$$Base 0x08000424 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x08000434 Number 0 anon$$obj.o(Region$$Table) __initial_sp 0x20000400 Data 0 startup_stm32f10x_md.o(STACK) @@ -214,47 +229,48 @@ Memory Map of the image Image Entry point : 0x08000101 - Load Region LR_1 (Base: 0x08000000, Size: 0x00000368, Max: 0xffffffff, ABSOLUTE) + Load Region LR_1 (Base: 0x08000000, Size: 0x00000434, Max: 0xffffffff, ABSOLUTE) - Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000368, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000434, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x08000000 0x08000000 0x000000ec Data RO 33 RESET startup_stm32f10x_md.o - 0x080000ec 0x080000ec 0x00000000 Code RO 54 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) - 0x080000ec 0x080000ec 0x00000004 Code RO 57 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) - 0x080000f0 0x080000f0 0x00000004 Code RO 60 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 62 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) - 0x080000f4 0x080000f4 0x00000000 Code RO 64 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) - 0x080000f4 0x080000f4 0x00000008 Code RO 65 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) - 0x080000fc 0x080000fc 0x00000000 Code RO 67 .ARM.Collect$$$$0000000D mc_w.l(entry10a.o) - 0x080000fc 0x080000fc 0x00000000 Code RO 69 .ARM.Collect$$$$0000000F mc_w.l(entry11a.o) - 0x080000fc 0x080000fc 0x00000004 Code RO 58 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) - 0x08000100 0x08000100 0x00000024 Code RO 34 * .text startup_stm32f10x_md.o - 0x08000124 0x08000124 0x00000024 Code RO 71 .text mc_w.l(init.o) + 0x08000000 0x08000000 0x000000ec Data RO 47 RESET startup_stm32f10x_md.o + 0x080000ec 0x080000ec 0x00000000 Code RO 68 * .ARM.Collect$$$$00000000 mc_w.l(entry.o) + 0x080000ec 0x080000ec 0x00000004 Code RO 71 .ARM.Collect$$$$00000001 mc_w.l(entry2.o) + 0x080000f0 0x080000f0 0x00000004 Code RO 74 .ARM.Collect$$$$00000004 mc_w.l(entry5.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 76 .ARM.Collect$$$$00000008 mc_w.l(entry7b.o) + 0x080000f4 0x080000f4 0x00000000 Code RO 78 .ARM.Collect$$$$0000000A mc_w.l(entry8b.o) + 0x080000f4 0x080000f4 0x00000008 Code RO 79 .ARM.Collect$$$$0000000B mc_w.l(entry9a.o) + 0x080000fc 0x080000fc 0x00000000 Code RO 81 .ARM.Collect$$$$0000000D mc_w.l(entry10a.o) + 0x080000fc 0x080000fc 0x00000000 Code RO 83 .ARM.Collect$$$$0000000F mc_w.l(entry11a.o) + 0x080000fc 0x080000fc 0x00000004 Code RO 72 .ARM.Collect$$$$00002712 mc_w.l(entry2.o) + 0x08000100 0x08000100 0x00000024 Code RO 48 * .text startup_stm32f10x_md.o + 0x08000124 0x08000124 0x00000024 Code RO 85 .text mc_w.l(init.o) 0x08000148 0x08000148 0x00000080 Code RO 14 .text.MyGPIO_Init driver_gpio.o - 0x080001c8 0x080001c8 0x0000000a Code RO 16 .text.MyGPIO_Read driver_gpio.o - 0x080001d2 0x080001d2 0x00000002 PAD - 0x080001d4 0x080001d4 0x0000000e Code RO 22 .text.MyGPIO_Toggle driver_gpio.o - 0x080001e2 0x080001e2 0x00000002 PAD - 0x080001e4 0x080001e4 0x00000110 Code RO 41 .text.SystemInit system_stm32f10x.o - 0x080002f4 0x080002f4 0x00000046 Code RO 4 .text.main main.o - 0x0800033a 0x0800033a 0x0000000e Code RO 75 i.__scatterload_copy mc_w.l(handlers.o) - 0x08000348 0x08000348 0x00000002 Code RO 76 i.__scatterload_null mc_w.l(handlers.o) - 0x0800034a 0x0800034a 0x0000000e Code RO 77 i.__scatterload_zeroinit mc_w.l(handlers.o) - 0x08000358 0x08000358 0x00000010 Data RO 74 Region$$Table anon$$obj.o + 0x080001c8 0x080001c8 0x0000000e Code RO 22 .text.MyGPIO_Toggle driver_gpio.o + 0x080001d6 0x080001d6 0x00000002 PAD + 0x080001d8 0x080001d8 0x00000098 Code RO 32 .text.MyTimer_Base_Init driver_timer.o + 0x08000270 0x08000270 0x0000000c Code RO 34 .text.MyTimer_Base_Start driver_timer.o + 0x0800027c 0x0800027c 0x0000000c Code RO 36 .text.MyTimer_Base_Stop driver_timer.o + 0x08000288 0x08000288 0x00000110 Code RO 55 .text.SystemInit system_stm32f10x.o + 0x08000398 0x08000398 0x0000006e Code RO 4 .text.main main.o + 0x08000406 0x08000406 0x0000000e Code RO 89 i.__scatterload_copy mc_w.l(handlers.o) + 0x08000414 0x08000414 0x00000002 Code RO 90 i.__scatterload_null mc_w.l(handlers.o) + 0x08000416 0x08000416 0x0000000e Code RO 91 i.__scatterload_zeroinit mc_w.l(handlers.o) + 0x08000424 0x08000424 0x00000010 Data RO 88 Region$$Table anon$$obj.o - Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000368, Size: 0x00000000, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000434, Size: 0x00000000, Max: 0xffffffff, ABSOLUTE) **** No section assigned to this execution region **** - Execution Region ER_ZI (Exec base: 0x20000000, Load base: 0x08000368, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_ZI (Exec base: 0x20000000, Load base: 0x08000434, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 - 0x00000400 Zero RW 31 STACK startup_stm32f10x_md.o + 0x20000000 - 0x00000400 Zero RW 45 STACK startup_stm32f10x_md.o ============================================================================== @@ -264,15 +280,16 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name - 152 16 0 0 0 2108 driver_gpio.o - 70 0 0 0 0 1166 main.o + 142 16 0 0 0 2108 driver_gpio.o + 176 0 0 0 0 2375 driver_timer.o + 110 0 0 0 0 2206 main.o 36 8 236 0 1024 840 startup_stm32f10x_md.o 272 0 0 0 0 2793 system_stm32f10x.o ---------------------------------------------------------------------- - 534 24 252 0 1024 6907 Object Totals + 738 24 252 0 1024 10322 Object Totals 0 0 16 0 0 0 (incl. Generated) - 4 0 0 0 0 0 (incl. Padding) + 2 0 0 0 0 0 (incl. Padding) ---------------------------------------------------------------------- @@ -309,15 +326,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 620 40 252 0 1024 7087 Grand Totals - 620 40 252 0 1024 7087 ELF Image Totals - 620 40 252 0 0 0 ROM Totals + 824 40 252 0 1024 10482 Grand Totals + 824 40 252 0 1024 10482 ELF Image Totals + 824 40 252 0 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 872 ( 0.85kB) + Total RO Size (Code + RO Data) 1076 ( 1.05kB) Total RW Size (RW Data + ZI Data) 1024 ( 1.00kB) - Total ROM Size (Code + RO Data + RW Data) 872 ( 0.85kB) + Total ROM Size (Code + RO Data + RW Data) 1076 ( 1.05kB) ============================================================================== diff --git a/projet_1/Objects/driver_timer.d b/projet_1/Objects/driver_timer.d index f096ea7..8a06d6a 100644 --- a/projet_1/Objects/driver_timer.d +++ b/projet_1/Objects/driver_timer.d @@ -1,7 +1,7 @@ ./objects/driver_timer.o: ..\drivers\Driver_Timer.c \ ..\drivers\Driver_Timer.h \ C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h \ - RTE\_sim\RTE_Components.h \ + RTE\_board\RTE_Components.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h \ C:\Keil_v5\ARM\ARMCLANG\Bin\..\include\stdint.h \ C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h \ diff --git a/projet_1/Objects/driver_timer.o b/projet_1/Objects/driver_timer.o new file mode 100644 index 0000000000000000000000000000000000000000..21036a47d6f22e4a74d8253454ed111568dff1b6 GIT binary patch literal 5288 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 VT$lAqeFj!6jdc1sX8+X%yaFD9m8k## diff --git a/projet_1/Objects/tp_board.dep b/projet_1/Objects/tp_board.dep index f8a7a6e..340e537 100644 --- a/projet_1/Objects/tp_board.dep +++ b/projet_1/Objects/tp_board.dep @@ -1,6 +1,6 @@ Dependencies for Project 'tp', Target 'board': (DO NOT MODIFY !) CompilerVersion: 6190000::V6.19::ARMCLANG -F (.\src\main.c)(0x6417630F)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) +F (.\src\main.c)(0x64181E4D)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_board\RTE_Components.h)(0x6415C72E) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) @@ -10,6 +10,7 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) I (..\drivers\Driver_GPIO.h)(0x6417630F) +I (..\drivers\Driver_Timer.h)(0x64178681) F (..\drivers\Driver_GPIO.c)(0x6417630F)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) I (..\drivers\Driver_GPIO.h)(0x6417630F) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) @@ -21,6 +22,17 @@ I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cms I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) F (..\drivers\Driver_GPIO.h)(0x6417630F)() +F (..\drivers\Driver_Timer.c)(0x64178684)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) +I (..\drivers\Driver_Timer.h)(0x64178681) +I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) +I (RTE\_board\RTE_Components.h)(0x6415C72E) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) +I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) +F (..\drivers\Driver_Timer.h)(0x64178681)() F (RTE/Device/STM32F103RB/RTE_Device.h)(0x5FC0B25A)() F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x61ADDBCE)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto -Wa,armasm,--diag_suppress=A1950W -c -gdwarf-4 -Wa,armasm,--pd,"__MICROLIB SETA 1" -Wa,armasm,--pd,"__EVAL SETA 1" -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -Wa,armasm,--pd,"__UVISION_VERSION SETA 538" -Wa,armasm,--pd,"_RTE_ SETA 1" -Wa,armasm,--pd,"STM32F10X_MD SETA 1" -Wa,armasm,--pd,"_RTE_ SETA 1" -o ./objects/startup_stm32f10x_md.o) F (RTE/Device/STM32F103RB/system_stm32f10x.c)(0x61ADDBCE)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_board -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/system_stm32f10x.o -MD) diff --git a/projet_1/Objects/tp_sim.axf b/projet_1/Objects/tp_sim.axf index 0d9599d62206e542a4e543fe4768547e5bdf3cd8..9da7515f48f6e04a04cd3da04500d8656ed1cfd6 100644 GIT binary patch delta 6617 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 delta 3426 zcma)a;-G0!GIc z9A|nNrnXh4)%56$ZGB;UnQ48+ZfkvODLA-7^Qo$=&zWyQ3?Jk}F@xq=Yl!nB^kloD$}Gk#V<3@`j}O zzSv*CZ|Kb~IwNTKDk712W5~HE#ix|0^Y`ww-UC)IUUr+4R$oE7TX3yLnw z(fx(V`a;+F3Sw3hv<6fO{TkG^m~+k}be;bp zlzi2pIG5r_uEI|aI_IKP_0E{o)qn@teNK{I9KyI%`mzuvq^DPea9$>LdkB* zgf8Xj8$(#5k{Xj;?D$%h*0+Yxt!nh%5PDRduHP3@ud3HS4k4!+^-rW3sGa3M44YI5 zgHD|Ys+~M*Gk7TysEEN|v$Y9RO^MfFI2~XsYDsa;*#K^bui_LejaYe^VJXE?D1{;h zUuID@DF%YjEQcltOBn?FS&lBsi_bg4^0rXk7RVQc^0uNn$d91$W2|lu)$M_LbEs|) z)ZXu)(aPz; zFT*crH+~PG+=0SZAIemwoq)BRX-@;nnRYaU@hgyOZ-vCE_SX8Xgsx0vb*;NpSN3b+u6G;~VnHyqZ=0$w9WWm>=B_4%{m4V1S}hW_fhI7G zW6RIg4T^pN>YW>K*# zCo(O?ir4%t@vgb8d43C@F5EIdFnaaD{t^oBhIdA;nHd~R|3bxOb%)F+=YQnn?^-m| zG5=nCgZcWBDl@#~iRzBxNr;vNCpvABrgdq*zpdDGBj=VRhrUx}ZxnY4;jPSg()<$d zVJ=;Y#tQd@fIIWAa7S#=YmPr``7OO)_;V=$&kr7W0{73*K*$#&%ssanC}0l|(x$Ap z{Wdp2KVI&j|HTIFfR1SaU({b)^7D{+#CE*RJE7+RLQc~EKLYNG2K*2GBk+e8F99#v z{K%3$Y55Od>C%X+!M~s4%ZUw#VHk@Dj)Ny6JZkX;)3mI?=lA625ml4L%fJHj!2QVJ zDOZByU^Eu+dhm=04}vQqd<(cT!u!BgQ|yz0Vdj*99tGD%_z-w@g#QGd6XCbP^T0fh z+`)fZJYjJhdtyqD)XhvY2I*WH%{6mW$wfH5A`K3_qfR7%35H)~5wwQ4KmIL6g zvN&V$N{e$AZ;fyZPub3hf!VkCXXfU%tTV%E$70a|Azx<0(1L`kN5b*GYbh}&AoD8lI{1f6+zoyU zoG9@o@ZZ3EaSoftware Packages used: diff --git a/projet_1/Objects/tp_sim.dep b/projet_1/Objects/tp_sim.dep index 489dae9..501e5cd 100644 --- a/projet_1/Objects/tp_sim.dep +++ b/projet_1/Objects/tp_sim.dep @@ -1,9 +1,41 @@ Dependencies for Project 'tp', Target 'sim': (DO NOT MODIFY !) CompilerVersion: 6190000::V6.19::ARMCLANG -F (.\src\main.c)(0x6415C655)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) -F (RTE/Device/STM32F103RB/RTE_Device.h)(0x5FC0B25A)() -F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x61ADDBCE)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto -Wa,armasm,--diag_suppress=A1950W -c -gdwarf-4 -Wa,armasm,--pd,"__MICROLIB SETA 1" -Wa,armasm,--pd,"__EVAL SETA 1" -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -Wa,armasm,--pd,"__UVISION_VERSION SETA 538" -Wa,armasm,--pd,"_RTE_ SETA 1" -Wa,armasm,--pd,"STM32F10X_MD SETA 1" -Wa,armasm,--pd,"_RTE_ SETA 1" -o ./objects/startup_stm32f10x_md.o) -F (RTE/Device/STM32F103RB/system_stm32f10x.c)(0x61ADDBCE)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/system_stm32f10x.o -MD) +F (.\src\main.c)(0x64181E4D)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/main.o -MD) +I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) +I (RTE\_sim\RTE_Components.h)(0x6415C555) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) +I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) +I (..\drivers\Driver_GPIO.h)(0x6417630F) +I (..\drivers\Driver_Timer.h)(0x64178681) +F (..\drivers\Driver_GPIO.c)(0x6417630F)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_gpio.o -MD) +I (..\drivers\Driver_GPIO.h)(0x6417630F) +I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) +I (RTE\_sim\RTE_Components.h)(0x6415C555) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) +I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) +F (..\drivers\Driver_GPIO.h)(0x6417630F)() +F (..\drivers\Driver_Timer.c)(0x64178684)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/driver_timer.o -MD) +I (..\drivers\Driver_Timer.h)(0x64178681) +I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) +I (RTE\_sim\RTE_Components.h)(0x6415C555) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) +I (C:\Keil_v5\ARM\ARMCLANG\include\stdint.h)(0x6388AB78) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_version.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_compiler.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\cmsis_armclang.h)(0x626FAD4E) +I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\system_stm32f10x.h)(0x61ADDBCE) +F (..\drivers\Driver_Timer.h)(0x64178681)() +F (RTE/Device/STM32F103RB/RTE_Device.h)(0x5FC0B25A)() +F (RTE/Device/STM32F103RB/startup_stm32f10x_md.s)(0x61ADDBCE)(--target=arm-arm-none-eabi -mcpu=cortex-m3 -masm=auto -Wa,armasm,--diag_suppress=A1950W -c -gdwarf-4 -Wa,armasm,--pd,"__MICROLIB SETA 1" -Wa,armasm,--pd,"__EVAL SETA 1" -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -Wa,armasm,--pd,"__UVISION_VERSION SETA 538" -Wa,armasm,--pd,"_RTE_ SETA 1" -Wa,armasm,--pd,"STM32F10X_MD SETA 1" -Wa,armasm,--pd,"_RTE_ SETA 1" -o ./objects/startup_stm32f10x_md.o) +F (RTE/Device/STM32F103RB/system_stm32f10x.c)(0x61ADDBCE)(-xc -std=c90 --target=arm-arm-none-eabi -mcpu=cortex-m3 -c -fno-rtti -funsigned-char -fshort-enums -fshort-wchar -D__EVAL -D__MICROLIB -gdwarf-4 -O1 -ffunction-sections -Wno-packed -Wno-missing-variable-declarations -Wno-missing-prototypes -Wno-missing-noreturn -Wno-sign-conversion -Wno-nonportable-include-path -Wno-reserved-id-macro -Wno-unused-macros -Wno-documentation-unknown-command -Wno-documentation -Wno-license-management -Wno-parentheses-equality -Wno-reserved-identifier -I ./src -I ./include -I ../drivers -I./RTE/Device/STM32F103RB -I./RTE/_sim -IC:/Users/robin/AppData/Local/Arm/Packs/ARM/CMSIS/5.9.0/CMSIS/Core/Include -IC:/Users/robin/AppData/Local/Arm/Packs/Keil/STM32F1xx_DFP/2.4.0/Device/Include -D__UVISION_VERSION="538" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o ./objects/system_stm32f10x.o -MD) I (C:\Users\robin\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.4.0\Device\Include\stm32f10x.h)(0x61ADDBCE) I (RTE\_sim\RTE_Components.h)(0x6415C555) I (C:\Users\robin\AppData\Local\Arm\Packs\ARM\CMSIS\5.9.0\CMSIS\Core\Include\core_cm3.h)(0x626FAD4E) diff --git a/projet_1/Objects/tp_sim.htm b/projet_1/Objects/tp_sim.htm index 9a78d89..a0c0d97 100644 --- a/projet_1/Objects/tp_sim.htm +++ b/projet_1/Objects/tp_sim.htm @@ -3,9 +3,9 @@ Static Call Graph - [.\Objects\tp_sim.axf]

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

-

#<CALLGRAPH># ARM Linker, 6190004: Last Updated: Sun Mar 19 20:33:47 2023 +

#<CALLGRAPH># ARM Linker, 6190004: Last Updated: Mon Mar 20 09:53:26 2023

-

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

+

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

Call chain for Maximum Stack Depth:

main ⇒ MyGPIO_Init

@@ -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,15 +100,15 @@ 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_final_cpp (Thumb, 0 bytes, Stack size unknown bytes, entry10a.o(.ARM.Collect$$$$0000000D)) +

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

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

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

    Reset_Handler (Thumb, 8 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text))
    [Address Reference Count : 1]

    • startup_stm32f10x_md.o(RESET) @@ -315,7 +315,7 @@ 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)

      MyGPIO_Init (Thumb, 112 bytes, Stack size 8 bytes, driver_gpio.o(.text.MyGPIO_Init))

      [Stack]

      • Max Depth = 8
      • Call Chain = MyGPIO_Init @@ -323,11 +323,19 @@ Global Symbols
        [Called By]
        • >>   main
        -

        MyGPIO_Read (Thumb, 10 bytes, Stack size 0 bytes, driver_gpio.o(.text.MyGPIO_Read)) +

        MyGPIO_Toggle (Thumb, 14 bytes, Stack size 0 bytes, driver_gpio.o(.text.MyGPIO_Toggle))

        [Called By]

        • >>   main
        -

        MyGPIO_Toggle (Thumb, 14 bytes, Stack size 0 bytes, driver_gpio.o(.text.MyGPIO_Toggle)) +

        MyTimer_Base_Init (Thumb, 152 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Base_Init)) +

        [Called By]

        • >>   main +
        + +

        MyTimer_Base_Start (Thumb, 12 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Base_Start)) +

        [Called By]

        • >>   main +
        + +

        MyTimer_Base_Stop (Thumb, 12 bytes, Stack size 0 bytes, driver_timer.o(.text.MyTimer_Base_Stop))

        [Called By]

        • >>   main
        @@ -336,20 +344,22 @@ Global Symbols

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

      main (Thumb, 70 bytes, Stack size 8 bytes, main.o(.text.main)) -

      [Stack]

      • Max Depth = 16
      • Call Chain = main ⇒ MyGPIO_Init +

        main (Thumb, 110 bytes, Stack size 16 bytes, main.o(.text.main)) +

        [Stack]

        • Max Depth = 24
        • Call Chain = main ⇒ MyGPIO_Init
        -
        [Calls]
        • >>   MyGPIO_Toggle -
        • >>   MyGPIO_Read +
          [Calls]
          • >>   MyTimer_Base_Stop +
          • >>   MyGPIO_Toggle +
          • >>   MyTimer_Base_Start +
          • >>   MyTimer_Base_Init
          • >>   MyGPIO_Init

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

          __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)

          Local Symbols diff --git a/projet_1/Objects/tp_sim.lnp b/projet_1/Objects/tp_sim.lnp index bd5170c..92e392e 100644 --- a/projet_1/Objects/tp_sim.lnp +++ b/projet_1/Objects/tp_sim.lnp @@ -1,6 +1,7 @@ --cpu Cortex-M3 ".\objects\main.o" ".\objects\driver_gpio.o" +".\objects\driver_timer.o" ".\objects\startup_stm32f10x_md.o" ".\objects\system_stm32f10x.o" --library_type=microlib --ro-base 0x08000000 --entry 0x08000000 --rw-base 0x20000000 --entry Reset_Handler --first __Vectors --strict --summary_stderr --info summarysizes --map --load_addr_map_info --xref --callgraph --symbols diff --git a/projet_1/src/main.c b/projet_1/src/main.c index 62896ab..72b4716 100644 --- a/projet_1/src/main.c +++ b/projet_1/src/main.c @@ -1,5 +1,6 @@ #include "stm32f10x.h" #include "Driver_GPIO.h" +#include "Driver_Timer.h" void delay() { int i = 0; @@ -21,8 +22,21 @@ int main(void) { GPIO_InitStructure.GPIO = GPIOC; MyGPIO_Init(&GPIO_InitStructure); + MyTimer_Struct_TypeDef Timer; + Timer.Timer = TIM2; + Timer.PSC = 7200; // Prescaler = 7200, donc chaque tick d'horloge prend 0,1ms (10 MHz) + Timer.ARR = 5000; // Autoreload = 5000, donc le timer compte jusqu'à 5000, ce qui prend 500ms (0,1ms * 5000) + + MyTimer_Base_Init(&Timer); // Initialise le Timer 2 + + + + + while(1) { + + /* // Vérifie si le bouton est pressé if(MyGPIO_Read(GPIOC, 13) == 0) { // Toggle la LED @@ -31,6 +45,13 @@ int main(void) { // Delay pour éviter les rebonds du au ressort du bouton delay(); } + */ + + + MyTimer_Base_Start(&Timer); // Démarre le Timer 2 + while (Timer.Timer->CNT != Timer.ARR - 1); // Attend que le compteur atteigne la valeur d'autoreload + MyGPIO_Toggle(GPIOA, 5); + MyTimer_Base_Stop(&Timer); // Arrête le Timer 2 } } diff --git a/projet_1/tp.uvguix.robin b/projet_1/tp.uvguix.robin index a3ae975..c4e4b7e 100644 --- a/projet_1/tp.uvguix.robin +++ b/projet_1/tp.uvguix.robin @@ -11,10 +11,10 @@ - System Viewer\GPIOA - 35905 + System Viewer\TIM2 + 35904 - 124 + 116 @@ -27,12 +27,12 @@ 346 Code Coverage - 880 290 + 1010 650 204 Performance Analyzer - 720 175 175 100 + 1170 175 175 140 @@ -70,7 +70,7 @@ 2506 Trace Data - + FiltIdx=0;DescrEn=0;DescrHeight=4;FuncTrc=1;FindType=8;ColWidths=004B00870082005F004600E600C80096 75 135 95 70 230 200 150 @@ -117,8 +117,8 @@ 0 - 799 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000600000000000000010000003C433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C70726F6A65745F315C7372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF5F433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C70726F6A65745F315C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000FFDC7800FFFFFFFF5B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C70726F6A65745F315C5254455C4465766963655C53544D33324631303352425C73797374656D5F73746D3332663130782E63000000001273797374656D5F73746D3332663130782E6300000000BECEA100FFFFFFFF3E433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C647269766572735C4472697665725F4750494F2E68000000000D4472697665725F4750494F2E6800000000F0A0A100FFFFFFFF3E433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C647269766572735C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000BCA8E100FFFFFFFF3F433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C647269766572735C4472697665725F54696D65722E63000000000E4472697665725F54696D65722E63000000009CC1B600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000FA000000660000008007000007020000 + 894 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000700000000000000010000003C433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C70726F6A65745F315C7372635C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF5F433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C70726F6A65745F315C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000FFDC7800FFFFFFFF5B433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C70726F6A65745F315C5254455C4465766963655C53544D33324631303352425C73797374656D5F73746D3332663130782E63000000001273797374656D5F73746D3332663130782E6300000000BECEA100FFFFFFFF3E433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C647269766572735C4472697665725F4750494F2E68000000000D4472697665725F4750494F2E6800000000F0A0A100FFFFFFFF3E433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C647269766572735C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000BCA8E100FFFFFFFF3F433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C647269766572735C4472697665725F54696D65722E63000000000E4472697665725F54696D65722E63000000009CC1B600FFFFFFFF3F433A5C55736572735C726F62696E5C4F6E6544726976655C446F63756D656E74735C4465765C74705C647269766572735C4472697665725F54696D65722E68000000000E4472697665725F54696D65722E6800000000F7B88600FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000FA0000004A00000080070000AD020000 @@ -157,7 +157,7 @@ 0 16 - 0300000066000000F3000000D7010000 + 030000004A000000F30000007D020000 16 @@ -177,7 +177,7 @@ 0 16 - 0300000066000000F3000000D7010000 + 030000004A000000F30000007D020000 16 @@ -247,7 +247,7 @@ 1468 1468 - 1 + 0 0 0 0 @@ -257,7 +257,7 @@ 0 16 - 00000000080200008007000096020000 + 030000000B0200007D0700007D020000 16 @@ -457,7 +457,7 @@ 0 16 - 0300000066000000F3000000D7010000 + 030000004A000000F30000007D020000 16 @@ -477,7 +477,7 @@ 0 16 - 0300000066000000F3000000D7010000 + 030000004A000000F30000007D020000 16 @@ -1157,7 +1157,7 @@ 0 16 - 0300000066000000F30000007D020000 + 030000004A000000F30000007D020000 16 @@ -1754,14 +1754,14 @@ 476 0 8192 - 1 + 0 16 - 000000001C000000E701000038000000 + D703000000000000BE0500001C000000 16 - 0A0000000A0000006E0000006E000000 + 0A0000000A000000EE01000042000000 @@ -1774,10 +1774,10 @@ 612 0 8192 - 2 + 1 16 - 00000000380000006F02000054000000 + 000000001C0000006F02000038000000 16 @@ -1806,7 +1806,7 @@ 3312 - 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F4000000F40000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000025020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A004000066000000900500003C020000A00400004F000000900500002502000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF60000004F000000FA000000F00100000100000002000010040000000100000000FFFFFF75060000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F6000000AD020000000000004F000000F6000000F00100000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000F001000080070000F401000001000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000000000000B02000080070000AD02000000000000F4010000800700009602000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203401000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF0D0000000000000001000000000000000000000001000000FFFFFFFFC802000015020000CC020000B702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000096020000800700009A020000010000000100001004000000010000003BFDFFFFBF000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000B102000080070000F5030000000000009A02000080070000DE0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 + 000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DD00000090050000E1000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F4000000F40000004F00000090050000DD0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000025020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A004000066000000900500003C020000A00400004F000000900500002502000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF600000033000000FA000000960200000100000002000010040000000100000000FFFFFF75060000FFFFFFFF05000000ED0300006D000000C3000000C40000007394000001800010000001000000000000004A000000F6000000AD0200000000000033000000F6000000960200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF00000000F001000080070000F401000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000000B02000080070000AD02000000000000F4010000800700009602000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000015020000CC020000B702000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF0000000096020000800700009A020000010000000100001004000000010000003BFDFFFFBF000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000B102000080070000F5030000000000009A02000080070000DE0300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000 59392 @@ -1829,7 +1829,7 @@ Build 978 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000000000000100000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500100000005626F617264960000000000000002000373696D05626F61726400000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500100000005626F617264960000000000000002000373696D05626F61726400000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -1845,7 +1845,7 @@ Debug 2373 - 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000000000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000000000002D0000000000000000000000000000000001000000010000000180F07F0000000000002E0000000000000000000000000000000001000000010000000180E8880000000000003700000000000000000000000000000000010000000100000001803B010000000000002F0000000000000000000000000000000001000000010000000180BB8A00000000000030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000000000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F01000000000000320000000E4D656D6F72792057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000000000000330000000E53657269616C2057696E646F77730000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000000000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -1878,11 +1878,11 @@ 0 16 - FA0000004F00000018060000DD000000 + FA0000004F00000080070000DD000000 16 - FA0000006600000018060000F4000000 + FA0000006600000080070000F4000000 @@ -1938,7 +1938,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -1958,7 +1958,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -1978,7 +1978,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -1998,7 +1998,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -2034,11 +2034,11 @@ 0 32767 0 - 4096 + 8192 0 16 - FD0000006600000015060000C4000000 + FD000000660000007D070000C4000000 16 @@ -2058,7 +2058,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -2078,7 +2078,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -2098,7 +2098,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -2118,7 +2118,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -2138,7 +2138,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -2158,7 +2158,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -2178,7 +2178,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -2258,7 +2258,7 @@ 0 16 - 00000000010300000C030000DE030000 + 0000000001030000C0030000DE030000 16 @@ -2298,7 +2298,7 @@ 0 16 - FA0000006300000018060000DD000000 + FA0000006300000080070000DD000000 16 @@ -2314,11 +2314,11 @@ 0 32767 0 - 4096 + 8192 0 16 - FD0000006600000015060000C4000000 + FD000000660000007D070000C4000000 16 @@ -2378,7 +2378,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -2394,11 +2394,11 @@ 0 32767 0 - 4096 + 8192 0 16 - FD0000006600000015060000C4000000 + FD000000660000007D070000C4000000 16 @@ -2414,11 +2414,11 @@ 0 32767 0 - 4096 + 8192 0 16 - FD0000006600000015060000C4000000 + FD000000660000007D070000C4000000 16 @@ -2434,11 +2434,11 @@ 0 32767 0 - 4096 + 8192 0 16 - FD0000006600000015060000C4000000 + FD000000660000007D070000C4000000 16 @@ -2454,11 +2454,11 @@ 0 32767 0 - 4096 + 8192 0 16 - FD0000006600000015060000C4000000 + FD000000660000007D070000C4000000 16 @@ -2868,7 +2868,7 @@ 35905 35905 - 1 + 0 0 0 0 @@ -2878,7 +2878,7 @@ 0 16 - 1C0600006300000080070000DE030000 + 1F060000660000007D070000C5030000 16 @@ -2948,7 +2948,7 @@ 437 437 - 1 + 0 0 0 0 @@ -2958,7 +2958,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -2968,7 +2968,7 @@ 440 440 - 1 + 0 0 0 0 @@ -2978,7 +2978,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -3034,11 +3034,11 @@ 0 32767 0 - 4096 + 8192 0 16 - FD0000006600000015060000C4000000 + FD000000660000007D070000C4000000 16 @@ -3538,7 +3538,7 @@ 0 16 - 130300001803000015060000C5030000 + C7030000180300007D070000C5030000 16 @@ -3546,15 +3546,15 @@ - 3347 - 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFFA000000DD00000018060000E1000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000FA0000006600000018060000F4000000FA0000004F00000018060000DD0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000010000001000000FFFFFFFFFFFFFFFFF60000004F000000FA000000FD0200000100000002000010040000000100000000FFFFFF75060000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F600000014030000000000004F000000F6000000FD0200000000000040410056050000000750726F6A65637400000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000FD020000180600000103000001000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000100300001803000018060000F5030000100300000103000018060000DE03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7301000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727301000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFF0C0300000103000010030000DE03000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000096020000800700009A020000000000000100000004000000010000003BFDFFFFBF000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000000000000000000B102000080070000F5030000000000009A02000080070000DE0300000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000040000001000000FFFFFFFFFFFFFFFF180600004F0000001C060000DE03000001000000020000100400000001000000000000000000000000000000000000000000000001000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000010000001C0600006600000080070000F50300001C0600004F00000080070000DE03000000000000404100562B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF054750494F43000000003F8C000001000000FFFFFFFFFFFFFFFF054750494F4200000000408C000001000000FFFFFFFFFFFFFFFF054750494F4101000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFF1600000000000000000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000000000000000000 + 3346 + 000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFFA000000DD00000080070000E1000000010000000100001004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000FA0000006600000080070000F4000000FA0000004F00000080070000DD0000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000010000001000000FFFFFFFFFFFFFFFFF60000004F000000FA000000FD0200000100000002000010040000000100000000FFFFFF75060000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F600000014030000000000004F000000F6000000FD0200000000000040410056050000000750726F6A65637400000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF04000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000FD020000800700000103000001000000010000100400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000C40300001803000080070000F5030000C40300000103000080070000DE03000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF000000000000000001000000000000000100000001000000FFFFFFFFC003000001030000C4030000DE03000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000096020000800700009A020000000000000100000004000000010000003BFDFFFFBF000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000000000000000000B102000080070000F5030000000000009A02000080070000DE0300000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000040000000000000FFFFFFFFFFFFFFFF180600004F0000001C060000DE03000000000000020000000400000001000000000000000000000000000000000000000000000001000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C30000018000400000000000001C0600006600000080070000F50300001C0600004F00000080070000DE03000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF054750494F43000000003F8C000001000000FFFFFFFFFFFFFFFF0454494D3200000000408C000001000000FFFFFFFFFFFFFFFF054750494F4100000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000000000000000000 59392 File 2537 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020000001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050FFFFFFFF0096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020000001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3570,7 +3570,7 @@ Build 978 - 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000004001D000000000000000000000000000000000100000001000000018030800000000004001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000004006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000004000000000000000000000000000000000000010000000100000096000000030020500100000005626F617264960000000000000002000373696D05626F61726400000000000000000180EB880000000004002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000400230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000000000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000004001C0000000000000000000000000000000001000000010000000180D07F0000000004001D000000000000000000000000000000000100000001000000018030800000000004001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000004006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000004002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000004000000000000000000000000000000000000010000000100000096000000030020500100000005626F617264960000000000000002000373696D05626F61726400000000000000000180EB880000000004002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000400230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000004004E00000000000000000000000000000000010000000100000001807202000000000400530000000000000000000000000000000001000000010000000180BE010000000004005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3586,7 +3586,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000004002600000000000000000000000000000000010000000100000001801D800000000000002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000004002800000000000000000000000000000000010000000100000001801B80000000000400290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000004002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000004002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000000310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720000000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7200000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720000000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720000000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730000000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72000000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3614,7 +3614,7 @@ .\src\main.c 0 - 1 + 4 10 1 @@ -3623,7 +3623,7 @@ RTE/Device/STM32F103RB/startup_stm32f10x_md.s 0 - 126 + 125 135 1 @@ -3641,26 +3641,35 @@ ..\drivers\Driver_GPIO.h 0 - 3 - 24 + 1 + 9 1 0 ..\drivers\Driver_GPIO.c - 34 - 5 - 26 + 0 + 4 + 49 1 0 - C:\Users\robin\OneDrive\Documents\Dev\tp\drivers\Driver_Timer.c + ..\drivers\Driver_Timer.c 0 1 - 1 + 29 + 1 + + 0 + + + ..\drivers\Driver_Timer.h + 22 + 1 + 4 1 0 diff --git a/projet_1/tp.uvoptx b/projet_1/tp.uvoptx index ff90d18..7273a95 100644 --- a/projet_1/tp.uvoptx +++ b/projet_1/tp.uvoptx @@ -117,6 +117,21 @@ BIN\UL2CM3.DLL + + 0 + ARMRTXEVENTFLAGS + -L70 -Z18 -C0 -M0 -T1 + + + 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=799,96,1220,523,1)(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=1228,73,1822,824,1)(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 + ARMDBGFLAGS + -T0 + 0 UL2CM3 @@ -130,12 +145,12 @@ 0 1 - 0 + 1 0 0 0 0 - 0 + 1 0 0 0 @@ -303,7 +318,24 @@ UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)) - + + + 0 + 0 + 56 + 1 +
          134218768
          + 0 + 0 + 0 + 0 + 0 + 1 + .\src\main.c + + \\tp_sim\src/main.c\56 +           +           0 @@ -348,8 +380,8 @@ - System Viewer\GPIOA - 35905 + System Viewer\TIM2 + 35904 @@ -412,6 +444,30 @@ 0 0 + + 2 + 4 + 1 + 0 + 0 + 0 + ..\drivers\Driver_Timer.c + Driver_Timer.c + 0 + 0 + + + 2 + 5 + 5 + 0 + 0 + 0 + ..\drivers\Driver_Timer.h + Driver_Timer.h + 0 + 0 + diff --git a/projet_1/tp.uvprojx b/projet_1/tp.uvprojx index d71be3f..4d8157a 100644 --- a/projet_1/tp.uvprojx +++ b/projet_1/tp.uvprojx @@ -340,7 +340,7 @@ - .\src;.\include + .\src;.\include;..\drivers @@ -404,6 +404,16 @@ 5 ..\drivers\Driver_GPIO.h + + Driver_Timer.c + 1 + ..\drivers\Driver_Timer.c + + + Driver_Timer.h + 5 + ..\drivers\Driver_Timer.h + @@ -812,6 +822,16 @@ 5 ..\drivers\Driver_GPIO.h + + Driver_Timer.c + 1 + ..\drivers\Driver_Timer.c + + + Driver_Timer.h + 5 + ..\drivers\Driver_Timer.h +