From 7487e08f58585c72e32d39000e0482d1a084fadf Mon Sep 17 00:00:00 2001
From: joelimgu <joelimgu@gmail.com>
Date: Fri, 25 Nov 2022 16:11:27 +0100
Subject: [PATCH] interrupt girouette

---
 FileInclude/MyGirouette.c                |  17 +-
 Listings/Projet1_Simulation.map          | 294 +++++++++++------------
 Objects/Projet1_Réel.dep                 |   4 +-
 Objects/Projet1_Simulation.axf           | Bin 256052 -> 256196 bytes
 Objects/Projet1_Simulation.build_log.htm |  19 +-
 Objects/Projet1_Simulation.htm           |   6 +-
 Objects/batterie.o                       | Bin 259220 -> 259220 bytes
 Objects/driver_gpio.o                    | Bin 259760 -> 259760 bytes
 Objects/main.crf                         | Bin 240797 -> 240797 bytes
 Objects/main.o                           | Bin 263636 -> 263636 bytes
 Objects/myadc.o                          | Bin 258432 -> 258432 bytes
 Objects/mygirouette.crf                  | Bin 239791 -> 239985 bytes
 Objects/mygirouette.o                    | Bin 259792 -> 259944 bytes
 Objects/mytimer.o                        | Bin 273540 -> 273540 bytes
 Objects/myvoile.o                        | Bin 257096 -> 257096 bytes
 Objects/plateau.o                        | Bin 261804 -> 261804 bytes
 Objects/system_stm32f10x.o               | Bin 258328 -> 258328 bytes
 Objects/telecommande.o                   | Bin 264016 -> 264016 bytes
 Projet1.uvguix.imbergam                  | 151 ++++++------
 Projet1.uvoptx                           |  21 +-
 20 files changed, 268 insertions(+), 244 deletions(-)

diff --git a/FileInclude/MyGirouette.c b/FileInclude/MyGirouette.c
index da55233..f4d8d1d 100644
--- a/FileInclude/MyGirouette.c
+++ b/FileInclude/MyGirouette.c
@@ -7,6 +7,7 @@ int x = 0;
 void EXTI0_IRQHandler(void) {
 	x++;
 	//EXTI->PR &= ~(1<<0) ;
+	TIM2 -> CNT = 0 ; 
 	EXTI->PR |= (1<<0) ;
 }
 
