From 9bad192109332818f84456889e7acf9fed9162a5 Mon Sep 17 00:00:00 2001 From: Celia Date: Mon, 8 Nov 2021 19:50:21 +0100 Subject: [PATCH] debug chavirement --- Keil_Commun/Listings/projet_chavirement.map | 88 +++++++++--------- Keil_Commun/Local_Sources/principal.c | 3 + Keil_Commun/Objects/bordage.o | Bin 259324 -> 259324 bytes Keil_Commun/Objects/chavirement.crf | Bin 239404 -> 239409 bytes Keil_Commun/Objects/chavirement.o | Bin 263348 -> 263356 bytes Keil_Commun/Objects/driver_gpio.o | Bin 262100 -> 262100 bytes Keil_Commun/Objects/driver_spi.o | Bin 261180 -> 261180 bytes Keil_Commun/Objects/mytimer.o | Bin 267352 -> 267352 bytes Keil_Commun/Objects/principal.crf | Bin 238493 -> 238659 bytes Keil_Commun/Objects/principal.d | 1 + Keil_Commun/Objects/principal.o | Bin 256668 -> 257696 bytes Keil_Commun/Objects/projet_chavirement.axf | Bin 244436 -> 245128 bytes .../Objects/projet_chavirement.build_log.htm | 23 +---- Keil_Commun/Objects/projet_chavirement.htm | 76 +++++++++------ .../Objects/projet_chavirement_CarteSTM.dep | 5 +- Keil_Commun/Objects/system_stm32f10x.o | Bin 259216 -> 259216 bytes Keil_Commun/projet_chavirement.uvguix.chauz | 28 +++--- Sources/chavirement.c | 12 +-- 18 files changed, 123 insertions(+), 113 deletions(-) diff --git a/Keil_Commun/Listings/projet_chavirement.map b/Keil_Commun/Listings/projet_chavirement.map index b6f7536..09bcda2 100644 --- a/Keil_Commun/Listings/projet_chavirement.map +++ b/Keil_Commun/Listings/projet_chavirement.map @@ -18,11 +18,13 @@ Section Cross References mytimer.o(i.TIM4_IRQHandler) refers to mytimer.o(.data) for PtrF principal.o(i.main) refers to driver_gpio.o(i.MyGPIO_Activate) for MyGPIO_Activate principal.o(i.main) refers to chavirement.o(i.chavirement_init) for chavirement_init + principal.o(i.main) refers to bordage.o(i.Roulis_Handler) for Roulis_Handler principal.o(i.main) refers to chavirement.o(i.chavirement_handler) for chavirement_handler principal.o(i.main) refers to principal.o(.data) for value chavirement.o(i.chavirement_handler) refers to chavirement.o(i.lire) for lire chavirement.o(i.chavirement_handler) refers to bordage.o(i.Roulis_Handler) for Roulis_Handler chavirement.o(i.chavirement_init) refers to driver_spi.o(i.SPI_init_master) for SPI_init_master + chavirement.o(i.chavirement_init) refers to chavirement.o(i.ecrire) for ecrire chavirement.o(i.chavirement_init) refers to chavirement.o(i.lire) for lire chavirement.o(i.chavirement_init) refers to chavirement.o(.data) for device_id chavirement.o(i.ecrire) refers to driver_gpio.o(i.MyGPIO_Reset) for MyGPIO_Reset @@ -109,7 +111,6 @@ Removing Unused input sections from the image. Removing chavirement.o(.rev16_text), (4 bytes). Removing chavirement.o(.revsh_text), (4 bytes). Removing chavirement.o(.rrx_text), (6 bytes). - Removing chavirement.o(i.ecrire), (64 bytes). Removing bordage.o(.rev16_text), (4 bytes). Removing bordage.o(.revsh_text), (4 bytes). Removing bordage.o(.rrx_text), (6 bytes). @@ -120,7 +121,7 @@ Removing Unused input sections from the image. Removing system_stm32f10x.o(i.SystemCoreClockUpdate), (164 bytes). Removing system_stm32f10x.o(.data), (20 bytes). -29 unused section(s) (total 1142 bytes) removed from the image. +28 unused section(s) (total 1078 bytes) removed from the image. ============================================================================== @@ -130,24 +131,24 @@ Image Symbol Table Symbol Name Value Ov Type Size Object(Section) + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry10a.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry9a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry8a.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7b.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry7a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry5.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry2.o ABSOLUTE + ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12b.o ABSOLUTE ../clib/microlib/init/entry.s 0x00000000 Number 0 entry12a.o ABSOLUTE - ../clib/microlib/init/entry.s 0x00000000 Number 0 entry11b.o ABSOLUTE - ../clib/microlib/longlong.c 0x00000000 Number 0 llshl.o ABSOLUTE - ../clib/microlib/longlong.c 0x00000000 Number 0 llsshr.o ABSOLUTE ../clib/microlib/longlong.c 0x00000000 Number 0 llushr.o ABSOLUTE + ../clib/microlib/longlong.c 0x00000000 Number 0 llsshr.o ABSOLUTE + ../clib/microlib/longlong.c 0x00000000 Number 0 llshl.o ABSOLUTE ../clib/microlib/stubs.s 0x00000000 Number 0 iusefp.o ABSOLUTE ../fplib/microlib/d2f.c 0x00000000 Number 0 d2f.o ABSOLUTE ../fplib/microlib/f2d.c 0x00000000 Number 0 f2d.o ABSOLUTE @@ -227,9 +228,10 @@ Image Symbol Table i.__scatterload_zeroinit 0x08000af4 Section 14 handlers.o(i.__scatterload_zeroinit) i.bordage 0x08000b04 Section 0 bordage.o(i.bordage) i.chavirement_handler 0x08000bac Section 0 chavirement.o(i.chavirement_handler) - i.chavirement_init 0x08000bd8 Section 0 chavirement.o(i.chavirement_init) - i.lire 0x08000bf4 Section 0 chavirement.o(i.lire) - i.main 0x08000c38 Section 0 principal.o(i.main) + i.chavirement_init 0x08000bd0 Section 0 chavirement.o(i.chavirement_init) + i.ecrire 0x08000bf4 Section 0 chavirement.o(i.ecrire) + i.lire 0x08000c34 Section 0 chavirement.o(i.lire) + i.main 0x08000c78 Section 0 principal.o(i.main) .data 0x20000000 Section 8 driver_spi.o(.data) .data 0x20000008 Section 4 mytimer.o(.data) .data 0x2000000c Section 2 principal.o(.data) @@ -352,12 +354,13 @@ Image Symbol Table __scatterload_null 0x08000af3 Thumb Code 2 handlers.o(i.__scatterload_null) __scatterload_zeroinit 0x08000af5 Thumb Code 14 handlers.o(i.__scatterload_zeroinit) bordage 0x08000b05 Thumb Code 146 bordage.o(i.bordage) - chavirement_handler 0x08000bad Thumb Code 44 chavirement.o(i.chavirement_handler) - chavirement_init 0x08000bd9 Thumb Code 20 chavirement.o(i.chavirement_init) - lire 0x08000bf5 Thumb Code 58 chavirement.o(i.lire) - main 0x08000c39 Thumb Code 30 principal.o(i.main) - Region$$Table$$Base 0x08000c5c Number 0 anon$$obj.o(Region$$Table) - Region$$Table$$Limit 0x08000c7c Number 0 anon$$obj.o(Region$$Table) + chavirement_handler 0x08000bad Thumb Code 36 chavirement.o(i.chavirement_handler) + chavirement_init 0x08000bd1 Thumb Code 28 chavirement.o(i.chavirement_init) + ecrire 0x08000bf5 Thumb Code 54 chavirement.o(i.ecrire) + lire 0x08000c35 Thumb Code 58 chavirement.o(i.lire) + main 0x08000c79 Thumb Code 34 principal.o(i.main) + Region$$Table$$Base 0x08000ca0 Number 0 anon$$obj.o(Region$$Table) + Region$$Table$$Limit 0x08000cc0 Number 0 anon$$obj.o(Region$$Table) sortieSPI 0x20000000 Data 8 driver_spi.o(.data) PtrF 0x20000008 Data 4 mytimer.o(.data) value 0x2000000c Data 2 principal.o(.data) @@ -372,9 +375,9 @@ Memory Map of the image Image Entry point : 0x08000105 - Load Region LR_1 (Base: 0x08000000, Size: 0x00000c90, Max: 0xffffffff, ABSOLUTE) + Load Region LR_1 (Base: 0x08000000, Size: 0x00000cd4, Max: 0xffffffff, ABSOLUTE) - Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000c7c, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000cc0, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object @@ -431,29 +434,30 @@ Memory Map of the image 0x08000af4 0x08000af4 0x0000000e Code RO 422 i.__scatterload_zeroinit mc_w.l(handlers.o) 0x08000b02 0x08000b02 0x00000002 PAD 0x08000b04 0x08000b04 0x000000a8 Code RO 295 i.bordage bordage.o - 0x08000bac 0x08000bac 0x0000002c Code RO 246 i.chavirement_handler chavirement.o - 0x08000bd8 0x08000bd8 0x0000001c Code RO 247 i.chavirement_init chavirement.o - 0x08000bf4 0x08000bf4 0x00000044 Code RO 249 i.lire chavirement.o - 0x08000c38 0x08000c38 0x00000024 Code RO 216 i.main principal.o - 0x08000c5c 0x08000c5c 0x00000020 Data RO 418 Region$$Table anon$$obj.o + 0x08000bac 0x08000bac 0x00000024 Code RO 249 i.chavirement_handler chavirement.o + 0x08000bd0 0x08000bd0 0x00000024 Code RO 250 i.chavirement_init chavirement.o + 0x08000bf4 0x08000bf4 0x00000040 Code RO 251 i.ecrire chavirement.o + 0x08000c34 0x08000c34 0x00000044 Code RO 252 i.lire chavirement.o + 0x08000c78 0x08000c78 0x00000028 Code RO 216 i.main principal.o + 0x08000ca0 0x08000ca0 0x00000020 Data RO 418 Region$$Table anon$$obj.o - Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000c7c, Size: 0x00000014, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000cc0, Size: 0x00000014, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000000 0x08000c7c 0x00000008 Data RW 94 .data driver_spi.o - 0x20000008 0x08000c84 0x00000004 Data RW 147 .data mytimer.o - 0x2000000c 0x08000c88 0x00000002 Data RW 217 .data principal.o - 0x2000000e 0x08000c8a 0x00000002 PAD - 0x20000010 0x08000c8c 0x00000004 Data RW 250 .data chavirement.o + 0x20000000 0x08000cc0 0x00000008 Data RW 94 .data driver_spi.o + 0x20000008 0x08000cc8 0x00000004 Data RW 147 .data mytimer.o + 0x2000000c 0x08000ccc 0x00000002 Data RW 217 .data principal.o + 0x2000000e 0x08000cce 0x00000002 PAD + 0x20000010 0x08000cd0 0x00000004 Data RW 253 .data chavirement.o - Execution Region ER_ZI (Exec base: 0x20000014, Load base: 0x08000c90, Size: 0x00000404, Max: 0xffffffff, ABSOLUTE) + Execution Region ER_ZI (Exec base: 0x20000014, Load base: 0x08000cd4, Size: 0x00000404, Max: 0xffffffff, ABSOLUTE) Exec Addr Load Addr Size Type Attr Idx E Section Name Object - 0x20000014 0x08000c90 0x00000004 PAD + 0x20000014 0x08000cd4 0x00000004 PAD 0x20000018 - 0x00000400 Zero RW 321 STACK startup_stm32f10x_md.o @@ -465,16 +469,16 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug Object Name 178 22 0 0 0 1183 bordage.o - 140 18 0 4 0 1924 chavirement.o + 204 28 0 4 0 2513 chavirement.o 210 6 0 0 0 209488 driver_gpio.o 318 16 0 8 0 2880 driver_spi.o 464 46 0 4 0 4877 mytimer.o - 36 6 0 2 0 743 principal.o + 40 6 0 2 0 747 principal.o 36 8 236 0 1024 852 startup_stm32f10x_md.o 328 28 0 0 0 2149 system_stm32f10x.o ---------------------------------------------------------------------- - 1716 150 268 20 1028 224096 Object Totals + 1784 160 268 20 1028 224689 Object Totals 0 0 32 0 0 0 (incl. Generated) 6 0 0 2 4 0 (incl. Padding) @@ -527,15 +531,15 @@ Image component sizes Code (inc. data) RO Data RW Data ZI Data Debug - 2928 166 268 20 1028 223800 Grand Totals - 2928 166 268 20 1028 223800 ELF Image Totals - 2928 166 268 20 0 0 ROM Totals + 2996 176 268 20 1028 224341 Grand Totals + 2996 176 268 20 1028 224341 ELF Image Totals + 2996 176 268 20 0 0 ROM Totals ============================================================================== - Total RO Size (Code + RO Data) 3196 ( 3.12kB) + Total RO Size (Code + RO Data) 3264 ( 3.19kB) Total RW Size (RW Data + ZI Data) 1048 ( 1.02kB) - Total ROM Size (Code + RO Data + RW Data) 3216 ( 3.14kB) + Total ROM Size (Code + RO Data + RW Data) 3284 ( 3.21kB) ============================================================================== diff --git a/Keil_Commun/Local_Sources/principal.c b/Keil_Commun/Local_Sources/principal.c index f04ecb3..3a9a6db 100644 --- a/Keil_Commun/Local_Sources/principal.c +++ b/Keil_Commun/Local_Sources/principal.c @@ -6,6 +6,8 @@ #include "Driver_GPIO.h" #endif +#include "bordage.h" + uint16_t value = 0; int main(void) { @@ -16,6 +18,7 @@ int main(void) { //on init le système de chavirement chavirement_init(); + Roulis_Handler(); while (1) { //on lance le contrôle du chavirement diff --git a/Keil_Commun/Objects/bordage.o b/Keil_Commun/Objects/bordage.o index 73a326f3763230adba65f9339cb82a560b306533..5eeacadce30cf974ecdcf096ef916b1c4a91b443 100644 GIT binary patch delta 53 zcmezKlK;<3{tXg5tS07Gh9=FjJngbPj6lq^U6zNrd=;B{QnIcw!{iB^mXqHz32cA7 IjakwT0M}L!NYVPgP-$2V0Om?jEHGzPQ=Fm4TC;+@3Lqr}L-)NjC6mY7qT z%J6%8&Lk#NRz~gVi>5Ovb21t?FoN)h?Z>7w>98{DPX9cINte;1U3D(gcGbDeci9E_ v7$zDp@dA}eDllp`Fh1PQx0IQUNtB1-fB~bi0;4G-qa|bV4HgClCI%${*7Yah delta 140 zcmdmZj&IF5z6n}Nj93OUx-v zW%#*0XA+YsE2HxCMbnv-8I!i3o6e-e%4j(K_Z%i&Rz~9n#{PEAxlG$N=Q7`A=iy?Q rXu!nVz{n`6Fk!pcQf4+L34VqH28_lEjHZkrWXY&`gN1>Ci9rbflhq{r diff --git a/Keil_Commun/Objects/chavirement.o b/Keil_Commun/Objects/chavirement.o index a6826b88a0fbd14c4e9bbf2bb943330d4e21a6bf..caba1ab114c7a315f8e5bfddbbdd6477d8fb8760 100644 GIT binary patch delta 6222 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 Q(_!X^OxshAF@Ny|0HZ_}H2?qr delta 59 zcmcbyLg2;z1*ZBpc`&GfWoXx19W+MPPgL PVdjTS+mnwmfAs|blvfrc diff --git a/Keil_Commun/Objects/principal.crf b/Keil_Commun/Objects/principal.crf index 4978ecb1887927d8477d5e3b53a54aba646c1917..2cbb7fe2d101e24358032f2d3040f59441e489a8 100644 GIT binary patch delta 321 zcmbPxobT`nKAsz#3=B++3_RNm7_=tx$a8(UwX}zg0SH(&nwm1J+*D*>64ld-3C=Gq zN=_|~Ny;xuNlZ`G%V2nRb_zt{mgX$x_AF+`?ODuB(Y--J3;_%bj0_B1PX0kIj_$7U z9t?7~_!x9JfVQx(CFZ5)q%vH%CBPsc#|l)%0X2|;?Up!Hh(9R5G$*q--Xk$DB`39r z!EpMK2~1jSTMd{p876Q4GJ$Ch7Yla-V{ZGD*-YD~%x3Ok6B2Gjn!j$QYCW{7O|s delta 154 zcmX?nf^Y6|KAsz#3=B++4BVRx81yId$a5V&u(XGb0SNpznwl~<_c6EkF*9!OV`hr( zoo+LcNt11(0aGT!^zGRbndWe@a5gaJw{y>7+Rigb@_l?{szW^+nfv=3>Y~T7^RuM+-76gXu!y=AOvJ=GGOFU5V*ktbPIzL E02{j~JOBUy diff --git a/Keil_Commun/Objects/principal.d b/Keil_Commun/Objects/principal.d index b2c351a..e2abb09 100644 --- a/Keil_Commun/Objects/principal.d +++ b/Keil_Commun/Objects/principal.d @@ -9,3 +9,4 @@ .\objects\principal.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h .\objects\principal.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h .\objects\principal.o: ..\Drivers\Driver_GPIO.h +.\objects\principal.o: ..\Sources\bordage.h diff --git a/Keil_Commun/Objects/principal.o b/Keil_Commun/Objects/principal.o index 4294de288b7bc4f59f094e766584c64614991f5f..d56262390e231caa274d4de832095e024b6c7aa0 100644 GIT binary patch delta 9484 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 C#T|11 delta 8959 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 EUn11QL;wH) diff --git a/Keil_Commun/Objects/projet_chavirement.axf b/Keil_Commun/Objects/projet_chavirement.axf index 110af0cb89ea77adc67b1750b83519740816f19b..41147ef6fe47db531cd106494cc835ec009f4bf1 100644 GIT binary patch delta 5391 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 diff --git a/Keil_Commun/Objects/projet_chavirement.build_log.htm b/Keil_Commun/Objects/projet_chavirement.build_log.htm index 352b398..eab9e0d 100644 --- a/Keil_Commun/Objects/projet_chavirement.build_log.htm +++ b/Keil_Commun/Objects/projet_chavirement.build_log.htm @@ -26,26 +26,11 @@ Project File Date: 11/05/2021

Output:

*** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin' -Rebuild target 'CarteSTM' -assembling startup_stm32f10x_md.s... +Build target 'CarteSTM' compiling chavirement.c... -compiling principal.c... -Local_Sources\principal.c(12): warning: #177-D: variable "i" was declared but never referenced - int i = 0; -Local_Sources\principal.c: 1 warning, 0 errors -compiling bordage.c... -compiling Driver_GPIO.c... -compiling Driver_SPI.c... -..\Drivers\Driver_SPI.c(79): warning: #550-D: variable "a" was set but never used - int a; -..\Drivers\Driver_SPI.c(100): warning: #177-D: variable "a" was declared but never referenced - int a; -..\Drivers\Driver_SPI.c: 2 warnings, 0 errors -compiling MyTimer.c... -compiling system_stm32f10x.c... linking... -Program Size: Code=2928 RO-data=268 RW-data=20 ZI-data=1028 -".\Objects\projet_chavirement.axf" - 0 Error(s), 3 Warning(s). +Program Size: Code=2996 RO-data=268 RW-data=20 ZI-data=1028 +".\Objects\projet_chavirement.axf" - 0 Error(s), 0 Warning(s).

Software Packages used:

@@ -76,7 +61,7 @@ Package Vendor: Keil Include file: RTE_Driver\Config\RTE_Device.h Source file: Device\Source\ARM\startup_stm32f10x_md.s Source file: Device\Source\ARM\STM32F1xx_OPT.s -Build Time Elapsed: 00:00:00 +Build Time Elapsed: 00:00:01 diff --git a/Keil_Commun/Objects/projet_chavirement.htm b/Keil_Commun/Objects/projet_chavirement.htm index 849d9ef..5abad5b 100644 --- a/Keil_Commun/Objects/projet_chavirement.htm +++ b/Keil_Commun/Objects/projet_chavirement.htm @@ -3,7 +3,7 @@ Static Call Graph - [.\Objects\projet_chavirement.axf]

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