@@ -43,14 +44,14 @@ void Init_Girouette(void){
 	TIM2->SMCR |= 0x1 << 0; // Capture Mode : 1 => seulement les fronts montants 2 => seulement les fronts descendants 3 => les 2 
 	TIM2->CCMR1 |= 0x1 << 2;
 	// 0 Reset
-//	NVIC->ISER[0] |= 1 << 6;
-//	NVIC->IP[6] = 1<<4;
-//	MyGPIO_Init(&GPIOB0);
-//	RCC->APB2ENR |= RCC_APB2ENR_AFIOEN ;
-//	AFIO->EXTICR[0] |= 0x0001; //  PB0 AFIO
-//	EXTI->RTSR |= 1 <<0 ; // rising
-//	EXTI->IMR |= 1<<0 ; //mask
-//	
+	NVIC->ISER[0] |= 1 << 6;
+	NVIC->IP[6] = 1<<4;
+	MyGPIO_Init(&GPIOB0);
+	RCC->APB2ENR |= RCC_APB2ENR_AFIOEN ;
+	AFIO->EXTICR[0] |= 0x0001; //  PB0 AFIO
+	EXTI->RTSR |= 1 <<0 ; // rising
+	EXTI->IMR |= 1<<0 ; //mask
+	
 	
 	MyGPIO_Init(&GPIOA0);
 	MyGPIO_Init(&GPIOA1);
diff --git a/Listings/Projet1_Simulation.map b/Listings/Projet1_Simulation.map
index c38e9e5..8204a40 100644
--- a/Listings/Projet1_Simulation.map
+++ b/Listings/Projet1_Simulation.map
@@ -258,49 +258,49 @@ Image Symbol Table
     .text                                    0x080006bc   Section       36  init.o(.text)
     .text                                    0x080006e0   Section        0  llushr.o(.text)
     i.EXTI0_IRQHandler                       0x08000700   Section        0  mygirouette.o(i.EXTI0_IRQHandler)
-    i.Get_Angle                              0x08000720   Section        0  mygirouette.o(i.Get_Angle)
-    i.Get_Batterie                           0x08000730   Section        0  batterie.o(i.Get_Batterie)
-    i.Get_Max_Duty                           0x08000758   Section        0  mytimer.o(i.Get_Max_Duty)
-    i.Init_Batterie                          0x08000760   Section        0  batterie.o(i.Init_Batterie)
-    i.Init_Girouette                         0x08000788   Section        0  mygirouette.o(i.Init_Girouette)
-    i.Init_Message_Reception                 0x08000814   Section        0  telecommande.o(i.Init_Message_Reception)
-    i.Init_Plateau                           0x0800084c   Section        0  plateau.o(i.Init_Plateau)
-    i.Init_USART                             0x080008c8   Section        0  telecommande.o(i.Init_USART)
-    i.MyGPIO_Init                            0x08000964   Section        0  driver_gpio.o(i.MyGPIO_Init)
-    i.MyGPIO_Reset                           0x08000a18   Section        0  driver_gpio.o(i.MyGPIO_Reset)
-    i.MyGPIO_Set                             0x08000a26   Section        0  driver_gpio.o(i.MyGPIO_Set)
-    i.MyTimer_Base_Init                      0x08000a34   Section        0  mytimer.o(i.MyTimer_Base_Init)
-    i.MyTimer_Base_Start                     0x08000aa0   Section        0  mytimer.o(i.MyTimer_Base_Start)
-    i.MyTimer_PWM                            0x08000aac   Section        0  mytimer.o(i.MyTimer_PWM)
-    i.MyVoile_Init                           0x08000c94   Section        0  myvoile.o(i.MyVoile_Init)
-    i.Send_Char                              0x08000cbc   Section        0  telecommande.o(i.Send_Char)
-    i.Send_Message                           0x08000cd8   Section        0  telecommande.o(i.Send_Message)
-    i.SetSysClock                            0x08000cf0   Section        0  system_stm32f10x.o(i.SetSysClock)
-    SetSysClock                              0x08000cf1   Thumb Code     8  system_stm32f10x.o(i.SetSysClock)
-    i.SetSysClockTo72                        0x08000cf8   Section        0  system_stm32f10x.o(i.SetSysClockTo72)
-    SetSysClockTo72                          0x08000cf9   Thumb Code   214  system_stm32f10x.o(i.SetSysClockTo72)
-    i.Set_Direction                          0x08000dd8   Section        0  plateau.o(i.Set_Direction)
-    i.Set_Duty_Cycle                         0x08000e00   Section        0  mytimer.o(i.Set_Duty_Cycle)
-    i.Set_Moteur_Plateau                     0x08000e28   Section        0  plateau.o(i.Set_Moteur_Plateau)
-    i.Set_PWM_PRCT                           0x08000e40   Section        0  mytimer.o(i.Set_PWM_PRCT)
-    i.Set_Vitesse                            0x08000e78   Section        0  plateau.o(i.Set_Vitesse)
-    i.Set_Voile                              0x08000e98   Section        0  myvoile.o(i.Set_Voile)
-    i.SystemInit                             0x08000f84   Section        0  system_stm32f10x.o(i.SystemInit)
-    i.TIM1_UP_IRQHandler                     0x08000fe4   Section        0  mytimer.o(i.TIM1_UP_IRQHandler)
-    i.TIM2_IRQHandler                        0x08001008   Section        0  mytimer.o(i.TIM2_IRQHandler)
-    i.TIM3_IRQHandler                        0x0800102c   Section        0  mytimer.o(i.TIM3_IRQHandler)
-    i.TIM4_IRQHandler                        0x08001050   Section        0  mytimer.o(i.TIM4_IRQHandler)
-    i.USART1_IRQHandler                      0x08001074   Section        0  telecommande.o(i.USART1_IRQHandler)
-    i.__scatterload_copy                     0x08001090   Section       14  handlers.o(i.__scatterload_copy)
-    i.__scatterload_null                     0x0800109e   Section        2  handlers.o(i.__scatterload_null)
-    i.__scatterload_zeroinit                 0x080010a0   Section       14  handlers.o(i.__scatterload_zeroinit)
-    i.f                                      0x080010b0   Section        0  main.o(i.f)
-    i.initADC                                0x080010f0   Section        0  myadc.o(i.initADC)
-    i.main                                   0x0800112c   Section        0  main.o(i.main)
-    i.read                                   0x080011e8   Section        0  myadc.o(i.read)
-    i.startADC                               0x08001210   Section        0  myadc.o(i.startADC)
-    .constdata                               0x08001224   Section       36  mygirouette.o(.constdata)
-    .constdata                               0x08001248   Section        8  myvoile.o(.constdata)
+    i.Get_Angle                              0x08000728   Section        0  mygirouette.o(i.Get_Angle)
+    i.Get_Batterie                           0x08000738   Section        0  batterie.o(i.Get_Batterie)
+    i.Get_Max_Duty                           0x08000760   Section        0  mytimer.o(i.Get_Max_Duty)
+    i.Init_Batterie                          0x08000768   Section        0  batterie.o(i.Init_Batterie)
+    i.Init_Girouette                         0x08000790   Section        0  mygirouette.o(i.Init_Girouette)
+    i.Init_Message_Reception                 0x08000884   Section        0  telecommande.o(i.Init_Message_Reception)
+    i.Init_Plateau                           0x080008bc   Section        0  plateau.o(i.Init_Plateau)
+    i.Init_USART                             0x08000938   Section        0  telecommande.o(i.Init_USART)
+    i.MyGPIO_Init                            0x080009d4   Section        0  driver_gpio.o(i.MyGPIO_Init)
+    i.MyGPIO_Reset                           0x08000a88   Section        0  driver_gpio.o(i.MyGPIO_Reset)
+    i.MyGPIO_Set                             0x08000a96   Section        0  driver_gpio.o(i.MyGPIO_Set)
+    i.MyTimer_Base_Init                      0x08000aa4   Section        0  mytimer.o(i.MyTimer_Base_Init)
+    i.MyTimer_Base_Start                     0x08000b10   Section        0  mytimer.o(i.MyTimer_Base_Start)
+    i.MyTimer_PWM                            0x08000b1c   Section        0  mytimer.o(i.MyTimer_PWM)
+    i.MyVoile_Init                           0x08000d04   Section        0  myvoile.o(i.MyVoile_Init)
+    i.Send_Char                              0x08000d2c   Section        0  telecommande.o(i.Send_Char)
+    i.Send_Message                           0x08000d48   Section        0  telecommande.o(i.Send_Message)
+    i.SetSysClock                            0x08000d60   Section        0  system_stm32f10x.o(i.SetSysClock)
+    SetSysClock                              0x08000d61   Thumb Code     8  system_stm32f10x.o(i.SetSysClock)
+    i.SetSysClockTo72                        0x08000d68   Section        0  system_stm32f10x.o(i.SetSysClockTo72)
+    SetSysClockTo72                          0x08000d69   Thumb Code   214  system_stm32f10x.o(i.SetSysClockTo72)
+    i.Set_Direction                          0x08000e48   Section        0  plateau.o(i.Set_Direction)
+    i.Set_Duty_Cycle                         0x08000e70   Section        0  mytimer.o(i.Set_Duty_Cycle)
+    i.Set_Moteur_Plateau                     0x08000e98   Section        0  plateau.o(i.Set_Moteur_Plateau)
+    i.Set_PWM_PRCT                           0x08000eb0   Section        0  mytimer.o(i.Set_PWM_PRCT)
+    i.Set_Vitesse                            0x08000ee8   Section        0  plateau.o(i.Set_Vitesse)
+    i.Set_Voile                              0x08000f08   Section        0  myvoile.o(i.Set_Voile)
+    i.SystemInit                             0x08000ff4   Section        0  system_stm32f10x.o(i.SystemInit)
+    i.TIM1_UP_IRQHandler                     0x08001054   Section        0  mytimer.o(i.TIM1_UP_IRQHandler)
+    i.TIM2_IRQHandler                        0x08001078   Section        0  mytimer.o(i.TIM2_IRQHandler)
+    i.TIM3_IRQHandler                        0x0800109c   Section        0  mytimer.o(i.TIM3_IRQHandler)
+    i.TIM4_IRQHandler                        0x080010c0   Section        0  mytimer.o(i.TIM4_IRQHandler)
+    i.USART1_IRQHandler                      0x080010e4   Section        0  telecommande.o(i.USART1_IRQHandler)
+    i.__scatterload_copy                     0x08001100   Section       14  handlers.o(i.__scatterload_copy)
+    i.__scatterload_null                     0x0800110e   Section        2  handlers.o(i.__scatterload_null)
+    i.__scatterload_zeroinit                 0x08001110   Section       14  handlers.o(i.__scatterload_zeroinit)
+    i.f                                      0x08001120   Section        0  main.o(i.f)
+    i.initADC                                0x08001160   Section        0  myadc.o(i.initADC)
+    i.main                                   0x0800119c   Section        0  main.o(i.main)
+    i.read                                   0x08001258   Section        0  myadc.o(i.read)
+    i.startADC                               0x08001280   Section        0  myadc.o(i.startADC)
+    .constdata                               0x08001294   Section       36  mygirouette.o(.constdata)
+    .constdata                               0x080012b8   Section        8  myvoile.o(.constdata)
     .data                                    0x20000000   Section       16  main.o(.data)
     .data                                    0x20000010   Section       16  mytimer.o(.data)
     .data                                    0x20000020   Section        4  mygirouette.o(.data)
@@ -409,46 +409,46 @@ Image Symbol Table
     __scatterload_rt2                        0x080006bd   Thumb Code     0  init.o(.text)
     __aeabi_llsr                             0x080006e1   Thumb Code    32  llushr.o(.text)
     _ll_ushift_r                             0x080006e1   Thumb Code     0  llushr.o(.text)
-    EXTI0_IRQHandler                         0x08000701   Thumb Code    24  mygirouette.o(i.EXTI0_IRQHandler)
-    Get_Angle                                0x08000721   Thumb Code    14  mygirouette.o(i.Get_Angle)
-    Get_Batterie                             0x08000731   Thumb Code    36  batterie.o(i.Get_Batterie)
-    Get_Max_Duty                             0x08000759   Thumb Code     6  mytimer.o(i.Get_Max_Duty)
-    Init_Batterie                            0x08000761   Thumb Code    32  batterie.o(i.Init_Batterie)
-    Init_Girouette                           0x08000789   Thumb Code   134  mygirouette.o(i.Init_Girouette)
-    Init_Message_Reception                   0x08000815   Thumb Code    40  telecommande.o(i.Init_Message_Reception)
-    Init_Plateau                             0x0800084d   Thumb Code    98  plateau.o(i.Init_Plateau)
-    Init_USART                               0x080008c9   Thumb Code   134  telecommande.o(i.Init_USART)
-    MyGPIO_Init                              0x08000965   Thumb Code   166  driver_gpio.o(i.MyGPIO_Init)
-    MyGPIO_Reset                             0x08000a19   Thumb Code    14  driver_gpio.o(i.MyGPIO_Reset)
-    MyGPIO_Set                               0x08000a27   Thumb Code    12  driver_gpio.o(i.MyGPIO_Set)
-    MyTimer_Base_Init                        0x08000a35   Thumb Code    98  mytimer.o(i.MyTimer_Base_Init)
-    MyTimer_Base_Start                       0x08000aa1   Thumb Code    10  mytimer.o(i.MyTimer_Base_Start)
-    MyTimer_PWM                              0x08000aad   Thumb Code   472  mytimer.o(i.MyTimer_PWM)
-    MyVoile_Init                             0x08000c95   Thumb Code    32  myvoile.o(i.MyVoile_Init)
-    Send_Char                                0x08000cbd   Thumb Code    22  telecommande.o(i.Send_Char)
-    Send_Message                             0x08000cd9   Thumb Code    24  telecommande.o(i.Send_Message)
-    Set_Direction                            0x08000dd9   Thumb Code    34  plateau.o(i.Set_Direction)
-    Set_Duty_Cycle                           0x08000e01   Thumb Code    40  mytimer.o(i.Set_Duty_Cycle)
-    Set_Moteur_Plateau                       0x08000e29   Thumb Code    24  plateau.o(i.Set_Moteur_Plateau)
-    Set_PWM_PRCT                             0x08000e41   Thumb Code    56  mytimer.o(i.Set_PWM_PRCT)
-    Set_Vitesse                              0x08000e79   Thumb Code    22  plateau.o(i.Set_Vitesse)
-    Set_Voile                                0x08000e99   Thumb Code   210  myvoile.o(i.Set_Voile)
-    SystemInit                               0x08000f85   Thumb Code    78  system_stm32f10x.o(i.SystemInit)
-    TIM1_UP_IRQHandler                       0x08000fe5   Thumb Code    28  mytimer.o(i.TIM1_UP_IRQHandler)
-    TIM2_IRQHandler                          0x08001009   Thumb Code    32  mytimer.o(i.TIM2_IRQHandler)
-    TIM3_IRQHandler                          0x0800102d   Thumb Code    28  mytimer.o(i.TIM3_IRQHandler)
-    TIM4_IRQHandler                          0x08001051   Thumb Code    28  mytimer.o(i.TIM4_IRQHandler)
-    USART1_IRQHandler                        0x08001075   Thumb Code    18  telecommande.o(i.USART1_IRQHandler)
-    __scatterload_copy                       0x08001091   Thumb Code    14  handlers.o(i.__scatterload_copy)
-    __scatterload_null                       0x0800109f   Thumb Code     2  handlers.o(i.__scatterload_null)
-    __scatterload_zeroinit                   0x080010a1   Thumb Code    14  handlers.o(i.__scatterload_zeroinit)
-    f                                        0x080010b1   Thumb Code    54  main.o(i.f)
-    initADC                                  0x080010f1   Thumb Code    50  myadc.o(i.initADC)
-    main                                     0x0800112d   Thumb Code   120  main.o(i.main)
-    read                                     0x080011e9   Thumb Code    34  myadc.o(i.read)
-    startADC                                 0x08001211   Thumb Code    14  myadc.o(i.startADC)
-    Region$$Table$$Base                      0x08001250   Number         0  anon$$obj.o(Region$$Table)
-    Region$$Table$$Limit                     0x08001270   Number         0  anon$$obj.o(Region$$Table)
+    EXTI0_IRQHandler                         0x08000701   Thumb Code    32  mygirouette.o(i.EXTI0_IRQHandler)
+    Get_Angle                                0x08000729   Thumb Code    14  mygirouette.o(i.Get_Angle)
+    Get_Batterie                             0x08000739   Thumb Code    36  batterie.o(i.Get_Batterie)
+    Get_Max_Duty                             0x08000761   Thumb Code     6  mytimer.o(i.Get_Max_Duty)
+    Init_Batterie                            0x08000769   Thumb Code    32  batterie.o(i.Init_Batterie)
+    Init_Girouette                           0x08000791   Thumb Code   220  mygirouette.o(i.Init_Girouette)
+    Init_Message_Reception                   0x08000885   Thumb Code    40  telecommande.o(i.Init_Message_Reception)
+    Init_Plateau                             0x080008bd   Thumb Code    98  plateau.o(i.Init_Plateau)
+    Init_USART                               0x08000939   Thumb Code   134  telecommande.o(i.Init_USART)
+    MyGPIO_Init                              0x080009d5   Thumb Code   166  driver_gpio.o(i.MyGPIO_Init)
+    MyGPIO_Reset                             0x08000a89   Thumb Code    14  driver_gpio.o(i.MyGPIO_Reset)
+    MyGPIO_Set                               0x08000a97   Thumb Code    12  driver_gpio.o(i.MyGPIO_Set)
+    MyTimer_Base_Init                        0x08000aa5   Thumb Code    98  mytimer.o(i.MyTimer_Base_Init)
+    MyTimer_Base_Start                       0x08000b11   Thumb Code    10  mytimer.o(i.MyTimer_Base_Start)
+    MyTimer_PWM                              0x08000b1d   Thumb Code   472  mytimer.o(i.MyTimer_PWM)
+    MyVoile_Init                             0x08000d05   Thumb Code    32  myvoile.o(i.MyVoile_Init)
+    Send_Char                                0x08000d2d   Thumb Code    22  telecommande.o(i.Send_Char)
+    Send_Message                             0x08000d49   Thumb Code    24  telecommande.o(i.Send_Message)
+    Set_Direction                            0x08000e49   Thumb Code    34  plateau.o(i.Set_Direction)
+    Set_Duty_Cycle                           0x08000e71   Thumb Code    40  mytimer.o(i.Set_Duty_Cycle)
+    Set_Moteur_Plateau                       0x08000e99   Thumb Code    24  plateau.o(i.Set_Moteur_Plateau)
+    Set_PWM_PRCT                             0x08000eb1   Thumb Code    56  mytimer.o(i.Set_PWM_PRCT)
+    Set_Vitesse                              0x08000ee9   Thumb Code    22  plateau.o(i.Set_Vitesse)
+    Set_Voile                                0x08000f09   Thumb Code   210  myvoile.o(i.Set_Voile)
+    SystemInit                               0x08000ff5   Thumb Code    78  system_stm32f10x.o(i.SystemInit)
+    TIM1_UP_IRQHandler                       0x08001055   Thumb Code    28  mytimer.o(i.TIM1_UP_IRQHandler)
+    TIM2_IRQHandler                          0x08001079   Thumb Code    32  mytimer.o(i.TIM2_IRQHandler)
+    TIM3_IRQHandler                          0x0800109d   Thumb Code    28  mytimer.o(i.TIM3_IRQHandler)
+    TIM4_IRQHandler                          0x080010c1   Thumb Code    28  mytimer.o(i.TIM4_IRQHandler)
+    USART1_IRQHandler                        0x080010e5   Thumb Code    18  telecommande.o(i.USART1_IRQHandler)
+    __scatterload_copy                       0x08001101   Thumb Code    14  handlers.o(i.__scatterload_copy)
+    __scatterload_null                       0x0800110f   Thumb Code     2  handlers.o(i.__scatterload_null)
+    __scatterload_zeroinit                   0x08001111   Thumb Code    14  handlers.o(i.__scatterload_zeroinit)
+    f                                        0x08001121   Thumb Code    54  main.o(i.f)
+    initADC                                  0x08001161   Thumb Code    50  myadc.o(i.initADC)
+    main                                     0x0800119d   Thumb Code   120  main.o(i.main)
+    read                                     0x08001259   Thumb Code    34  myadc.o(i.read)
+    startADC                                 0x08001281   Thumb Code    14  myadc.o(i.startADC)
+    Region$$Table$$Base                      0x080012c0   Number         0  anon$$obj.o(Region$$Table)
+    Region$$Table$$Limit                     0x080012e0   Number         0  anon$$obj.o(Region$$Table)
     droite                                   0x20000000   Data           4  main.o(.data)
     b                                        0x20000004   Data           4  main.o(.data)
     testBatterie                             0x20000008   Data           4  main.o(.data)
@@ -480,9 +480,9 @@ Memory Map of the image
 
   Image Entry point : 0x080000ed
 
-  Load Region LR_IROM1 (Base: 0x08000000, Size: 0x000012b0, Max: 0x00020000, ABSOLUTE)
+  Load Region LR_IROM1 (Base: 0x08000000, Size: 0x00001320, Max: 0x00020000, ABSOLUTE)
 
-    Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00001270, Max: 0x00020000, ABSOLUTE)
+    Execution Region ER_IROM1 (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x000012e0, Max: 0x00020000, ABSOLUTE)
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
@@ -515,66 +515,66 @@ Memory Map of the image
     0x080006ba   0x080006ba   0x00000002   PAD
     0x080006bc   0x080006bc   0x00000024   Code   RO          593    .text               mc_w.l(init.o)
     0x080006e0   0x080006e0   0x00000020   Code   RO          595    .text               mc_w.l(llushr.o)