-

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Nov 08 19:23:43 2021 +

#<CALLGRAPH># ARM Linker, 5060960: Last Updated: Mon Nov 08 19:47:45 2021

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

Call chain for Maximum Stack Depth:

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

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

  • startup_stm32f10x_md.o(.text)
-

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

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

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

[Calls]

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

    [Called By]
    • >>   __scatterload
    -

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

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

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

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

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

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

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

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

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

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

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

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

    Reset_Handler (Thumb, 8 bytes, Stack size 0 bytes, startup_stm32f10x_md.o(.text)) @@ -360,21 +360,21 @@ Global Symbols

  • >>   __aeabi_dadd
-

_ll_shift_l (Thumb, 0 bytes, Stack size 0 bytes, llshl.o(.text), UNUSED) +

_ll_shift_l (Thumb, 0 bytes, Stack size 0 bytes, llshl.o(.text), UNUSED)

__aeabi_lasr (Thumb, 36 bytes, Stack size 0 bytes, llsshr.o(.text))

[Called By]

  • >>   __aeabi_dadd
-

_ll_sshift_r (Thumb, 0 bytes, Stack size 0 bytes, llsshr.o(.text), UNUSED) +

_ll_sshift_r (Thumb, 0 bytes, Stack size 0 bytes, llsshr.o(.text), UNUSED) -

__I$use$fp (Thumb, 0 bytes, Stack size 0 bytes, iusefp.o(.text), UNUSED) +

__I$use$fp (Thumb, 0 bytes, Stack size 0 bytes, iusefp.o(.text), UNUSED)

_float_round (Thumb, 18 bytes, Stack size 0 bytes, fepilogue.o(.text))

[Called By]

  • >>   __aeabi_d2f
-

_float_epilogue (Thumb, 92 bytes, Stack size 4 bytes, fepilogue.o(.text), UNUSED) +

_float_epilogue (Thumb, 92 bytes, Stack size 4 bytes, fepilogue.o(.text), UNUSED)

_double_round (Thumb, 30 bytes, Stack size 8 bytes, depilogue.o(.text))

[Stack]

  • Max Depth = 8
  • Call Chain = _double_round @@ -401,15 +401,15 @@ 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)

    __aeabi_llsr (Thumb, 32 bytes, Stack size 0 bytes, llushr.o(.text))

    [Called By]

    • >>   _double_epilogue
    -

    _ll_ushift_r (Thumb, 0 bytes, Stack size 0 bytes, llushr.o(.text), UNUSED) +

    _ll_ushift_r (Thumb, 0 bytes, Stack size 0 bytes, llushr.o(.text), UNUSED) -

    MyGPIO_Activate (Thumb, 18 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Activate)) +

    MyGPIO_Activate (Thumb, 18 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Activate))

    [Called By]

    • >>   main
    @@ -422,12 +422,14 @@ Global Symbols
  • >>   SPI_init_master