-    0x08000700   0x08000700   0x00000020   Code   RO          282    i.EXTI0_IRQHandler  mygirouette.o
-    0x08000720   0x08000720   0x0000000e   Code   RO          283    i.Get_Angle         mygirouette.o
-    0x0800072e   0x0800072e   0x00000002   PAD
-    0x08000730   0x08000730   0x00000028   Code   RO          356    i.Get_Batterie      batterie.o
-    0x08000758   0x08000758   0x00000006   Code   RO           90    i.Get_Max_Duty      mytimer.o
-    0x0800075e   0x0800075e   0x00000002   PAD
-    0x08000760   0x08000760   0x00000028   Code   RO          357    i.Init_Batterie     batterie.o
-    0x08000788   0x08000788   0x0000008c   Code   RO          284    i.Init_Girouette    mygirouette.o
-    0x08000814   0x08000814   0x00000038   Code   RO          442    i.Init_Message_Reception  telecommande.o
-    0x0800084c   0x0800084c   0x0000007c   Code   RO          393    i.Init_Plateau      plateau.o
-    0x080008c8   0x080008c8   0x0000009c   Code   RO          443    i.Init_USART        telecommande.o
-    0x08000964   0x08000964   0x000000b4   Code   RO          234    i.MyGPIO_Init       driver_gpio.o
-    0x08000a18   0x08000a18   0x0000000e   Code   RO          236    i.MyGPIO_Reset      driver_gpio.o
-    0x08000a26   0x08000a26   0x0000000c   Code   RO          237    i.MyGPIO_Set        driver_gpio.o
-    0x08000a32   0x08000a32   0x00000002   PAD
-    0x08000a34   0x08000a34   0x0000006c   Code   RO           93    i.MyTimer_Base_Init  mytimer.o
-    0x08000aa0   0x08000aa0   0x0000000a   Code   RO           94    i.MyTimer_Base_Start  mytimer.o
-    0x08000aaa   0x08000aaa   0x00000002   PAD
-    0x08000aac   0x08000aac   0x000001e8   Code   RO           96    i.MyTimer_PWM       mytimer.o
-    0x08000c94   0x08000c94   0x00000028   Code   RO          325    i.MyVoile_Init      myvoile.o
-    0x08000cbc   0x08000cbc   0x0000001c   Code   RO          444    i.Send_Char         telecommande.o
-    0x08000cd8   0x08000cd8   0x00000018   Code   RO          445    i.Send_Message      telecommande.o
-    0x08000cf0   0x08000cf0   0x00000008   Code   RO          504    i.SetSysClock       system_stm32f10x.o
-    0x08000cf8   0x08000cf8   0x000000e0   Code   RO          505    i.SetSysClockTo72   system_stm32f10x.o
-    0x08000dd8   0x08000dd8   0x00000028   Code   RO          394    i.Set_Direction     plateau.o
-    0x08000e00   0x08000e00   0x00000028   Code   RO           97    i.Set_Duty_Cycle    mytimer.o
-    0x08000e28   0x08000e28   0x00000018   Code   RO          395    i.Set_Moteur_Plateau  plateau.o
-    0x08000e40   0x08000e40   0x00000038   Code   RO           98    i.Set_PWM_PRCT      mytimer.o
-    0x08000e78   0x08000e78   0x00000020   Code   RO          396    i.Set_Vitesse       plateau.o
-    0x08000e98   0x08000e98   0x000000ec   Code   RO          326    i.Set_Voile         myvoile.o
-    0x08000f84   0x08000f84   0x00000060   Code   RO          507    i.SystemInit        system_stm32f10x.o
-    0x08000fe4   0x08000fe4   0x00000024   Code   RO           99    i.TIM1_UP_IRQHandler  mytimer.o
-    0x08001008   0x08001008   0x00000024   Code   RO          100    i.TIM2_IRQHandler   mytimer.o
-    0x0800102c   0x0800102c   0x00000024   Code   RO          101    i.TIM3_IRQHandler   mytimer.o
-    0x08001050   0x08001050   0x00000024   Code   RO          102    i.TIM4_IRQHandler   mytimer.o
-    0x08001074   0x08001074   0x0000001c   Code   RO          446    i.USART1_IRQHandler  telecommande.o
-    0x08001090   0x08001090   0x0000000e   Code   RO          599    i.__scatterload_copy  mc_w.l(handlers.o)
-    0x0800109e   0x0800109e   0x00000002   Code   RO          600    i.__scatterload_null  mc_w.l(handlers.o)
-    0x080010a0   0x080010a0   0x0000000e   Code   RO          601    i.__scatterload_zeroinit  mc_w.l(handlers.o)
-    0x080010ae   0x080010ae   0x00000002   PAD
-    0x080010b0   0x080010b0   0x00000040   Code   RO            4    i.f                 main.o
-    0x080010f0   0x080010f0   0x0000003c   Code   RO          195    i.initADC           myadc.o
-    0x0800112c   0x0800112c   0x000000bc   Code   RO            5    i.main              main.o
-    0x080011e8   0x080011e8   0x00000028   Code   RO          196    i.read              myadc.o
-    0x08001210   0x08001210   0x00000014   Code   RO          197    i.startADC          myadc.o
-    0x08001224   0x08001224   0x00000024   Data   RO          285    .constdata          mygirouette.o
-    0x08001248   0x08001248   0x00000008   Data   RO          327    .constdata          myvoile.o
-    0x08001250   0x08001250   0x00000020   Data   RO          597    Region$$Table       anon$$obj.o
+    0x08000700   0x08000700   0x00000028   Code   RO          282    i.EXTI0_IRQHandler  mygirouette.o
+    0x08000728   0x08000728   0x0000000e   Code   RO          283    i.Get_Angle         mygirouette.o
+    0x08000736   0x08000736   0x00000002   PAD
+    0x08000738   0x08000738   0x00000028   Code   RO          356    i.Get_Batterie      batterie.o
+    0x08000760   0x08000760   0x00000006   Code   RO           90    i.Get_Max_Duty      mytimer.o
+    0x08000766   0x08000766   0x00000002   PAD
+    0x08000768   0x08000768   0x00000028   Code   RO          357    i.Init_Batterie     batterie.o
+    0x08000790   0x08000790   0x000000f4   Code   RO          284    i.Init_Girouette    mygirouette.o
+    0x08000884   0x08000884   0x00000038   Code   RO          442    i.Init_Message_Reception  telecommande.o
+    0x080008bc   0x080008bc   0x0000007c   Code   RO          393    i.Init_Plateau      plateau.o
+    0x08000938   0x08000938   0x0000009c   Code   RO          443    i.Init_USART        telecommande.o
+    0x080009d4   0x080009d4   0x000000b4   Code   RO          234    i.MyGPIO_Init       driver_gpio.o
+    0x08000a88   0x08000a88   0x0000000e   Code   RO          236    i.MyGPIO_Reset      driver_gpio.o
+    0x08000a96   0x08000a96   0x0000000c   Code   RO          237    i.MyGPIO_Set        driver_gpio.o
+    0x08000aa2   0x08000aa2   0x00000002   PAD
+    0x08000aa4   0x08000aa4   0x0000006c   Code   RO           93    i.MyTimer_Base_Init  mytimer.o
+    0x08000b10   0x08000b10   0x0000000a   Code   RO           94    i.MyTimer_Base_Start  mytimer.o
+    0x08000b1a   0x08000b1a   0x00000002   PAD
+    0x08000b1c   0x08000b1c   0x000001e8   Code   RO           96    i.MyTimer_PWM       mytimer.o
+    0x08000d04   0x08000d04   0x00000028   Code   RO          325    i.MyVoile_Init      myvoile.o
+    0x08000d2c   0x08000d2c   0x0000001c   Code   RO          444    i.Send_Char         telecommande.o
+    0x08000d48   0x08000d48   0x00000018   Code   RO          445    i.Send_Message      telecommande.o
+    0x08000d60   0x08000d60   0x00000008   Code   RO          504    i.SetSysClock       system_stm32f10x.o
+    0x08000d68   0x08000d68   0x000000e0   Code   RO          505    i.SetSysClockTo72   system_stm32f10x.o
+    0x08000e48   0x08000e48   0x00000028   Code   RO          394    i.Set_Direction     plateau.o
+    0x08000e70   0x08000e70   0x00000028   Code   RO           97    i.Set_Duty_Cycle    mytimer.o
+    0x08000e98   0x08000e98   0x00000018   Code   RO          395    i.Set_Moteur_Plateau  plateau.o
+    0x08000eb0   0x08000eb0   0x00000038   Code   RO           98    i.Set_PWM_PRCT      mytimer.o
+    0x08000ee8   0x08000ee8   0x00000020   Code   RO          396    i.Set_Vitesse       plateau.o
+    0x08000f08   0x08000f08   0x000000ec   Code   RO          326    i.Set_Voile         myvoile.o
+    0x08000ff4   0x08000ff4   0x00000060   Code   RO          507    i.SystemInit        system_stm32f10x.o
+    0x08001054   0x08001054   0x00000024   Code   RO           99    i.TIM1_UP_IRQHandler  mytimer.o
+    0x08001078   0x08001078   0x00000024   Code   RO          100    i.TIM2_IRQHandler   mytimer.o
+    0x0800109c   0x0800109c   0x00000024   Code   RO          101    i.TIM3_IRQHandler   mytimer.o
+    0x080010c0   0x080010c0   0x00000024   Code   RO          102    i.TIM4_IRQHandler   mytimer.o
+    0x080010e4   0x080010e4   0x0000001c   Code   RO          446    i.USART1_IRQHandler  telecommande.o
+    0x08001100   0x08001100   0x0000000e   Code   RO          599    i.__scatterload_copy  mc_w.l(handlers.o)
+    0x0800110e   0x0800110e   0x00000002   Code   RO          600    i.__scatterload_null  mc_w.l(handlers.o)
+    0x08001110   0x08001110   0x0000000e   Code   RO          601    i.__scatterload_zeroinit  mc_w.l(handlers.o)
+    0x0800111e   0x0800111e   0x00000002   PAD
+    0x08001120   0x08001120   0x00000040   Code   RO            4    i.f                 main.o
+    0x08001160   0x08001160   0x0000003c   Code   RO          195    i.initADC           myadc.o
+    0x0800119c   0x0800119c   0x000000bc   Code   RO            5    i.main              main.o
+    0x08001258   0x08001258   0x00000028   Code   RO          196    i.read              myadc.o
+    0x08001280   0x08001280   0x00000014   Code   RO          197    i.startADC          myadc.o
+    0x08001294   0x08001294   0x00000024   Data   RO          285    .constdata          mygirouette.o
+    0x080012b8   0x080012b8   0x00000008   Data   RO          327    .constdata          myvoile.o
+    0x080012c0   0x080012c0   0x00000020   Data   RO          597    Region$$Table       anon$$obj.o
 
 
-    Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x08001270, Size: 0x00000498, Max: 0x00005000, ABSOLUTE)
+    Execution Region RW_IRAM1 (Exec base: 0x20000000, Load base: 0x080012e0, Size: 0x00000498, Max: 0x00005000, ABSOLUTE)
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
-    0x20000000   0x08001270   0x00000010   Data   RW            6    .data               main.o
-    0x20000010   0x08001280   0x00000010   Data   RW          103    .data               mytimer.o
-    0x20000020   0x08001290   0x00000004   Data   RW          286    .data               mygirouette.o
-    0x20000024   0x08001294   0x00000004   Data   RW          359    .data               batterie.o
-    0x20000028   0x08001298   0x00000010   Data   RW          398    .data               plateau.o
-    0x20000038   0x080012a8   0x00000008   Data   RW          448    .data               telecommande.o
+    0x20000000   0x080012e0   0x00000010   Data   RW            6    .data               main.o
+    0x20000010   0x080012f0   0x00000010   Data   RW          103    .data               mytimer.o
+    0x20000020   0x08001300   0x00000004   Data   RW          286    .data               mygirouette.o
+    0x20000024   0x08001304   0x00000004   Data   RW          359    .data               batterie.o
+    0x20000028   0x08001308   0x00000010   Data   RW          398    .data               plateau.o
+    0x20000038   0x08001318   0x00000008   Data   RW          448    .data               telecommande.o
     0x20000040        -       0x0000000c   Zero   RW          358    .bss                batterie.o
     0x2000004c        -       0x00000018   Zero   RW          397    .bss                plateau.o
     0x20000064        -       0x00000034   Zero   RW          447    .bss                telecommande.o
@@ -592,7 +592,7 @@ Image component sizes
        206         14          0          0          0       1822   driver_gpio.o
        252         78          0         16          0     208019   main.o
        120         22          0          0          0       1248   myadc.o
-       186         14         36          4          0       1580   mygirouette.o
+       298         32         36          4          0       1612   mygirouette.o
        852         54          0         16          0       6819   mytimer.o
        276         34          8          0          0        935   myvoile.o
        220         42          0         16         24       2643   plateau.o
@@ -601,7 +601,7 @@ Image component sizes
        292         54          0          8         52       3186   telecommande.o
 
     ----------------------------------------------------------------------
-      2856        360        312         64       1112     230053   Object Totals
+      2968        378        312         64       1112     230085   Object Totals
          0          0         32          0          0          0   (incl. Generated)
          8          0          0          0          0          0   (incl. Padding)
 
@@ -657,15 +657,15 @@ Image component sizes
 
       Code (inc. data)   RO Data    RW Data    ZI Data      Debug   
 
-      4408        376        312         64       1112     229113   Grand Totals
-      4408        376        312         64       1112     229113   ELF Image Totals
-      4408        376        312         64          0          0   ROM Totals
+      4520        394        312         64       1112     229145   Grand Totals
+      4520        394        312         64       1112     229145   ELF Image Totals
+      4520        394        312         64          0          0   ROM Totals
 
 ==============================================================================
 
-    Total RO  Size (Code + RO Data)                 4720 (   4.61kB)
+    Total RO  Size (Code + RO Data)                 4832 (   4.72kB)
     Total RW  Size (RW Data + ZI Data)              1176 (   1.15kB)
-    Total ROM Size (Code + RO Data + RW Data)       4784 (   4.67kB)
+    Total ROM Size (Code + RO Data + RW Data)       4896 (   4.78kB)
 
 ==============================================================================
 
diff --git a/Objects/Projet1_Réel.dep b/Objects/Projet1_Réel.dep
index a836eea..de2690a 100644
--- a/Objects/Projet1_Réel.dep
+++ b/Objects/Projet1_Réel.dep
@@ -1,6 +1,6 @@
 Dependencies for Project 'Projet1', Target 'Réel': (DO NOT MODIFY !)
 CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC
-F (.\Sources\main.c)(0x6372807C)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude

-I.\RTE\Device\STM32F103RB

-I.\RTE\_R_el

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\main.o --omf_browse .\objects\main.crf --depend .\objects\main.d)
+F (.\Sources\main.c)(0x6380D878)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude

-I.\RTE\Device\STM32F103RB

-I.\RTE\_R_el

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\main.o --omf_browse .\objects\main.crf --depend .\objects\main.d)
 I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
 I (.\RTE\_R_el\RTE_Components.h)(0x63727F21)
 I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F2582)
@@ -50,7 +50,7 @@ I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_versio
 I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E835B22)
 I (C:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F2582)
 I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58258CCC)
-F (.\FileInclude\MyGirouette.c)(0x637280D9)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude

-I.\RTE\Device\STM32F103RB

-I.\RTE\_R_el

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\mygirouette.o --omf_browse .\objects\mygirouette.crf --depend .\objects\mygirouette.d)
+F (.\FileInclude\MyGirouette.c)(0x6380DAB7)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\FileInclude

-I.\RTE\Device\STM32F103RB

-I.\RTE\_R_el

-IC:\Programdata\Keil\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="534" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\mygirouette.o --omf_browse .\objects\mygirouette.crf --depend .\objects\mygirouette.d)
 I (FileInclude\MyGirouette.h)(0x63727F20)
 I (C:\Programdata\Keil\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58258CCC)
 I (.\RTE\_R_el\RTE_Components.h)(0x63727F21)
diff --git a/Objects/Projet1_Simulation.axf b/Objects/Projet1_Simulation.axf
index 5c3f57391062872ccef65ff4c693d2cae10301ad..22d0d82d457490db9f7ba622a1e19cb8ea62e3a3 100644
GIT binary patch
delta 5241
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
AUjP6A

delta 5062
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

diff --git a/Objects/Projet1_Simulation.build_log.htm b/Objects/Projet1_Simulation.build_log.htm
index 351bdc1..45a5faf 100644
--- a/Objects/Projet1_Simulation.build_log.htm
+++ b/Objects/Projet1_Simulation.build_log.htm
@@ -28,22 +28,19 @@ Project File Date:  11/14/2022
 *** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
 Rebuild target 'Réel'
 compiling MyADC.c...
-compiling Driver_GPIO.c...
 compiling MyGirouette.c...