-

MyGPIO_Reset (Thumb, 12 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Reset)) +

MyGPIO_Reset (Thumb, 12 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Reset))

[Called By]

  • >>   lire +
  • >>   ecrire

MyGPIO_Set (Thumb, 8 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Set))

[Called By]

  • >>   lire +
  • >>   ecrire
  • >>   SPI_init_master
  • >>   MyGPIO_Init
@@ -446,6 +448,7 @@ Global Symbols
[Calls]
  • >>   bordage

[Called By]
  • >>   chavirement_handler +
  • >>   main

SPI_activate_clock (Thumb, 54 bytes, Stack size 0 bytes, driver_spi.o(i.SPI_activate_clock)) @@ -462,12 +465,13 @@ Global Symbols
[Called By]

  • >>   chavirement_init
-

SPI_rcv (Thumb, 36 bytes, Stack size 0 bytes, driver_spi.o(i.SPI_rcv)) +

SPI_rcv (Thumb, 36 bytes, Stack size 0 bytes, driver_spi.o(i.SPI_rcv))

[Called By]

  • >>   lire
-

SPI_send (Thumb, 30 bytes, Stack size 0 bytes, driver_spi.o(i.SPI_send)) +

SPI_send (Thumb, 30 bytes, Stack size 0 bytes, driver_spi.o(i.SPI_send))

[Called By]

  • >>   lire +
  • >>   ecrire

Set_Duty_Cycle (Thumb, 76 bytes, Stack size 8 bytes, mytimer.o(i.Set_Duty_Cycle)) @@ -503,11 +507,11 @@ Global Symbols
[Address Reference Count : 1]

  • startup_stm32f10x_md.o(RESET)
-

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

bordage (Thumb, 146 bytes, Stack size 56 bytes, bordage.o(i.bordage))