-FileInclude\MyGirouette.c(26): warning:  #177-D: variable "GPIOB0"  was declared but never referenced
-  	MyGPIO_Struct_TypeDef GPIOB0={
-FileInclude\MyGirouette.c: 1 warning, 0 errors
+compiling MyTimer.c...
+compiling main.c...
 compiling MyVoile.c...
 compiling Batterie.c...
-compiling main.c...
-compiling MyTimer.c...
+compiling Driver_GPIO.c...
 assembling startup_stm32f10x_md.s...
 compiling Plateau.c...
-compiling system_stm32f10x.c...
 compiling Telecommande.c...
+compiling system_stm32f10x.c...
 linking...
-Program Size: Code=4408 RO-data=312 RW-data=64 ZI-data=1112  
-".\Objects\Projet1_Simulation.axf" - 0 Error(s), 1 Warning(s).
+Program Size: Code=4520 RO-data=312 RW-data=64 ZI-data=1112  
+".\Objects\Projet1_Simulation.axf" - 0 Error(s), 0 Warning(s).
 
 <h2>Software Packages used:</h2>
 
@@ -71,10 +68,10 @@ Package Vendor: Keil
 
    * Component: Keil::Device:Startup:1.0.0
       Source file:   Device\Source\system_stm32f10x.c
-      Source file:   Device\Source\ARM\startup_stm32f10x_md.s
       Source file:   Device\Source\ARM\STM32F1xx_OPT.s
+      Source file:   Device\Source\ARM\startup_stm32f10x_md.s
       Include file:  RTE_Driver\Config\RTE_Device.h
-Build Time Elapsed:  00:00:03
+Build Time Elapsed:  00:00:02
 </pre>
 </body>
 </html>
diff --git a/Objects/Projet1_Simulation.htm b/Objects/Projet1_Simulation.htm
index 1f9ea80..cf75e57 100644
--- a/Objects/Projet1_Simulation.htm
+++ b/Objects/Projet1_Simulation.htm
@@ -3,7 +3,7 @@
 <title>Static Call Graph - [.\Objects\Projet1_Simulation.axf]</title></head>
 <body><HR>
 <H1>Static Call Graph for image .\Objects\Projet1_Simulation.axf</H1><HR>
-<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060960: Last Updated: Mon Nov 14 18:54:52 2022
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060960: Last Updated: Fri Nov 25 16:09:58 2022
 <BR><P>
 <H3>Maximum Stack Usage =        144 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
 Call chain for Maximum Stack Depth:</H3>
@@ -433,7 +433,7 @@ Global Symbols
 
 <P><STRONG><a name="[76]"></a>_ll_ushift_r</STRONG> (Thumb, 0 bytes, Stack size 0 bytes, llushr.o(.text), UNUSED)
 
-<P><STRONG><a name="[10]"></a>EXTI0_IRQHandler</STRONG> (Thumb, 24 bytes, Stack size 0 bytes, mygirouette.o(i.EXTI0_IRQHandler))
+<P><STRONG><a name="[10]"></a>EXTI0_IRQHandler</STRONG> (Thumb, 32 bytes, Stack size 0 bytes, mygirouette.o(i.EXTI0_IRQHandler))
 <BR>[Address Reference Count : 1]<UL><LI> startup_stm32f10x_md.o(RESET)
 </UL>
 <P><STRONG><a name="[69]"></a>Get_Angle</STRONG> (Thumb, 14 bytes, Stack size 0 bytes, mygirouette.o(i.Get_Angle))
@@ -462,7 +462,7 @@ Global Symbols
 <BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
 </UL>
 
-<P><STRONG><a name="[51]"></a>Init_Girouette</STRONG> (Thumb, 134 bytes, Stack size 48 bytes, mygirouette.o(i.Init_Girouette))
+<P><STRONG><a name="[51]"></a>Init_Girouette</STRONG> (Thumb, 220 bytes, Stack size 48 bytes, mygirouette.o(i.Init_Girouette))
 <BR><BR>[Stack]<UL><LI>Max Depth = 60<LI>Call Chain = Init_Girouette &rArr; MyGPIO_Init
 </UL>
 <BR>[Calls]<UL><LI><a href="#[4e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Init
diff --git a/Objects/batterie.o b/Objects/batterie.o
index 4de0500aecd5a1fc5fe1961678cee3613731c48a..379bb3c15773182548e897007cb2d15f3cd0da84 100644
GIT binary patch
delta 66
zcmbR8l7Gre{tX&jvPPx~Mg~SkN(_t)@$n&^zOM1{3QC4%RtA<<re@8qT<xx0j6lq^
U-Ia^^#0uu5l;rIKo0(f20cOq;i~s-t

delta 66
zcmbR8l7Gre{tX&jvW6xKMg~SkN(_t)@$n&^zOM1{3QC3+R;DIarUuQfT<xx0j6lq^
U-Ia^^#0qB1REzBbo0(f20b^<sGXMYp

diff --git a/Objects/driver_gpio.o b/Objects/driver_gpio.o
index f3c729490012bdd60fbc8afee6786d14c32c8a95..f128fde150cef5067abea28f7f1ae6b7b219bb70 100644
GIT binary patch
delta 78
zcmdn+mVW~fsR_s$nJO3=7#S%sFfzo)hj{wB#>Xot8JbxcSX!ByH9HHmI}0!ZG1GQu
f0p=x3*bUQ+Ep&|;CN~;ePJYWIu-$wsbEP8yVtE!N

delta 78
zcmdn+mVW~fsR_s$nkX0<7#S%sFfzo)hj{wB#>Xot8CqDGnpl|{G&>8lI}0!ZG1GQu
f0p=x3*p1B-lXZ<5CN~;ePJYWIu-$wsbEP8yWKkAN

diff --git a/Objects/main.crf b/Objects/main.crf
index 692492baa9e7fec5acc5685d911de64a187f995a..b502f886792bc6d589e1a6ff07e8f5fe1f1c72b8 100644
GIT binary patch
delta 37
qcmbPxlW*=#z76~=Tt7B6&tYQ#f}PEhEbWpkj6lq^U6O^lWd#8Dx(iAG

delta 37
qcmbPxlW*=#z76~=Tz?u)&1Pc&g89voEbWpkj6lq^U6O^lWd#8ENefB<

diff --git a/Objects/main.o b/Objects/main.o
index 4118c4684a79060e86bd6eca901856ccebf1c415..8ad4691f07c006fa6a357c57343060d5b2359929 100644
GIT binary patch
delta 77
zcmcc8EpVk<V1oj;tdXgLk%5ts5(6Vce0+$fuWNj~f|8+`m4T&|sadlvce^b&BM>uf
gx8-JbU(aTgYLKjJJUwtXv(@A^i~`HA>|*u?03mY~iU0rr

delta 77
zcmcc8EpVk<V1oj;tf7g5k%5ts5(6Vce0+$fuWNj~f|8+ym8pr9sX?<Xce^b&BM>uf
gx8-JbU(aT2l4_u9JUwtXv(@A^i~`HA>|*u?039n8RsaA1

diff --git a/Objects/myadc.o b/Objects/myadc.o
index b7436e798aac2be804ab35035dabd89ee10902ae..d500a192ebf48a7de77c1cb93795386da0ea4460 100644
GIT binary patch
delta 67
zcmZp8%-`^sf5R0nStC;gBLgENB?d-@`1lY{U)T6}1tmi>D+5a_Q?ureT<ssZ7=f5+
W`$sNjo8>HqX{ILI4L33S+XDc@))eRf

delta 67
zcmZp8%-`^sf5R0nSwj;ABLgENB?d-@`1lY{U)T6}1tmiZD^n9IQ-kJ@T<ssZ7=f5+
W`$sNjo8>IViKfZh4L33S+XDc^G8GO0

diff --git a/Objects/mygirouette.crf b/Objects/mygirouette.crf
index ad8fd03cfde3f00e0bda8462242d10e1999fd765..a82faf5fe2bcdb521b8534b6799135a28779dc28 100644
GIT binary patch
delta 1276
zcmaJ>U2GIp6u$S|vAezZO#h%&gwUajY?c5W=#oIg`a*m`2|gGbB2hHH`QU?3YS1YK
ziejTg=!F&}!P-`%7Qto!iNp{eOw=lIHzWgu#MJ(YSpN;N_|39Q8lp_{WzPNP%y+(f
z&zTwewrcu()v=9Ahr=C*Dg>_njyBcVrexTr=&c?n7s&eX@5A)Ge!v8h>wvp~1wabO
z080b;Vzfj&&C9S@4y-Dn1@|nl8fXQeRS1s^Qe(s1IuR%*BF~vH<XktBo7F>h<WqVU
zPhM5dD4t9*Iqj}wpFXsk&Qg71o#;}|IN9a`t*GQ?2>OAX4tvhh#(J5t<KNMuTl5*L
z^Yo}(XP?Ydwx*nXDawj{31`Y)&Qr7fGEZBOkttC2)_do}#|uQYDJ_m_nyK)3wYn=x
zh_^M}sPHyKTJ&iO5*}w&yWKWM3+EZt7tIlans$JVPpGuv1L6B)^c2lLuu*&OBsH$k
zVoXze(&HADgY>wj?MW{{G@+>@>Ae&gF$uXiA&@7-t&{YeWG&t>^clES>JfW!iW*%b
z_8A(9nLwTkoge88sbwl<&;3LXS7sD1RlHpF+6C9BrP>wahCZqESQF>urGdw;kzAr-
zc2*0^-3w8F#+3UN*lj=4*rxTOo9RX@fS2wt2W64s2;A2Gqu63M$3t-39-OAem(!w$
zsZ-w+{SPN)4_Bj<=w;fC%-c)PDsctA4>7%hES$(plop4X_S``|SsKY7Z2A|vzTSwC
zsUP{!{2VPk$uv-^SZe9ks9Kz28U$PV3|dk1G}F6a@Ie&9&A-xv5}moo^c6Vxc)@<~
z8+B#UVv1=3)c+iMd8@7ViQkJ}cDmGIieB!4mt8LHz-rcboq(54mv(|JdFg_e-7f6{
z1236y?;kh4yywy&ICvQeNB^XMlJK{;nzq*zxy104`o6EG+Uvz^zwXNl^f%`{V=up>
z?q5`kMFTKDkgr8`qTAQ5$8$l<0~Q8yvCZ|X4fS)x5nso7D}gn@+CXl$2l|!WlA<W8
z6hpqjoGzvdh>!UOV{{+oqbl){Z?tFP-$_#-hcF(;{djc{J2_E|I336<;6L^aO6~_g
zT#Vx5`oiuRP*+=PJznGVK=^B)8$4d?yoq?k=lLG5boRsbH$FFcoFddmSx!5DU2udT
G(ey7cL`Sy(

delta 1126
zcmaJ=U1(fI6rTC!x_dJ-yGbfZwGw+aiM6p+t|X8MslN0nwonkvi&PZxMM0<_6a??4
zX_DH8HL=Y!?Y4q#lhv1|t#bP#tx-V?wNWwAdV?UMo354kgPKy>dNysL<RKS6_|BPo
zzHesEoIk%wAN@K#wo&Pe*@^uL!QYl`ovOD}$*5D|;6ATCl(o^71K6q`t`4QGW!%T8
zXRKy4G1i3gxi~FeuxmMZjKMW8MNt7OYpW|osJs~DT{7^l8rknkXYtA-mEuk1{le*z
zg_ljqxi~3yD(_cNH?v*JD}uV>7SXS~S&*Cj7EO0$Q=!}veS8iZYh=cyr;w5BT-y|$
zmMtzfg%-Klou9%WN6$`k^i-6e2CD0l;$4mF3EIHIhcs>^sDs&IjW9`{yYV9Kuh!~F
zY(zn$J4sfDvN4)3;(6FR4m|5#EMa9uQWQ0^K6SZ)5^6Xsagk52M<+^nRX&;&ZyAjH
zw3i(Q3_kH`h}odQr#|gw_O`)iJ`FP4Z7}ImPqg_mK7v}K8eQESHdU-vwn^Ew>Y#gV
z4$W4JS%WhbWZUJH(UWtK^^5NP_LcXu<aJZN_zmvIKTv$5Sqxd+;7UHuo#$BGxZ48d
z(p@a#EV7y|FxzX<rRhAgVT*1}U&IY!pGB{xr8IK!a<SiHeINg}$hw)O@)kQZjkDAN
zi=9hL^|{l3;c9DAL>42Oc5sVMT8!Qlz8qJIQx*k|Zgr`h*H2r##~FU0-$nC(<4MUK
znz8s&(>k~5AM`)aAbzvBw6yPxOZ>awyFG<%hGtl|CxvdaaG)pHw>O3D9NqHG@p@kh
zJ)B|RhobfW-SmAwg@U2MC_j&DKJR0o5?xg^5sgUo^WmyA<zp>!flQR=g<f{UBkJ)?
z6$dqp6`{<<%fwKiQ)KVv#666<P(JA9M^pz7)jNSMPhu;hEtGYxb5yx!>M;{nh@*k=
z$u{63^RdA26KKRVkLR(#Xfn&WA`{9n?#1z-91ZjKPb@IIDwIEQ{)52W8_GSL|8Rko
zM|#3_6x8pnRb*SeJPTh4Yz^5qZ%>>MlYw19Kk#<H3T%cS2iTlF?JDou_nr_C_5TCa
C-!NzZ

diff --git a/Objects/mygirouette.o b/Objects/mygirouette.o
index 4c39c0ceb9c91d0ce1add3795bf16f2cc92a4c9a..a6799990f1e242c3851e38249644e9270338f71e 100644
GIT binary patch
delta 5969
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
Gm*xLTNV`P<

delta 5780
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

diff --git a/Objects/mytimer.o b/Objects/mytimer.o
index 100956b9b23cbaee3a9ae04829156ec8391e1963..6626cb78430fbf7aac0464e9c72791b733d4f6d9 100644
GIT binary patch
delta 77
zcmZp<DbR9LV8a(BStC;gBLgENB?d-@`1lY{U)T6}1tmi>D+5a_Q?q74<#s`3Mj&R|
gE~v~LzJkrr&_LIiVe&-*%gLu%1h#KK&3rZi08s`OX8-^I

delta 77
zcmZp<DbR9LV8a(BSwj;ABLgENB?d-@`1lY{U)T6}1tmiZD^n9IQ-fwf<#s`3Mj&R|
gE~v~LzJe{$*hJTuVe&-*%gLu%1h#KK&3rZi08}IvmjD0&

diff --git a/Objects/myvoile.o b/Objects/myvoile.o
index e53400fb35db43be89413bf7f5a4488c45674c91..4ae5dabf3a430f3b8d9cd9ac17d9aca84109c779 100644
GIT binary patch
delta 73
zcmX?cga5=0{tY@@vPPx~Mg~SkN(_t)@$n&^zOM1{3QC4%RtA<<re@8aT<xA*j6lq^
c-II&?^%AxuOAB3NhRFw+JhwNmXFh5J00Qb2TmS$7

delta 73
zcmX?cga5=0{tY@@vW6xKMg~SkN(_t)@$n&^zOM1{3QC3+R;DIarUuQPT<xA*j6lq^
c-II&?^%6GYq-0%VhRFw+JhwNmXFh5J00YAndjJ3c

diff --git a/Objects/plateau.o b/Objects/plateau.o
index 97fb6cc30ede04311fefb6a84bcdd94e9d18eeb4..00e65b8ddea67fa36dead98e1ba373712977c32c 100644
GIT binary patch
delta 79
zcmZ4Umw(M){tXxSWQ|M}j0}v7lo%Kp;^RX+eO=?@6_gCktPCuzOwF6$^0mL^V+3NR
i?Qi**-Bz%f8k*=DGfWQTvfN(0o%tx!cJp1#r7i&cD;b9X

delta 80
zcmZ4Umw(M){tXxSWDQLej0}v7lo%Kp;^RX+eO=?@6_gAutV~U;Obwgg^0mL^V+3NR
j?Qi**-Bz$08zm>}8Z%4|<g(mew4M1V({_tp%q1=W8JHRp

diff --git a/Objects/system_stm32f10x.o b/Objects/system_stm32f10x.o
index 7f9eb65616038cb325a7b050baa82755d9ec8c38..8796660ef639e71dff31633e70f686281e56f1d2 100644
GIT binary patch
delta 73
zcmbR7h=0Z-{tYUEvPPx~Mg~SkN(_t)@$n&^zOM1{3QC4%RtA<<rsmC#g6)oij6lq^
c-BFNv!Xh?vBMV()hRF|kEVm16Vdk&}0N^?kZ2$lO

delta 73
zcmbR7h=0Z-{tYUEvW6xKMg~SkN(_t)@$n&^zOM1{3QC3+R;DIariRUqg6)oij6lq^
c-BFNv!Xh@4Bnw?*hRF|kEVm16Vdk&}0O8^jlmGw#

diff --git a/Objects/telecommande.o b/Objects/telecommande.o
index b5ec9577920dfb61cddfd2dc1e8a10cad6d96841..c890ae51511050f858394b313081b74f7c25ff68 100644
GIT binary patch
delta 84
zcmcc6Cvc%pV8aUmStC;gBLgENB?d-@`1lY{U)T6}1tmi>D+5a_Q}bq4!FE<bMj&R|
n&ML^vzlz-`(KuPxm|?Pmg5_ibW`XU=yP3~0Z8zA*tl$X%!yXn_

delta 83
zcmcc6Cvc%pV8aUmSwj;ABLgENB?d-@`1lY{U)T6}1tmiZD^n9IQ^RIf!FE<bMj&R|
m&ML^vzltrz(m>akVX}jQ<zxe9f$b@~na?n7*Wbsi=m`L-m=*N^

diff --git a/Projet1.uvguix.imbergam b/Projet1.uvguix.imbergam
index 1750778..e80ca9d 100644
--- a/Projet1.uvguix.imbergam
+++ b/Projet1.uvguix.imbergam
@@ -15,17 +15,17 @@
     <View>
       <WinId>38003</WinId>
       <ViewName>Registers</ViewName>
-      <TableColWidths>171 100</TableColWidths>
+      <TableColWidths>150 100</TableColWidths>
     </View>
     <View>
       <WinId>346</WinId>
       <ViewName>Code Coverage</ViewName>
-      <TableColWidths>1010 656</TableColWidths>
+      <TableColWidths>1010 784</TableColWidths>
     </View>
     <View>
       <WinId>204</WinId>
       <ViewName>Performance Analyzer</ViewName>
-      <TableColWidths>1170 175 175 146</TableColWidths>
+      <TableColWidths>1170 175 175 274</TableColWidths>
     </View>
   </SECTreeCtrl>
 
@@ -64,7 +64,7 @@
       <WinId>2506</WinId>
       <ViewName>Trace Data</ViewName>
       <UserString>FiltIdx=0;DescrEn=0;DescrHeight=4;FuncTrc=1;FindType=8;ColWidths=004B00870082005F004600E600C80096</UserString>
-      <TableColWidths>75 135 95 70 230 200 150</TableColWidths>
+      <TableColWidths>75 135 130 95 70 230 200 150</TableColWidths>
     </View>
     <View>
       <WinId>466</WinId>
@@ -101,17 +101,17 @@
         <yPos>-1</yPos>
       </MaxPosition>
       <NormalPosition>
-        <Top>130</Top>
-        <Left>130</Left>
-        <Right>1570</Right>
-        <Bottom>889</Bottom>
+        <Top>208</Top>
+        <Left>208</Left>
+        <Right>1744</Right>
+        <Bottom>1017</Bottom>
       </NormalPosition>
     </WindowPosition>
     <MDIClientArea>
       <RegID>0</RegID>
       <MDITabState>
-        <Len>929</Len>
-        <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000900000000000000010000002A553A5C446F63756D656E74735C3449525C54505F566F696C6965725C536F75726365735C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF49553A5C446F63756D656E74735C3449525C54505F566F696C6965725C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000FFDC7800FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D794769726F75657474652E63000000000D4D794769726F75657474652E6300000000BECEA100FFFFFFFF31553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D7954696D65722E6800000000094D7954696D65722E6800000000F0A0A100FFFFFFFF31553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D7954696D65722E6300000000094D7954696D65722E6300000000BCA8E100FFFFFFFF51433A5C50726F6772616D646174615C4B65696C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E332E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E68000000009CC1B600FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4472697665725F4750494F2E68000000000D4472697665725F4750494F2E6800000000F7B88600FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D794769726F75657474652E68000000000D4D794769726F75657474652E6800000000D9ADC200FFFFFFFF25553A5C446F63756D656E74735C3449525C54505F566F696C6965725C4D79566F696C652E6300000000094D79566F696C652E6300000000A5C2D700FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F4000000660000008007000074020000</Data>
+        <Len>1013</Len>
+        <Data>0100000004000000010000000100000001000000010000000000000002000000000000000100000001000000000000002800000028000000010000000A00000000000000010000002A553A5C446F63756D656E74735C3449525C54505F566F696C6965725C536F75726365735C6D61696E2E6300000000066D61696E2E6300000000C5D4F200FFFFFFFF49553A5C446F63756D656E74735C3449525C54505F566F696C6965725C5254455C4465766963655C53544D33324631303352425C737461727475705F73746D3332663130785F6D642E730000000016737461727475705F73746D3332663130785F6D642E7300000000FFDC7800FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D794769726F75657474652E63000000000D4D794769726F75657474652E6300000000BECEA100FFFFFFFF31553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D7954696D65722E6800000000094D7954696D65722E6800000000F0A0A100FFFFFFFF31553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D7954696D65722E6300000000094D7954696D65722E6300000000BCA8E100FFFFFFFF51433A5C50726F6772616D646174615C4B65696C5C41726D5C5061636B735C4B65696C5C53544D3332463178785F4446505C322E332E305C4465766963655C496E636C7564655C73746D3332663130782E68000000000B73746D3332663130782E68000000009CC1B600FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4472697665725F4750494F2E68000000000D4472697665725F4750494F2E6800000000F7B88600FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4D794769726F75657474652E68000000000D4D794769726F75657474652E6800000000D9ADC200FFFFFFFF25553A5C446F63756D656E74735C3449525C54505F566F696C6965725C4D79566F696C652E6300000000094D79566F696C652E6300000000A5C2D700FFFFFFFF35553A5C446F63756D656E74735C3449525C54505F566F696C6965725C46696C65496E636C7564655C4472697665725F4750494F2E63000000000D4472697665725F4750494F2E6300000000B3A6BE00FFFFFFFF0100000010000000C5D4F200FFDC7800BECEA100F0A0A100BCA8E1009CC1B600F7B88600D9ADC200A5C2D700B3A6BE00EAD6A300F6FA7D00B5E99D005FC3CF00C1838300CACAD500010000000000000002000000F40000006600000000080000FB020000</Data>
       </MDITabState>
     </MDIClientArea>
     <ViewEx>
@@ -150,7 +150,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000ED00000044020000</Data>
+          <Data>0300000066000000ED000000CB020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -170,7 +170,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000ED00000044020000</Data>
+          <Data>0300000066000000ED000000CB020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -450,7 +450,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000ED00000044020000</Data>
+          <Data>0300000066000000ED000000CB020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -470,7 +470,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000ED00000044020000</Data>
+          <Data>0300000066000000ED000000CB020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -490,7 +490,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>03000000780200007D070000CD030000</Data>
+          <Data>03000000FF020000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -530,7 +530,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>03000000780200007D070000CD030000</Data>
+          <Data>03000000FF020000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1150,7 +1150,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000ED00000044020000</Data>
+          <Data>0300000066000000ED000000CB020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1170,7 +1170,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>03000000780200007D070000CD030000</Data>
+          <Data>03000000FF020000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1190,7 +1190,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>03000000780200007D070000CD030000</Data>
+          <Data>03000000FF020000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1250,7 +1250,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>03000000780200007D070000CD030000</Data>
+          <Data>03000000FF020000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1270,7 +1270,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>03000000780200007D070000CD030000</Data>
+          <Data>03000000FF020000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1730,7 +1730,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>00000000E603000080070000F9030000</Data>
+          <Data>000000002E0400000008000041040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1799,14 +1799,14 @@
       </Window>
       <DockMan>
         <Len>3312</Len>
-        <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F40000005D020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F000000074020000000000004F000000F00000005D0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF000000005D02000080070000610200000100000001000010040000000100000076FDFFFF02010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000001000000000000007802000080070000FD030000000000006102000080070000E60300000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
+        <Data>000000000B000000000000000020000000000000FFFFFFFFFFFFFFFFF4000000DF00000090050000E3000000000000000100000004000000010000000000000000000000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000000000000F40000006600000090050000F6000000F40000004F00000090050000DF0000000000000040280046080000000B446973617373656D626C7900000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000E4020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000FB020000000000004F000000F0000000E40200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73010000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7301000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657301000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273000000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000000000000FFFFFFFFFFFFFFFF0000000015020000900500001902000000000000010000000400000001000000000000000000000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000000000000000000003002000090050000D4020000000000001902000090050000BD02000000000000404100460F0000001343616C6C20537461636B202B204C6F63616C73000000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031000000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203100000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFFFFFFFFFF0000000001000000000000000000000001000000FFFFFFFFC802000019020000CC020000BD02000000000000020000000400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000001000000FFFFFFFFFFFFFFFF00000000E402000000080000E802000001000000010000100400000001000000AFFDFFFF83010000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF010000779400000180008000000100000000000000FF020000000800004504000000000000E8020000000800002E0400000000000040820056060000000C4275696C64204F757470757401000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0742726F77736572010000007794000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
       </DockMan>
       <ToolBar>
         <RegID>59392</RegID>
         <Name>File</Name>
         <Buttons>
-          <Len>2590</Len>
-          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000002000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001254494D315F55505F49525148616E646C6572960000000000000002001254494D315F55505F49525148616E646C65720768616E646C65720000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
+          <Len>2537</Len>
+          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000000000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
         </Buttons>
         <OriginalItems>
           <Len>1423</Len>
@@ -1822,7 +1822,7 @@
         <Name>Build</Name>
         <Buttons>
           <Len>983</Len>
-          <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000000001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0000000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000452E9656C960000000000000002000A53496D756C6174696F6E0452E9656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
+          <Data>00200000010000001000FFFF01001100434D4643546F6F6C426172427574746F6ECF7F0000000000001C0000000000000000000000000000000001000000010000000180D07F0000000000001D000000000000000000000000000000000100000001000000018030800000000002001E000000000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6EC7040000000000006A0000000C4261746368204275696C2664000000000000000000000000010000000100000000000000000000000100000004000580C7040000000000006A0000000C4261746368204275696C266400000000000000000000000001000000010000000000000000000000010000000000058046070000000000006B0000000D42617463682052656275696C640000000000000000000000000100000001000000000000000000000001000000000005804707000000000000FFFFFFFF0B426174636820436C65616E0100000000000000010000000000000001000000000000000000000001000000000005809E8A0000000000001F0000000F4261746326682053657475702E2E2E000000000000000000000000010000000100000000000000000000000100000000000180D17F0000000004002000000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001804C8A0000000000002100000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001900434D4643546F6F6C426172436F6D626F426F78427574746F6EBA00000000000000000000000000000000000000000000000001000000010000009600000003002050010000000452E9656C960000000000000002000A53496D756C6174696F6E0452E9656C00000000000000000180EB880000000000002200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C07F000000000000230000000000000000000000000000000001000000010000000180B08A000000000400240000000000000000000000000000000001000000010000000180A8010000000000004E00000000000000000000000000000000010000000100000001807202000000000000530000000000000000000000000000000001000000010000000180BE010000000000005000000000000000000000000000000000010000000100000000000000054275696C64DC010000</Data>
         </Buttons>
         <OriginalItems>
           <Len>583</Len>
@@ -1851,8 +1851,8 @@
       </ToolBar>
       <ControlBarsSummary>
         <Bars>0</Bars>
-        <ScreenCX>1920</ScreenCX>
-        <ScreenCY>1080</ScreenCY>
+        <ScreenCX>2048</ScreenCX>
+        <ScreenCY>1152</ScreenCY>
       </ControlBarsSummary>
     </ViewEx>
     <ViewEx>
@@ -1871,11 +1871,11 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>F40000004F00000080070000E1000000</Data>
+          <Data>F40000004F000000000800003A010000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
-          <Data>F40000006600000080070000F8000000</Data>
+          <Data>F4000000660000000008000051010000</Data>
         </RectRecentFloat>
       </Window>
       <Window>
@@ -1891,7 +1891,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000ED00000092020000</Data>
+          <Data>0300000066000000ED000000DA020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1911,7 +1911,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000ED00000092020000</Data>
+          <Data>0300000066000000ED000000DA020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1931,7 +1931,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1951,7 +1951,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1971,7 +1971,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -1991,7 +1991,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2031,7 +2031,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>F7000000660000007D070000C8000000</Data>
+          <Data>F700000066000000FD07000021010000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2051,7 +2051,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2071,7 +2071,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2091,7 +2091,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2111,7 +2111,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2131,7 +2131,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2151,7 +2151,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2171,7 +2171,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2191,7 +2191,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000ED00000092020000</Data>
+          <Data>0300000066000000ED000000DA020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2211,7 +2211,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000ED00000092020000</Data>
+          <Data>0300000066000000ED000000DA020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2251,7 +2251,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>00000000AF020000C0030000E6030000</Data>
+          <Data>00000000F7020000000400002E040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2291,7 +2291,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>F40000006300000080070000E1000000</Data>
+          <Data>F400000063000000000800003A010000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2311,7 +2311,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>F7000000660000007D070000C8000000</Data>
+          <Data>F700000066000000FD07000021010000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2371,7 +2371,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2391,7 +2391,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>F7000000660000007D070000C8000000</Data>
+          <Data>F700000066000000FD07000021010000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2411,7 +2411,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>F7000000660000007D070000C8000000</Data>
+          <Data>F700000066000000FD07000021010000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2431,7 +2431,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>F7000000660000007D070000C8000000</Data>
+          <Data>F700000066000000FD07000021010000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2451,7 +2451,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>F7000000660000007D070000C8000000</Data>
+          <Data>F700000066000000FD07000021010000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2891,7 +2891,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>0300000066000000ED00000092020000</Data>
+          <Data>0300000066000000ED000000DA020000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2951,7 +2951,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -2971,7 +2971,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -3031,7 +3031,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>F7000000660000007D070000C8000000</Data>
+          <Data>F700000066000000FD07000021010000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -3471,7 +3471,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>00000000E603000080070000F9030000</Data>
+          <Data>000000002E0400000008000041040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -3531,7 +3531,7 @@
         <RecentRowIndex>0</RecentRowIndex>
         <RectRecentDocked>
           <Len>16</Len>
-          <Data>C7030000C60200007D070000CD030000</Data>
+          <Data>070400000E030000FD07000015040000</Data>
         </RectRecentDocked>
         <RectRecentFloat>
           <Len>16</Len>
@@ -3540,14 +3540,14 @@
       </Window>
       <DockMan>
         <Len>3311</Len>
-        <Data>000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF4000000E100000080070000E50000000100000001000010040000000100000071FFFFFF9D020000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F40000006600000080070000F8000000F40000004F00000080070000E10000000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000AB020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F0000000C2020000000000004F000000F0000000AB0200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000AB02000080070000AF02000001000000010000100400000001000000F3FDFFFF8600000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000C4030000C602000080070000FD030000C4030000AF02000080070000E603000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000100000001000000FFFFFFFFC0030000AF020000C4030000E603000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000029020000900500002D020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000000000000000000004402000090050000D4020000000000002D02000090050000BD0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
+        <Data>000000000B000000000000000020000001000000FFFFFFFFFFFFFFFFF40000003A010000000800003E0100000100000001000010040000000100000070FFFFFF09020000FFFFFFFF08000000CB00000057010000CC000000F08B00005A01000079070000D601000045890000FFFF02000B004354616262656450616E650020000001000000F4000000660000000008000051010000F40000004F000000000800003A0100000000000040280056080000000B446973617373656D626C7901000000CB00000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A6572000000005701000001000000FFFFFFFFFFFFFFFF14506572666F726D616E636520416E616C797A657200000000CC00000001000000FFFFFFFFFFFFFFFF0E4C6F67696320416E616C797A657200000000F08B000001000000FFFFFFFFFFFFFFFF0D436F646520436F766572616765000000005A01000001000000FFFFFFFFFFFFFFFF11496E737472756374696F6E205472616365000000007907000001000000FFFFFFFFFFFFFFFF0F53797374656D20416E616C797A657200000000D601000001000000FFFFFFFFFFFFFFFF104576656E742053746174697374696373000000004589000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFCB00000001000000FFFFFFFFCB000000000000000040000000000000FFFFFFFFFFFFFFFF9C0400004F000000A004000029020000000000000200000004000000010000000000000000000000FFFFFFFF2B000000E2050000CA0900002D8C00002E8C00002F8C0000308C0000318C0000328C0000338C0000348C0000358C0000368C0000378C0000388C0000398C00003A8C00003B8C00003C8C00003D8C00003E8C00003F8C0000408C0000418C000050C3000051C3000052C3000053C3000054C3000055C3000056C3000057C3000058C3000059C300005AC300005BC300005CC300005DC300005EC300005FC3000060C3000061C3000062C3000063C3000001800040000000000000A0040000660000009005000040020000A00400004F000000900500002902000000000000404100462B0000000753796D626F6C7300000000E205000001000000FFFFFFFFFFFFFFFF0A5472616365204461746100000000CA09000001000000FFFFFFFFFFFFFFFF00000000002D8C000001000000FFFFFFFFFFFFFFFF00000000002E8C000001000000FFFFFFFFFFFFFFFF00000000002F8C000001000000FFFFFFFFFFFFFFFF0000000000308C000001000000FFFFFFFFFFFFFFFF0000000000318C000001000000FFFFFFFFFFFFFFFF0000000000328C000001000000FFFFFFFFFFFFFFFF0000000000338C000001000000FFFFFFFFFFFFFFFF0000000000348C000001000000FFFFFFFFFFFFFFFF0000000000358C000001000000FFFFFFFFFFFFFFFF0000000000368C000001000000FFFFFFFFFFFFFFFF0000000000378C000001000000FFFFFFFFFFFFFFFF0000000000388C000001000000FFFFFFFFFFFFFFFF0000000000398C000001000000FFFFFFFFFFFFFFFF00000000003A8C000001000000FFFFFFFFFFFFFFFF00000000003B8C000001000000FFFFFFFFFFFFFFFF00000000003C8C000001000000FFFFFFFFFFFFFFFF00000000003D8C000001000000FFFFFFFFFFFFFFFF00000000003E8C000001000000FFFFFFFFFFFFFFFF00000000003F8C000001000000FFFFFFFFFFFFFFFF0000000000408C000001000000FFFFFFFFFFFFFFFF0000000000418C000001000000FFFFFFFFFFFFFFFF000000000050C3000001000000FFFFFFFFFFFFFFFF000000000051C3000001000000FFFFFFFFFFFFFFFF000000000052C3000001000000FFFFFFFFFFFFFFFF000000000053C3000001000000FFFFFFFFFFFFFFFF000000000054C3000001000000FFFFFFFFFFFFFFFF000000000055C3000001000000FFFFFFFFFFFFFFFF000000000056C3000001000000FFFFFFFFFFFFFFFF000000000057C3000001000000FFFFFFFFFFFFFFFF000000000058C3000001000000FFFFFFFFFFFFFFFF000000000059C3000001000000FFFFFFFFFFFFFFFF00000000005AC3000001000000FFFFFFFFFFFFFFFF00000000005BC3000001000000FFFFFFFFFFFFFFFF00000000005CC3000001000000FFFFFFFFFFFFFFFF00000000005DC3000001000000FFFFFFFFFFFFFFFF00000000005EC3000001000000FFFFFFFFFFFFFFFF00000000005FC3000001000000FFFFFFFFFFFFFFFF000000000060C3000001000000FFFFFFFFFFFFFFFF000000000061C3000001000000FFFFFFFFFFFFFFFF000000000062C3000001000000FFFFFFFFFFFFFFFF000000000063C3000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFE205000001000000FFFFFFFFE2050000000000000010000001000000FFFFFFFFFFFFFFFFF00000004F000000F4000000F3020000010000000200001004000000010000000000000000000000FFFFFFFF05000000ED0300006D000000C3000000C400000073940000018000100000010000000000000066000000F00000000A030000000000004F000000F0000000F30200000000000040410056050000000750726F6A65637401000000ED03000001000000FFFFFFFFFFFFFFFF05426F6F6B73000000006D00000001000000FFFFFFFFFFFFFFFF0946756E6374696F6E7300000000C300000001000000FFFFFFFFFFFFFFFF0954656D706C6174657300000000C400000001000000FFFFFFFFFFFFFFFF09526567697374657273010000007394000001000000FFFFFFFFFFFFFFFF00000000000000000000000000000000000000000000000001000000FFFFFFFFED03000001000000FFFFFFFFED030000000000000080000001000000FFFFFFFFFFFFFFFF00000000F302000000080000F702000001000000010000100400000001000000F3FDFFFF8600000000000000000000000000000001000000C6000000FFFFFFFF0F0000008F070000930700009407000095070000960700009007000091070000B5010000B801000038030000B9050000BA050000BB050000BC050000CB09000001800080000001000000040400000E030000000800004504000004040000F7020000000800002E04000000000000404100560F0000001343616C6C20537461636B202B204C6F63616C73010000008F07000001000000FFFFFFFFFFFFFFFF0755415254202331000000009307000001000000FFFFFFFFFFFFFFFF0755415254202332000000009407000001000000FFFFFFFFFFFFFFFF0755415254202333000000009507000001000000FFFFFFFFFFFFFFFF15446562756720287072696E74662920566965776572000000009607000001000000FFFFFFFFFFFFFFFF0757617463682031010000009007000001000000FFFFFFFFFFFFFFFF0757617463682032000000009107000001000000FFFFFFFFFFFFFFFF10547261636520457863657074696F6E7300000000B501000001000000FFFFFFFFFFFFFFFF0E4576656E7420436F756E7465727300000000B801000001000000FFFFFFFFFFFFFFFF09554C494E4B706C7573000000003803000001000000FFFFFFFFFFFFFFFF084D656D6F7279203101000000B905000001000000FFFFFFFFFFFFFFFF084D656D6F7279203200000000BA05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203300000000BB05000001000000FFFFFFFFFFFFFFFF084D656D6F7279203400000000BC05000001000000FFFFFFFFFFFFFFFF105472616365204E617669676174696F6E00000000CB09000001000000FFFFFFFFFFFFFFFF050000000000000001000000000000000100000001000000FFFFFFFF00040000F7020000040400002E04000001000000020000100400000000000000000000000000000000000000000000000000000002000000C6000000FFFFFFFF8F07000001000000FFFFFFFF8F07000001000000C6000000000000000080000000000000FFFFFFFFFFFFFFFF0000000029020000900500002D020000000000000100000004000000010000000000000000000000FFFFFFFF06000000C5000000C7000000B4010000D2010000CF0100007794000001800080000000000000000000004402000090050000D4020000000000002D02000090050000BD0200000000000040820046060000000C4275696C64204F757470757400000000C500000001000000FFFFFFFFFFFFFFFF0D46696E6420496E2046696C657300000000C700000001000000FFFFFFFFFFFFFFFF0A4572726F72204C69737400000000B401000001000000FFFFFFFFFFFFFFFF0E536F757263652042726F7773657200000000D201000001000000FFFFFFFFFFFFFFFF0E416C6C205265666572656E63657300000000CF01000001000000FFFFFFFFFFFFFFFF0642726F777365000000007794000001000000FFFFFFFFFFFFFFFFFFFFFFFF000000000000000000000000000000000000000001000000FFFFFFFFC500000001000000FFFFFFFFC5000000000000000000000000000000</Data>
       </DockMan>
       <ToolBar>
         <RegID>59392</RegID>
         <Name>File</Name>
         <Buttons>
-          <Len>2590</Len>
-          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000000000700000000000000000000000000000000010000000100000001802CE10000000004000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000001254494D315F55505F49525148616E646C6572960000000000000002001254494D315F55505F49525148616E646C65720768616E646C65720000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000100150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
+          <Len>2537</Len>
+          <Data>00200000010000002800FFFF01001100434D4643546F6F6C426172427574746F6E00E100000000000000000000000000000000000000000000000100000001000000018001E100000000000001000000000000000000000000000000000100000001000000018003E1000000000000020000000000000000000000000000000001000000010000000180CD7F0000000000000300000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000018023E100000000040004000000000000000000000000000000000100000001000000018022E100000000040005000000000000000000000000000000000100000001000000018025E10000000000000600000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001802BE10000000004000700000000000000000000000000000000010000000100000001802CE10000000000000800000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000001807A8A0000000000000900000000000000000000000000000000010000000100000001807B8A0000000004000A00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180D3B00000000000000B000000000000000000000000000000000100000001000000018015B10000000004000C0000000000000000000000000000000001000000010000000180F4B00000000004000D000000000000000000000000000000000100000001000000018036B10000000004000E00000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FF88000000000400460000000000000000000000000000000001000000010000000180FE880000000004004500000000000000000000000000000000010000000100000001800B810000000004001300000000000000000000000000000000010000000100000001800C810000000004001400000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180F0880000020000000F000000000000000000000000000000000100000001000000FFFF0100120043555646696E64436F6D626F427574746F6EE803000000000000000000000000000000000000000000000001000000010000009600000002002050000000000096000000000000000000018024E10000000000001100000000000000000000000000000000010000000100000001800A810000000000001200000000000000000000000000000000010000000100000001800000000001000000FFFFFFFF000000000000000000000000000100000001000000FFFF01001500434D4643546F6F6C4261724D656E75427574746F6E2280000002000300150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B46350000000000000000000000000100000001000000000000000000000001000000020021802280000000000000150000002153746172742F53746F70202644656275672053657373696F6E094374726C2B4635000000000000000000000000010000000100000000000000000000000100000000002180E0010000000000007500000021456E65726779204D6561737572656D656E742026776974686F75742044656275670000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180C488000000000000160000000000000000000000000000000001000000010000000180C988000000000400180000000000000000000000000000000001000000010000000180C788000000000000190000000000000000000000000000000001000000010000002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000003002180C8880000000000001700000027264B696C6C20416C6C20427265616B706F696E747320696E2043757272656E7420546172676574000000000000000000000000010000000100000000000000000000000100000000002180E50100000000000078000000264B696C6C20416C6C20427265616B706F696E747320696E204163746976652050726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180E601000000000000790000002F4B696C6C20416C6C20427265616B706F696E747320696E204D756C74692D50726F6A65637420576F726B73706163650000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF00000000000000000000000000010000000100000021804C010000020001001A0000000F2650726F6A6563742057696E646F77000000000000000000000000010000000100000000000000000000000100000008002180DD880000000000001A0000000750726F6A656374000000000000000000000000010000000100000000000000000000000100000000002180DC8B0000000000003A00000005426F6F6B73000000000000000000000000010000000100000000000000000000000100000000002180E18B0000000000003B0000000946756E6374696F6E73000000000000000000000000010000000100000000000000000000000100000000002180E28B000000000000400000000954656D706C6174657300000000000000000000000001000000010000000000000000000000010000000000218018890000000000003D0000000E536F757263652042726F777365720000000000000000000000000100000001000000000000000000000001000000000021800000000000000400FFFFFFFF00000000000000000001000000000000000100000000000000000000000100000000002180D988000000000000390000000C4275696C64204F7574707574000000000000000000000000010000000100000000000000000000000100000000002180E38B000000000000410000000B46696E64204F75747075740000000000000000000000000100000001000000000000000000000001000000000001800000000001000000FFFFFFFF0000000000000000000000000001000000010000000180FB7F0000000000001B000000000000000000000000000000000100000001000000000000000446696C65C6030000</Data>
         </Buttons>
         <OriginalItems>
           <Len>1423</Len>
@@ -3592,8 +3592,8 @@
       </ToolBar>
       <ControlBarsSummary>
         <Bars>0</Bars>
-        <ScreenCX>1920</ScreenCX>
-        <ScreenCY>1080</ScreenCY>
+        <ScreenCX>2048</ScreenCX>
+        <ScreenCY>1152</ScreenCY>
       </ControlBarsSummary>
     </ViewEx>
   </WinLayoutEx>
@@ -3607,7 +3607,7 @@
       <Doc>
         <Name>.\Sources\main.c</Name>
         <ColumnNumber>0</ColumnNumber>
-        <TopLine>28</TopLine>
+        <TopLine>29</TopLine>
         <CurrentLine>36</CurrentLine>
         <Folding>1</Folding>
         <ContractedFolders></ContractedFolders>
@@ -3624,9 +3624,9 @@
       </Doc>
       <Doc>
         <Name>.\FileInclude\MyGirouette.c</Name>
-        <ColumnNumber>4</ColumnNumber>
-        <TopLine>1</TopLine>
-        <CurrentLine>53</CurrentLine>
+        <ColumnNumber>17</ColumnNumber>
+        <TopLine>2</TopLine>
+        <CurrentLine>10</CurrentLine>
         <Folding>1</Folding>
         <ContractedFolders></ContractedFolders>
         <PaneID>0</PaneID>
@@ -3634,7 +3634,7 @@
       <Doc>
         <Name>.\FileInclude\MyTimer.h</Name>
         <ColumnNumber>13</ColumnNumber>
-        <TopLine>1</TopLine>
+        <TopLine>8</TopLine>
         <CurrentLine>28</CurrentLine>
         <Folding>1</Folding>
         <ContractedFolders></ContractedFolders>
@@ -3643,7 +3643,7 @@
       <Doc>
         <Name>.\FileInclude\MyTimer.c</Name>
         <ColumnNumber>0</ColumnNumber>
-        <TopLine>275</TopLine>
+        <TopLine>272</TopLine>
         <CurrentLine>289</CurrentLine>
         <Folding>1</Folding>
         <ContractedFolders></ContractedFolders>
@@ -3685,6 +3685,15 @@
         <ContractedFolders></ContractedFolders>
         <PaneID>0</PaneID>
       </Doc>
+      <Doc>
+        <Name>.\FileInclude\Driver_GPIO.c</Name>
+        <ColumnNumber>15</ColumnNumber>
+        <TopLine>1</TopLine>
+        <CurrentLine>35</CurrentLine>
+        <Folding>1</Folding>
+        <ContractedFolders></ContractedFolders>
+        <PaneID>0</PaneID>
+      </Doc>
     </MDIGroup>
   </MDIGroups>
 
diff --git a/Projet1.uvoptx b/Projet1.uvoptx
index 38a6422..68c2ba6 100644
--- a/Projet1.uvoptx
+++ b/Projet1.uvoptx
@@ -326,7 +326,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGTARM</Key>
-          <Name>(1010=1507,235,1883,792,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=60,88,280,548,0)(111=60,88,280,548,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=757,193,1178,598,0)(121=96,506,517,911,0)(122=1260,243,1681,648,0)(123=-1,-1,-1,-1,0)(140=699,144,1387,484,0)(240=647,562,1046,907,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=150,186,744,880,0)(131=1231,145,1825,839,0)(132=-1,-1,-1,-1,0)(133=1272,303,1866,997,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=1580,389,1907,750,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)(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)</Name>
+          <Name>(1010=1464,179,1840,736,1)(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=60,88,280,548,0)(111=60,88,280,548,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=757,193,1178,598,0)(121=973,665,1394,1070,1)(122=1260,243,1681,648,0)(123=-1,-1,-1,-1,0)(140=699,144,1387,484,0)(240=923,311,1322,656,1)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=150,186,744,880,0)(131=1231,145,1825,839,0)(132=-1,-1,-1,-1,0)(133=1272,303,1866,997,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=1580,389,1907,750,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)(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)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -359,7 +359,24 @@
           <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM))</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>11</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134219542</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>.\FileInclude\MyGirouette.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\Projet1_Simulation\FileInclude/MyGirouette.c\11</Expression>
+        </Bp>
+      </Breakpoint>
       <WatchWindow1>
         <Ww>
           <count>0</count>