[Stack]

  • Max Depth = 144
  • Call Chain = bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round @@ -527,42 +531,54 @@ Global Symbols
    [Called By]
    • >>   Roulis_Handler
    -

    chavirement_handler (Thumb, 44 bytes, Stack size 16 bytes, chavirement.o(i.chavirement_handler)) +

    chavirement_handler (Thumb, 36 bytes, Stack size 16 bytes, chavirement.o(i.chavirement_handler))

    [Stack]

    • Max Depth = 168
    • Call Chain = chavirement_handler ⇒ Roulis_Handler ⇒ bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round
    -
    [Calls]
    • >>   Roulis_Handler -
    • >>   lire +
      [Calls]
      • >>   lire +
      • >>   Roulis_Handler

      [Called By]
      • >>   main
      -

      chavirement_init (Thumb, 20 bytes, Stack size 8 bytes, chavirement.o(i.chavirement_init)) +

      chavirement_init (Thumb, 28 bytes, Stack size 8 bytes, chavirement.o(i.chavirement_init))

      [Stack]

      • Max Depth = 24
      • Call Chain = chavirement_init ⇒ lire

      [Calls]
      • >>   lire +
      • >>   ecrire
      • >>   SPI_init_master

      [Called By]
      • >>   main
      +

      ecrire (Thumb, 54 bytes, Stack size 16 bytes, chavirement.o(i.ecrire)) +

      [Stack]

      • Max Depth = 16
      • Call Chain = ecrire +
      +
      [Calls]
      • >>   SPI_send +
      • >>   MyGPIO_Set +
      • >>   MyGPIO_Reset +
      +
      [Called By]
      • >>   chavirement_init +
      +

      lire (Thumb, 58 bytes, Stack size 16 bytes, chavirement.o(i.lire))

      [Stack]

      • Max Depth = 16
      • Call Chain = lire
      -
      [Calls]
      • >>   SPI_send -
      • >>   SPI_rcv +
        [Calls]
        • >>   SPI_send +
        • >>   SPI_rcv
        • >>   MyGPIO_Set -
        • >>   MyGPIO_Reset +
        • >>   MyGPIO_Reset

        [Called By]
        • >>   chavirement_init
        • >>   chavirement_handler
        -

        main (Thumb, 30 bytes, Stack size 0 bytes, principal.o(i.main)) +

        main (Thumb, 34 bytes, Stack size 0 bytes, principal.o(i.main))

        [Stack]

        • Max Depth = 168
        • Call Chain = main ⇒ chavirement_handler ⇒ Roulis_Handler ⇒ bordage ⇒ __aeabi_drsub ⇒ __aeabi_dadd ⇒ _double_epilogue ⇒ _double_round

        [Calls]
        • >>   chavirement_init
        • >>   chavirement_handler -
        • >>   MyGPIO_Activate +
        • >>   Roulis_Handler +
        • >>   MyGPIO_Activate

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

        diff --git a/Keil_Commun/Objects/projet_chavirement_CarteSTM.dep b/Keil_Commun/Objects/projet_chavirement_CarteSTM.dep index 349a7d4..ae78e42 100644 --- a/Keil_Commun/Objects/projet_chavirement_CarteSTM.dep +++ b/Keil_Commun/Objects/projet_chavirement_CarteSTM.dep @@ -34,7 +34,7 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) F (..\Drivers\MyTimer.h)(0x61852D2E)() -F (.\Local_Sources\principal.c)(0x61896043)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d) +F (.\Local_Sources\principal.c)(0x61896D74)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d) I (..\Sources\chavirement.h)(0x61853E09) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) I (.\RTE\_CarteSTM\RTE_Components.h)(0x61852267) @@ -45,7 +45,8 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC) I (..\Drivers\Driver_GPIO.h)(0x6155C0E0) -F (..\Sources\chavirement.c)(0x61896B2D)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\chavirement.o --omf_browse .\objects\chavirement.crf --depend .\objects\chavirement.d) +I (..\Sources\bordage.h)(0x618526E6) +F (..\Sources\chavirement.c)(0x618970CE)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I ..\Includes -I ..\Sources -I ..\Drivers -I.\RTE\Device\STM32F103RB -I.\RTE\_CarteSTM -IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include -D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_ -o .\objects\chavirement.o --omf_browse .\objects\chavirement.crf --depend .\objects\chavirement.d) I (..\Sources\chavirement.h)(0x61853E09) I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC) I (.\RTE\_CarteSTM\RTE_Components.h)(0x61852267) diff --git a/Keil_Commun/Objects/system_stm32f10x.o b/Keil_Commun/Objects/system_stm32f10x.o index 3ee255dae89bb694770ae804e45069a78a34d04b..abc2c6a0c82e6461b051e0ee54d6f02c5556bc03 100644 GIT binary patch delta 53 zcmbR6l7GTW{tY$4tS07GhNjJp!tIU1j6lq^y-}EX#$wi_6boJB=^wW 204 Performance Analyzer - 536 139 139 516 + 696 139 139 356 @@ -111,7 +111,7 @@ 0 1887 - 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D000000030000000100000071433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F436F6D6D756E5C4C6F63616C5F536F75726365735C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000C5D4F200FFFFFFFF60433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4472697665725F5350492E68000000000C4472697665725F5350492E6800000000FFDC7800FFFFFFFF5A433A5C55736572735C636861757A5C417070446174615C4C6F63616C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E332E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E6800000000BECEA100FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C636861766972656D656E742E63000000000D636861766972656D656E742E6300000000F0A0A100FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C636861766972656D656E742E68000000000D636861766972656D656E742E6800000000BCA8E100FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E63000000009CC1B600FFFFFFFF5D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C626F72646167652E680000000009626F72646167652E6800000000D9ADC200FFFFFFFF5D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C626F72646167652E630000000009626F72646167652E6300000000A5C2D700FFFFFFFF5D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4D7954696D65722E6800000000094D7954696D65722E6800000000B3A6BE00FFFFFFFF5D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4D7954696D65722E6300000000094D7954696D65722E6300000000EAD6A300FFFFFFFF85433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F436F6D6D756E5C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000F6FA7D00FFFFFFFF60433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4472697665725F5350492E63000000000C4472697665725F5350492E6300000000B5E99D00FFFFFFFF81433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F436F6D6D756E5C5254455C4465766963655C53544D33324631303352425C73797374656D5F73746D3332663130782E63000000001273797374656D5F73746D3332663130782E63000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002F010000660000000006000046020000 + 0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000D0000000A0000000100000071433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F436F6D6D756E5C4C6F63616C5F536F75726365735C7072696E636970616C2E63000000000B7072696E636970616C2E6300000000C5D4F200FFFFFFFF60433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4472697665725F5350492E68000000000C4472697665725F5350492E6800000000FFDC7800FFFFFFFF5A433A5C55736572735C636861757A5C417070446174615C4C6F63616C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E332E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E6800000000BECEA100FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C636861766972656D656E742E63000000000D636861766972656D656E742E6300000000F0A0A100FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C636861766972656D656E742E68000000000D636861766972656D656E742E6800000000BCA8E100FFFFFFFF61433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E63000000009CC1B600FFFFFFFF5D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C626F72646167652E680000000009626F72646167652E6800000000D9ADC200FFFFFFFF5D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C536F75726365735C626F72646167652E630000000009626F72646167652E6300000000A5C2D700FFFFFFFF5D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4D7954696D65722E6800000000094D7954696D65722E6800000000B3A6BE00FFFFFFFF5D433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4D7954696D65722E6300000000094D7954696D65722E6300000000EAD6A300FFFFFFFF85433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F436F6D6D756E5C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000F6FA7D00FFFFFFFF60433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C447269766572735C4472697665725F5350492E63000000000C4472697665725F5350492E6300000000B5E99D00FFFFFFFF81433A5C55736572735C636861757A5C446F63756D656E74735F6E6F6E5F64726976655C494E53415C34415C53375C70726F6A65745F766F696C6965725C70726F6A65745F766F696C6965725C4B65696C5F436F6D6D756E5C5254455C4465766963655C53544D33324631303352425C73797374656D5F73746D3332663130782E63000000001273797374656D5F73746D3332663130782E63000000005FC3CF00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD5000100000000000000020000002F010000660000000006000046020000 @@ -1806,7 +1806,7 @@ File 2796 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4D794750494F5F536574960000000000000013000A4D794750494F5F536574094F75745F5070756C6C0B5350495F4352315F5350450374786504435048410463706F6C06656E61626C65077370695F6372310373706905677265656E0D54494D5F434345525F434331451054494D5F43434D52315F4F43314D5F301054494D5F43434D52315F4F43324D5F300B68616E646C655F54494D320A68616E646C655F54494D0A49525148616E646C65720349525104493243320954494D325F4952516E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4D794750494F5F536574960000000000000013000A4D794750494F5F536574094F75745F5070756C6C0B5350495F4352315F5350450374786504435048410463706F6C06656E61626C65077370695F6372310373706905677265656E0D54494D5F434345525F434331451054494D5F43434D52315F4F43314D5F301054494D5F43434D52315F4F43324D5F300B68616E646C655F54494D320A68616E646C655F54494D0A49525148616E646C65720349525104493243320954494D325F4952516E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020000001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -1822,7 +1822,7 @@ Build 991 - 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500100000008436172746553544D960000000000000002000A53696D756C6174696F6E08436172746553544D00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 + 00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA000000000000000000000000000000000000000000000000010000000100000096000000030020500100000008436172746553544D960000000000000002000A53696D756C6174696F6E08436172746553544D00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000 583 @@ -3547,7 +3547,7 @@ File 2796 - 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4D794750494F5F536574960000000000000013000A4D794750494F5F536574094F75745F5070756C6C0B5350495F4352315F5350450374786504435048410463706F6C06656E61626C65077370695F6372310373706905677265656E0D54494D5F434345525F434331451054494D5F43434D52315F4F43314D5F301054494D5F43434D52315F4F43324D5F300B68616E646C655F54494D320A68616E646C655F54494D0A49525148616E646C65720349525104493243320954494D325F4952516E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 + 00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000A4D794750494F5F536574960000000000000013000A4D794750494F5F536574094F75745F5070756C6C0B5350495F4352315F5350450374786504435048410463706F6C06656E61626C65077370695F6372310373706905677265656E0D54494D5F434345525F434331451054494D5F43434D52315F4F43314D5F301054494D5F43434D52315F4F43324D5F300B68616E646C655F54494D320A68616E646C655F54494D0A49525148616E646C65720349525104493243320954494D325F4952516E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000 1423 @@ -3579,7 +3579,7 @@ Debug 2362 - 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000000002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 + 00200000010000001900FFFF01001100434D4643546F6F6C426172427574746F6ECC880000000000002500000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018017800000000000002600000000000000000000000000000000010000000100000001801D800000000004002700000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001801A800000000000002800000000000000000000000000000000010000000100000001801B80000000000000290000000000000000000000000000000001000000010000000180E57F0000000004002A00000000000000000000000000000000010000000100000001801C800000000000002B00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018000890000000000002C00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180E48B0000020001002D0000000000000000000000000000000001000000010000000180F07F0000020001002E0000000000000000000000000000000001000000010000000180E8880000020000003700000000000000000000000000000000010000000100000001803B010000020001002F0000000000000000000000000000000001000000010000000180BB8A00000200010030000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E0E01000002000100310000000D57617463682057696E646F7773000000000000000000000000010000000100000000000000000000000100000003001380D88B00000000000031000000085761746368202631000000000000000000000000010000000100000000000000000000000100000000001380D98B00000000000031000000085761746368202632000000000000000000000000010000000100000000000000000000000100000000001380CE01000000000000FFFFFFFF0C576174636820416E63686F720100000000000000010000000000000001000000000000000000000001000000000013800F0100000200010032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000004001380D28B00000000000032000000094D656D6F7279202631000000000000000000000000010000000100000000000000000000000100000000001380D38B00000000000032000000094D656D6F7279202632000000000000000000000000010000000100000000000000000000000100000000001380D48B00000000000032000000094D656D6F7279202633000000000000000000000000010000000100000000000000000000000100000000001380D58B00000000000032000000094D656D6F72792026340000000000000000000000000100000001000000000000000000000001000000000013801001000002000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000040013809307000000000000330000000855415254202326310000000000000000000000000100000001000000000000000000000001000000000013809407000000000000330000000855415254202326320000000000000000000000000100000001000000000000000000000001000000000013809507000000000000330000000855415254202326330000000000000000000000000100000001000000000000000000000001000000000013809607000000000000330000001626446562756720287072696E746629205669657765720000000000000000000000000100000001000000000000000000000001000000000013803C010000000000007200000010416E616C797369732057696E646F7773000000000000000000000000010000000100000000000000000000000100000004001380658A000000000000340000000F264C6F67696320416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380DC7F0000000000003E0000001526506572666F726D616E636520416E616C797A6572000000000000000000000000010000000100000000000000000000000100000000001380E788000000000000380000000E26436F646520436F766572616765000000000000000000000000010000000100000000000000000000000100000000001380CD01000000000000FFFFFFFF0F416E616C7973697320416E63686F7201000000000000000100000000000000010000000000000000000000010000000000138053010000000000003F0000000D54726163652057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013805401000000000000FFFFFFFF115472616365204D656E7520416E63686F720100000000000000010000000000000001000000000000000000000001000000000013802901000000000000350000001553797374656D205669657765722057696E646F77730000000000000000000000000100000001000000000000000000000001000000010013804B01000000000000FFFFFFFF1453797374656D2056696577657220416E63686F720100000000000000010000000000000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000013800189000002000000360000000F26546F6F6C626F782057696E646F7700000000000000000000000001000000010000000000000000000000010000000300138044C5000000000000FFFFFFFF0E5570646174652057696E646F77730100000000000000010000000000000001000000000000000000000001000000000013800000000000000400FFFFFFFF000000000000000000010000000000000001000000000000000000000001000000000013805B01000000000000FFFFFFFF12546F6F6C626F78204D656E75416E63686F72010000000000000001000000000000000100000000000000000000000100000000000000000005446562756764020000 898 @@ -3603,12 +3603,12 @@ 0 100 - 3 + 10 .\Local_Sources\principal.c 0 - 4 - 12 + 7 + 14 1 0 @@ -3633,9 +3633,9 @@ ..\Sources\chavirement.c - 10 - 22 - 41 + 20 + 32 + 53 1 0 @@ -3706,8 +3706,8 @@ ..\Drivers\Driver_SPI.c 0 - 78 - 87 + 88 + 108 1 0 diff --git a/Sources/chavirement.c b/Sources/chavirement.c index 2af024c..32f578c 100644 --- a/Sources/chavirement.c +++ b/Sources/chavirement.c @@ -38,7 +38,7 @@ void chavirement_init(void){ SPI_init_master(SPI1) ; //activer measure du power_ctl - //ecrire(0x2D, 1<<3); + ecrire(0x2D, 1<<3); device_id = (int) lire(0x0); @@ -46,11 +46,11 @@ void chavirement_init(void){ uint16_t chavirement_handler(void) { - uint8_t lsb = lire(0x34); - uint8_t msb = lire(0x35); - uint16_t value = ((msb << 8) + lsb); - - if ((value<384)|| (value>640)) { + uint8_t lsb = lire(0x36); + uint8_t msb = lire(0x37); + int16_t value = (int16_t) ((msb << 8) + lsb); + + if (value > 221) { //appel fonction Roulis_Handler(); }