PWM

timer_act2/Includes/Driver_GPIO.c

@@ -43,18 +43,6 @@ void MyGPIO_Init(MyGPIO_Struct_TypeDef * GPIOStructPtr) {
 			GPIOStructPtr->GPIO->CRL |= (GPIOStructPtr->GPIO_Conf << (GPIOStructPtr->GPIO_Pin * 4));
 		}
 	}
-
-	GPIOStructPtr->GPIO->CRL &= ~(0xF << (GPIOStructPtr->GPIO_Pin*4));
-	
-	//on met la bonne conf
-	if (GPIOStructPtr->GPIO_Conf == In_PullUp) {
-		//on est en pull up -> on met ŕ 1 par défaut
-		GPIOStructPtr->GPIO->CRL |= (In_PullDown << (GPIOStructPtr->GPIO_Pin*4));
-		MyGPIO_Set(GPIOStructPtr->GPIO, GPIOStructPtr->GPIO_Pin);
-	}
-	else {
-		GPIOStructPtr->GPIO->CRL |= (GPIOStructPtr->GPIO_Conf << (GPIOStructPtr->GPIO_Pin * 4));
-	}
 	
 }
 

timer_act2/Includes/Driver_TIMER.c

@@ -105,19 +105,19 @@ void MyTimer_PWM(TIM_TypeDef * Timer, char Channel) {
 		case 2 : 
 			Timer->CCMR1 &= ~TIM_CCMR1_OC2M_0;
 			Timer->CCMR1 |= TIM_CCMR1_OC2M_1| TIM_CCMR1_OC2M_2;
-			Timer->CCMR1 |= TIM_CCMR1_OC1PE ;
+			Timer->CCMR1 |= TIM_CCMR1_OC2PE ;
 			Timer->CCER |= TIM_CCER_CC2E;
 			break ;
 		case 3 : 
 			Timer->CCMR2 &= ~TIM_CCMR2_OC3M_0;
 			Timer->CCMR2 |= TIM_CCMR2_OC3M_1| TIM_CCMR2_OC3M_2;
-			Timer->CCMR2 |= TIM_CCMR1_OC1PE ;
+			Timer->CCMR2 |= TIM_CCMR2_OC3PE ;
 			Timer->CCER |= TIM_CCER_CC3E;
 			break ;
 		case 4 : 
 			Timer->CCMR2 &= ~TIM_CCMR2_OC4M_0;
 			Timer->CCMR2 |= TIM_CCMR2_OC4M_1| TIM_CCMR2_OC4M_2;			
-			Timer->CCMR2 |= TIM_CCMR1_OC1PE ;
+			Timer->CCMR2 |= TIM_CCMR2_OC4PE ;
 			Timer->CCER |= TIM_CCER_CC4E;
 			break ;
 	}

timer_act2/Listings/startup_stm32f10x_md.lst

@@ -465,13 +465,13 @@ ARM Macro Assembler    Page 8
               00000000 
 Command Line: --debug --xref --diag_suppress=9931 --cpu=Cortex-M3 --apcs=interw
 ork --depend=.\objects\startup_stm32f10x_md.d -o.\objects\startup_stm32f10x_md.
-o -I.\RTE\Device\STM32F103RB -I.\RTE\_Simulation -IC:\Users\chauz\AppData\Local
-\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Ar
-m\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SETA 1" --p
-redefine="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 533" --predefi
-ne="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1" 
---list=.\listings\startup_stm32f10x_md.lst RTE\Device\STM32F103RB\startup_stm32
-f10x_md.s
+o -I.\RTE\Device\STM32F103RB -I.\RTE\_carteSTM -IC:\Users\chauz\AppData\Local\A
+rm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include -IC:\Users\chauz\AppData\Local\Arm\
+Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include --predefine="__EVAL SETA 1" --pre
+define="__MICROLIB SETA 1" --predefine="__UVISION_VERSION SETA 533" --predefine
+="_RTE_ SETA 1" --predefine="STM32F10X_MD SETA 1" --predefine="_RTE_ SETA 1" --
+list=.\listings\startup_stm32f10x_md.lst RTE\Device\STM32F103RB\startup_stm32f1
+0x_md.s
 
 
 

timer_act2/Listings/timer_act2.map

@@ -10,6 +10,7 @@ Section Cross References
     principal.o(i.main) refers to driver_gpio.o(i.MyGPIO_Activate) for MyGPIO_Activate
     principal.o(i.main) refers to driver_timer.o(i.MyTimer_Base_Init) for MyTimer_Base_Init
     principal.o(i.main) refers to driver_gpio.o(i.MyGPIO_Init) for MyGPIO_Init
+    principal.o(i.main) refers to driver_gpio.o(i.MyGPIO_Set) for MyGPIO_Set
     principal.o(i.main) refers to driver_timer.o(i.MyTimer_PWM) for MyTimer_PWM
     principal.o(i.main) refers to driver_timer.o(i.MyTimer_PWM_set_cycle) for MyTimer_PWM_set_cycle
     principal.o(i.main) refers to principal.o(.data) for MonTimer
@@ -150,23 +151,23 @@ Image Symbol Table
     i.Activate_TIM                           0x0800025c   Section        0  driver_timer.o(i.Activate_TIM)
     i.MyGPIO_Activate                        0x08000284   Section        0  driver_gpio.o(i.MyGPIO_Activate)
     i.MyGPIO_Init                            0x0800029c   Section        0  driver_gpio.o(i.MyGPIO_Init)
-    i.MyGPIO_Set                             0x08000388   Section        0  driver_gpio.o(i.MyGPIO_Set)
-    i.MyTimer_Base_Init                      0x08000390   Section        0  driver_timer.o(i.MyTimer_Base_Init)
-    i.MyTimer_PWM                            0x080003a4   Section        0  driver_timer.o(i.MyTimer_PWM)
-    i.MyTimer_PWM_set_cycle                  0x08000464   Section        0  driver_timer.o(i.MyTimer_PWM_set_cycle)
-    i.SetSysClock                            0x080004e8   Section        0  system_stm32f10x.o(i.SetSysClock)
-    SetSysClock                              0x080004e9   Thumb Code     8  system_stm32f10x.o(i.SetSysClock)
-    i.SetSysClockTo72                        0x080004f0   Section        0  system_stm32f10x.o(i.SetSysClockTo72)
-    SetSysClockTo72                          0x080004f1   Thumb Code   214  system_stm32f10x.o(i.SetSysClockTo72)
-    i.SystemInit                             0x080005d0   Section        0  system_stm32f10x.o(i.SystemInit)
-    i.TIM1_TRG_COM_IRQHandler                0x08000630   Section        0  driver_timer.o(i.TIM1_TRG_COM_IRQHandler)
-    i.TIM2_IRQHandler                        0x08000654   Section        0  driver_timer.o(i.TIM2_IRQHandler)
-    i.TIM3_IRQHandler                        0x08000678   Section        0  driver_timer.o(i.TIM3_IRQHandler)
-    i.TIM4_IRQHandler                        0x0800069c   Section        0  driver_timer.o(i.TIM4_IRQHandler)
-    i.__scatterload_copy                     0x080006c0   Section       14  handlers.o(i.__scatterload_copy)
-    i.__scatterload_null                     0x080006ce   Section        2  handlers.o(i.__scatterload_null)
-    i.__scatterload_zeroinit                 0x080006d0   Section       14  handlers.o(i.__scatterload_zeroinit)
-    i.main                                   0x080006e0   Section        0  principal.o(i.main)
+    i.MyGPIO_Set                             0x08000342   Section        0  driver_gpio.o(i.MyGPIO_Set)
+    i.MyTimer_Base_Init                      0x0800034a   Section        0  driver_timer.o(i.MyTimer_Base_Init)
+    i.MyTimer_PWM                            0x0800035c   Section        0  driver_timer.o(i.MyTimer_PWM)
+    i.MyTimer_PWM_set_cycle                  0x0800041c   Section        0  driver_timer.o(i.MyTimer_PWM_set_cycle)
+    i.SetSysClock                            0x080004a0   Section        0  system_stm32f10x.o(i.SetSysClock)
+    SetSysClock                              0x080004a1   Thumb Code     8  system_stm32f10x.o(i.SetSysClock)
+    i.SetSysClockTo72                        0x080004a8   Section        0  system_stm32f10x.o(i.SetSysClockTo72)
+    SetSysClockTo72                          0x080004a9   Thumb Code   214  system_stm32f10x.o(i.SetSysClockTo72)
+    i.SystemInit                             0x08000588   Section        0  system_stm32f10x.o(i.SystemInit)
+    i.TIM1_TRG_COM_IRQHandler                0x080005e8   Section        0  driver_timer.o(i.TIM1_TRG_COM_IRQHandler)
+    i.TIM2_IRQHandler                        0x0800060c   Section        0  driver_timer.o(i.TIM2_IRQHandler)
+    i.TIM3_IRQHandler                        0x08000630   Section        0  driver_timer.o(i.TIM3_IRQHandler)
+    i.TIM4_IRQHandler                        0x08000654   Section        0  driver_timer.o(i.TIM4_IRQHandler)
+    i.__scatterload_copy                     0x08000678   Section       14  handlers.o(i.__scatterload_copy)
+    i.__scatterload_null                     0x08000686   Section        2  handlers.o(i.__scatterload_null)
+    i.__scatterload_zeroinit                 0x08000688   Section       14  handlers.o(i.__scatterload_zeroinit)
+    i.main                                   0x08000698   Section        0  principal.o(i.main)
     .data                                    0x20000000   Section       24  principal.o(.data)
     .data                                    0x20000018   Section       16  driver_timer.o(.data)
     STACK                                    0x20000028   Section     1024  startup_stm32f10x_md.o(STACK)
@@ -255,22 +256,22 @@ Image Symbol Table
     __scatterload_rt2                        0x08000239   Thumb Code     0  init.o(.text)
     Activate_TIM                             0x0800025d   Thumb Code    36  driver_timer.o(i.Activate_TIM)
     MyGPIO_Activate                          0x08000285   Thumb Code    18  driver_gpio.o(i.MyGPIO_Activate)
-    MyGPIO_Init                              0x0800029d   Thumb Code   236  driver_gpio.o(i.MyGPIO_Init)
-    MyGPIO_Set                               0x08000389   Thumb Code     8  driver_gpio.o(i.MyGPIO_Set)
-    MyTimer_Base_Init                        0x08000391   Thumb Code    18  driver_timer.o(i.MyTimer_Base_Init)
-    MyTimer_PWM                              0x080003a5   Thumb Code   188  driver_timer.o(i.MyTimer_PWM)
-    MyTimer_PWM_set_cycle                    0x08000465   Thumb Code   132  driver_timer.o(i.MyTimer_PWM_set_cycle)
-    SystemInit                               0x080005d1   Thumb Code    78  system_stm32f10x.o(i.SystemInit)
-    TIM1_TRG_COM_IRQHandler                  0x08000631   Thumb Code    28  driver_timer.o(i.TIM1_TRG_COM_IRQHandler)
-    TIM2_IRQHandler                          0x08000655   Thumb Code    32  driver_timer.o(i.TIM2_IRQHandler)
-    TIM3_IRQHandler                          0x08000679   Thumb Code    28  driver_timer.o(i.TIM3_IRQHandler)
-    TIM4_IRQHandler                          0x0800069d   Thumb Code    28  driver_timer.o(i.TIM4_IRQHandler)
-    __scatterload_copy                       0x080006c1   Thumb Code    14  handlers.o(i.__scatterload_copy)
-    __scatterload_null                       0x080006cf   Thumb Code     2  handlers.o(i.__scatterload_null)
-    __scatterload_zeroinit                   0x080006d1   Thumb Code    14  handlers.o(i.__scatterload_zeroinit)
-    main                                     0x080006e1   Thumb Code    98  principal.o(i.main)
-    Region$$Table$$Base                      0x08000754   Number         0  anon$$obj.o(Region$$Table)
-    Region$$Table$$Limit                     0x08000774   Number         0  anon$$obj.o(Region$$Table)
+    MyGPIO_Init                              0x0800029d   Thumb Code   166  driver_gpio.o(i.MyGPIO_Init)
+    MyGPIO_Set                               0x08000343   Thumb Code     8  driver_gpio.o(i.MyGPIO_Set)
+    MyTimer_Base_Init                        0x0800034b   Thumb Code    18  driver_timer.o(i.MyTimer_Base_Init)
+    MyTimer_PWM                              0x0800035d   Thumb Code   188  driver_timer.o(i.MyTimer_PWM)
+    MyTimer_PWM_set_cycle                    0x0800041d   Thumb Code   132  driver_timer.o(i.MyTimer_PWM_set_cycle)
+    SystemInit                               0x08000589   Thumb Code    78  system_stm32f10x.o(i.SystemInit)
+    TIM1_TRG_COM_IRQHandler                  0x080005e9   Thumb Code    28  driver_timer.o(i.TIM1_TRG_COM_IRQHandler)
+    TIM2_IRQHandler                          0x0800060d   Thumb Code    32  driver_timer.o(i.TIM2_IRQHandler)
+    TIM3_IRQHandler                          0x08000631   Thumb Code    28  driver_timer.o(i.TIM3_IRQHandler)
+    TIM4_IRQHandler                          0x08000655   Thumb Code    28  driver_timer.o(i.TIM4_IRQHandler)
+    __scatterload_copy                       0x08000679   Thumb Code    14  handlers.o(i.__scatterload_copy)
+    __scatterload_null                       0x08000687   Thumb Code     2  handlers.o(i.__scatterload_null)
+    __scatterload_zeroinit                   0x08000689   Thumb Code    14  handlers.o(i.__scatterload_zeroinit)
+    main                                     0x08000699   Thumb Code   124  principal.o(i.main)
+    Region$$Table$$Base                      0x0800072c   Number         0  anon$$obj.o(Region$$Table)
+    Region$$Table$$Limit                     0x0800074c   Number         0  anon$$obj.o(Region$$Table)
     MonTimer                                 0x20000000   Data           8  principal.o(.data)
     greenLed                                 0x20000008   Data           8  principal.o(.data)
     sortiePWM                                0x20000010   Data           8  principal.o(.data)
@@ -288,9 +289,9 @@ Memory Map of the image
 
   Image Entry point : 0x08000105
 
-  Load Region LR_1 (Base: 0x08000000, Size: 0x0000079c, Max: 0xffffffff, ABSOLUTE)
+  Load Region LR_1 (Base: 0x08000000, Size: 0x00000774, Max: 0xffffffff, ABSOLUTE)
 
-    Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x00000774, Max: 0xffffffff, ABSOLUTE)
+    Execution Region ER_RO (Exec base: 0x08000000, Load base: 0x08000000, Size: 0x0000074c, Max: 0xffffffff, ABSOLUTE)
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
@@ -315,36 +316,35 @@ Memory Map of the image
     0x08000238   0x08000238   0x00000024   Code   RO          299    .text               mc_w.l(init.o)
     0x0800025c   0x0800025c   0x00000028   Code   RO          129    i.Activate_TIM      driver_timer.o
     0x08000284   0x08000284   0x00000018   Code   RO           72    i.MyGPIO_Activate   driver_gpio.o
-    0x0800029c   0x0800029c   0x000000ec   Code   RO           73    i.MyGPIO_Init       driver_gpio.o
-    0x08000388   0x08000388   0x00000008   Code   RO           76    i.MyGPIO_Set        driver_gpio.o
-    0x08000390   0x08000390   0x00000012   Code   RO          131    i.MyTimer_Base_Init  driver_timer.o
-    0x080003a2   0x080003a2   0x00000002   PAD
-    0x080003a4   0x080003a4   0x000000c0   Code   RO          132    i.MyTimer_PWM       driver_timer.o
-    0x08000464   0x08000464   0x00000084   Code   RO          133    i.MyTimer_PWM_set_cycle  driver_timer.o
-    0x080004e8   0x080004e8   0x00000008   Code   RO          228    i.SetSysClock       system_stm32f10x.o
-    0x080004f0   0x080004f0   0x000000e0   Code   RO          229    i.SetSysClockTo72   system_stm32f10x.o
-    0x080005d0   0x080005d0   0x00000060   Code   RO          231    i.SystemInit        system_stm32f10x.o
-    0x08000630   0x08000630   0x00000024   Code   RO          134    i.TIM1_TRG_COM_IRQHandler  driver_timer.o
-    0x08000654   0x08000654   0x00000024   Code   RO          135    i.TIM2_IRQHandler   driver_timer.o
-    0x08000678   0x08000678   0x00000024   Code   RO          136    i.TIM3_IRQHandler   driver_timer.o
-    0x0800069c   0x0800069c   0x00000024   Code   RO          137    i.TIM4_IRQHandler   driver_timer.o
-    0x080006c0   0x080006c0   0x0000000e   Code   RO          303    i.__scatterload_copy  mc_w.l(handlers.o)
-    0x080006ce   0x080006ce   0x00000002   Code   RO          304    i.__scatterload_null  mc_w.l(handlers.o)
-    0x080006d0   0x080006d0   0x0000000e   Code   RO          305    i.__scatterload_zeroinit  mc_w.l(handlers.o)
-    0x080006de   0x080006de   0x00000002   PAD
-    0x080006e0   0x080006e0   0x00000074   Code   RO            5    i.main              principal.o
-    0x08000754   0x08000754   0x00000020   Data   RO          301    Region$$Table       anon$$obj.o
-
-
-    Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x08000774, Size: 0x00000028, Max: 0xffffffff, ABSOLUTE)
+    0x0800029c   0x0800029c   0x000000a6   Code   RO           73    i.MyGPIO_Init       driver_gpio.o
+    0x08000342   0x08000342   0x00000008   Code   RO           76    i.MyGPIO_Set        driver_gpio.o
+    0x0800034a   0x0800034a   0x00000012   Code   RO          131    i.MyTimer_Base_Init  driver_timer.o
+    0x0800035c   0x0800035c   0x000000c0   Code   RO          132    i.MyTimer_PWM       driver_timer.o
+    0x0800041c   0x0800041c   0x00000084   Code   RO          133    i.MyTimer_PWM_set_cycle  driver_timer.o
+    0x080004a0   0x080004a0   0x00000008   Code   RO          228    i.SetSysClock       system_stm32f10x.o
+    0x080004a8   0x080004a8   0x000000e0   Code   RO          229    i.SetSysClockTo72   system_stm32f10x.o
+    0x08000588   0x08000588   0x00000060   Code   RO          231    i.SystemInit        system_stm32f10x.o
+    0x080005e8   0x080005e8   0x00000024   Code   RO          134    i.TIM1_TRG_COM_IRQHandler  driver_timer.o
+    0x0800060c   0x0800060c   0x00000024   Code   RO          135    i.TIM2_IRQHandler   driver_timer.o
+    0x08000630   0x08000630   0x00000024   Code   RO          136    i.TIM3_IRQHandler   driver_timer.o
+    0x08000654   0x08000654   0x00000024   Code   RO          137    i.TIM4_IRQHandler   driver_timer.o
+    0x08000678   0x08000678   0x0000000e   Code   RO          303    i.__scatterload_copy  mc_w.l(handlers.o)
+    0x08000686   0x08000686   0x00000002   Code   RO          304    i.__scatterload_null  mc_w.l(handlers.o)
+    0x08000688   0x08000688   0x0000000e   Code   RO          305    i.__scatterload_zeroinit  mc_w.l(handlers.o)
+    0x08000696   0x08000696   0x00000002   PAD
+    0x08000698   0x08000698   0x00000094   Code   RO            5    i.main              principal.o
+    0x0800072c   0x0800072c   0x00000020   Data   RO          301    Region$$Table       anon$$obj.o
+
+
+    Execution Region ER_RW (Exec base: 0x20000000, Load base: 0x0800074c, Size: 0x00000028, Max: 0xffffffff, ABSOLUTE)
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
-    0x20000000   0x08000774   0x00000018   Data   RW            6    .data               principal.o
-    0x20000018   0x0800078c   0x00000010   Data   RW          140    .data               driver_timer.o
+    0x20000000   0x0800074c   0x00000018   Data   RW            6    .data               principal.o
+    0x20000018   0x08000764   0x00000010   Data   RW          140    .data               driver_timer.o
 
 
-    Execution Region ER_ZI (Exec base: 0x20000028, Load base: 0x0800079c, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE)
+    Execution Region ER_ZI (Exec base: 0x20000028, Load base: 0x08000774, Size: 0x00000400, Max: 0xffffffff, ABSOLUTE)
 
     Exec Addr    Load Addr    Size         Type   Attr      Idx    E Section Name        Object
 
@@ -358,16 +358,16 @@ Image component sizes
 
       Code (inc. data)   RO Data    RW Data    ZI Data      Debug   Object Name
 
-       268          6          0          0          0       2517   driver_gpio.o
+       198          6          0          0          0       2489   driver_gpio.o
        526         36          0         16          0       5511   driver_timer.o
-       116         18          0         24          0     208365   principal.o
+       148         24          0         24          0     208381   principal.o
         36          8        236          0       1024        840   startup_stm32f10x_md.o
        328         28          0          0          0       2101   system_stm32f10x.o
 
     ----------------------------------------------------------------------
-      1276         96        268         40       1024     219334   Object Totals
+      1236        102        268         40       1024     219322   Object Totals
          0          0         32          0          0          0   (incl. Generated)
-         2          0          0          0          0          0   (incl. Padding)
+         0          0          0          0          0          0   (incl. Padding)
 
     ----------------------------------------------------------------------
 
@@ -411,15 +411,15 @@ Image component sizes
 
       Code (inc. data)   RO Data    RW Data    ZI Data      Debug   
 
-      1640        112        268         40       1024     219154   Grand Totals
-      1640        112        268         40       1024     219154   ELF Image Totals
-      1640        112        268         40          0          0   ROM Totals
+      1600        118        268         40       1024     219142   Grand Totals
+      1600        118        268         40       1024     219142   ELF Image Totals
+      1600        118        268         40          0          0   ROM Totals
 
 ==============================================================================
 
-    Total RO  Size (Code + RO Data)                 1908 (   1.86kB)
+    Total RO  Size (Code + RO Data)                 1868 (   1.82kB)
     Total RW  Size (RW Data + ZI Data)              1064 (   1.04kB)
-    Total ROM Size (Code + RO Data + RW Data)       1948 (   1.90kB)
+    Total ROM Size (Code + RO Data + RW Data)       1908 (   1.86kB)
 
 ==============================================================================
 

timer_act2/Objects/driver_gpio.d

@@ -1,7 +1,7 @@
 .\objects\driver_gpio.o: Includes\Driver_GPIO.c
 .\objects\driver_gpio.o: Includes\Driver_GPIO.h
 .\objects\driver_gpio.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
-.\objects\driver_gpio.o: .\RTE\_Simulation\RTE_Components.h
+.\objects\driver_gpio.o: .\RTE\_carteSTM\RTE_Components.h
 .\objects\driver_gpio.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
 .\objects\driver_gpio.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\driver_gpio.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h

timer_act2/Objects/driver_timer.d

@@ -1,7 +1,7 @@
 .\objects\driver_timer.o: Includes\Driver_TIMER.c
 .\objects\driver_timer.o: Includes\Driver_TIMER.h
 .\objects\driver_timer.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
-.\objects\driver_timer.o: .\RTE\_Simulation\RTE_Components.h
+.\objects\driver_timer.o: .\RTE\_carteSTM\RTE_Components.h
 .\objects\driver_timer.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
 .\objects\driver_timer.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\driver_timer.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h

timer_act2/Objects/principal.d

@@ -1,6 +1,6 @@
 .\objects\principal.o: Source\principal.c
 .\objects\principal.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
-.\objects\principal.o: .\RTE\_Simulation\RTE_Components.h
+.\objects\principal.o: .\RTE\_carteSTM\RTE_Components.h
 .\objects\principal.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
 .\objects\principal.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\principal.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h

timer_act2/Objects/system_stm32f10x.d

@@ -1,6 +1,6 @@
 .\objects\system_stm32f10x.o: RTE\Device\STM32F103RB\system_stm32f10x.c
 .\objects\system_stm32f10x.o: C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h
-.\objects\system_stm32f10x.o: .\RTE\_Simulation\RTE_Components.h
+.\objects\system_stm32f10x.o: .\RTE\_carteSTM\RTE_Components.h
 .\objects\system_stm32f10x.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h
 .\objects\system_stm32f10x.o: C:\Keil_v5\ARM\ARMCC\Bin\..\include\stdint.h
 .\objects\system_stm32f10x.o: C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_version.h

timer_act2/Objects/timer_act2.build_log.htm

@@ -17,7 +17,7 @@ Library Manager: ArmAr.exe V5.06 update 7 (build 960)
 Hex Converter:   FromElf.exe V5.06 update 7 (build 960)
 CPU DLL:         SARMCM3.DLL V5.33.0.0
 Dialog DLL:      DARMSTM.DLL V1.68.0.0
-Target DLL:      UL2CM3.DLL V1.163.9.0
+Target DLL:      STLink\ST-LINKIII-KEIL_SWO.dll V3.0.8.0
 Dialog DLL:      TARMSTM.DLL V1.66.0.0
  
 <h2>Project:</h2>
@@ -26,14 +26,14 @@ Project File Date:  09/20/2021
 
 <h2>Output:</h2>
 *** Using Compiler 'V5.06 update 7 (build 960)', folder: 'C:\Keil_v5\ARM\ARMCC\Bin'
-Rebuild target 'Simulation'
+Rebuild target 'carteSTM'
 assembling startup_stm32f10x_md.s...
+compiling system_stm32f10x.c...
+compiling Driver_GPIO.c...
 compiling principal.c...
 compiling Driver_TIMER.c...
-compiling Driver_GPIO.c...
-compiling system_stm32f10x.c...
 linking...
-Program Size: Code=1640 RO-data=268 RW-data=40 ZI-data=1024  
+Program Size: Code=1600 RO-data=268 RW-data=40 ZI-data=1024  
 ".\Objects\timer_act2.axf" - 0 Error(s), 0 Warning(s).
 
 <h2>Software Packages used:</h2>
@@ -52,7 +52,7 @@ Package Vendor: Keil
 
 <h2>Collection of Component include folders:</h2>
   .\RTE\Device\STM32F103RB
-  .\RTE\_Simulation
+  .\RTE\_carteSTM
   C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include
   C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include
 
@@ -65,7 +65,7 @@ Package Vendor: Keil
       Source file:   Device\Source\system_stm32f10x.c
       Include file:  RTE_Driver\Config\RTE_Device.h
       Source file:   Device\Source\ARM\STM32F1xx_OPT.s
-Build Time Elapsed:  00:00:01
+Build Time Elapsed:  00:00:00
 </pre>
 </body>
 </html>

timer_act2/Objects/timer_act2.htm

@@ -3,7 +3,7 @@
 <title>Static Call Graph - [.\Objects\timer_act2.axf]</title></head>
 <body><HR>
 <H1>Static Call Graph for image .\Objects\timer_act2.axf</H1><HR>
-<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060960: Last Updated: Thu Sep 30 17:00:44 2021
+<BR><P>#&#060CALLGRAPH&#062# ARM Linker, 5060960: Last Updated: Mon Oct 04 17:14:18 2021
 <BR><P>
 <H3>Maximum Stack Usage =         32 bytes + Unknown(Cycles, Untraceable Function Pointers)</H3><H3>
 Call chain for Maximum Stack Depth:</H3>
@@ -342,7 +342,7 @@ Global Symbols
 <BR><BR>[Called By]<UL><LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
 </UL>
 
-<P><STRONG><a name="[3e]"></a>MyGPIO_Init</STRONG> (Thumb, 236 bytes, Stack size 4 bytes, driver_gpio.o(i.MyGPIO_Init))
+<P><STRONG><a name="[3e]"></a>MyGPIO_Init</STRONG> (Thumb, 166 bytes, Stack size 4 bytes, driver_gpio.o(i.MyGPIO_Init))
 <BR><BR>[Stack]<UL><LI>Max Depth = 4<LI>Call Chain = MyGPIO_Init
 </UL>
 <BR>[Calls]<UL><LI><a href="#[3f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Set
@@ -352,6 +352,7 @@ Global Symbols
 
 <P><STRONG><a name="[3f]"></a>MyGPIO_Set</STRONG> (Thumb, 8 bytes, Stack size 0 bytes, driver_gpio.o(i.MyGPIO_Set))
 <BR><BR>[Called By]<UL><LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Init
+<LI><a href="#[35]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;main
 </UL>
 
 <P><STRONG><a name="[47]"></a>MyTimer_Base_Init</STRONG> (Thumb, 18 bytes, Stack size 0 bytes, driver_timer.o(i.MyTimer_Base_Init))
@@ -405,12 +406,13 @@ Global Symbols
 
 <P><STRONG><a name="[55]"></a>__scatterload_zeroinit</STRONG> (Thumb, 14 bytes, Stack size unknown bytes, handlers.o(i.__scatterload_zeroinit), UNUSED)
 
-<P><STRONG><a name="[35]"></a>main</STRONG> (Thumb, 98 bytes, Stack size 0 bytes, principal.o(i.main))
+<P><STRONG><a name="[35]"></a>main</STRONG> (Thumb, 124 bytes, Stack size 0 bytes, principal.o(i.main))
 <BR><BR>[Stack]<UL><LI>Max Depth = 32<LI>Call Chain = main &rArr; MyTimer_PWM_set_cycle &rArr; __aeabi_fmul
 </UL>
 <BR>[Calls]<UL><LI><a href="#[40]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_PWM_set_cycle
 <LI><a href="#[48]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_PWM
 <LI><a href="#[47]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyTimer_Base_Init
+<LI><a href="#[3f]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Set
 <LI><a href="#[3e]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Init
 <LI><a href="#[46]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;MyGPIO_Activate
 <LI><a href="#[45]">&gt;&gt;</a>&nbsp;&nbsp;&nbsp;Activate_TIM

timer_act2/Objects/timer_act2_Simulation.dep

@@ -1,6 +1,6 @@
 Dependencies for Project 'timer_act2', Target 'Simulation': (DO NOT MODIFY !)
 CompilerVersion: 5060960::V5.06 update 7 (build 960)::.\ARMCC
-F (.\Source\principal.c)(0x6155BFA1)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes

-I.\RTE\Device\STM32F103RB

-I.\RTE\_Simulation

-IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d)
+F (.\Source\principal.c)(0x615B1920)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes

-I.\RTE\Device\STM32F103RB

-I.\RTE\_Simulation

-IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\principal.o --omf_browse .\objects\principal.crf --depend .\objects\principal.d)
 I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC)
 I (.\RTE\_Simulation\RTE_Components.h)(0x6155BC26)
 I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392)
@@ -10,8 +10,8 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms
 I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392)
 I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC)
 I (.\Includes\Driver_GPIO.h)(0x6155C0E0)
-I (.\Includes\Driver_TIMER.h)(0x6155D118)
-F (.\Includes\Driver_GPIO.c)(0x614DFC28)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes

-I.\RTE\Device\STM32F103RB

-I.\RTE\_Simulation

-IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\driver_gpio.o --omf_browse .\objects\driver_gpio.crf --depend .\objects\driver_gpio.d)
+I (.\Includes\Driver_TIMER.h)(0x6155D187)
+F (.\Includes\Driver_GPIO.c)(0x615B16FD)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes

-I.\RTE\Device\STM32F103RB

-I.\RTE\_Simulation

-IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\driver_gpio.o --omf_browse .\objects\driver_gpio.crf --depend .\objects\driver_gpio.d)
 I (Includes\Driver_GPIO.h)(0x6155C0E0)
 I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC)
 I (.\RTE\_Simulation\RTE_Components.h)(0x6155BC26)
@@ -22,8 +22,8 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms
 I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392)
 I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC)
 F (.\Includes\Driver_GPIO.h)(0x6155C0E0)()
-F (.\Includes\Driver_TIMER.c)(0x6155D111)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes

-I.\RTE\Device\STM32F103RB

-I.\RTE\_Simulation

-IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\driver_timer.o --omf_browse .\objects\driver_timer.crf --depend .\objects\driver_timer.d)
-I (Includes\Driver_TIMER.h)(0x6155D118)
+F (.\Includes\Driver_TIMER.c)(0x615B1738)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes

-I.\RTE\Device\STM32F103RB

-I.\RTE\_Simulation

-IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\driver_timer.o --omf_browse .\objects\driver_timer.crf --depend .\objects\driver_timer.d)
+I (Includes\Driver_TIMER.h)(0x6155D187)
 I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\stm32f10x.h)(0x58259ADC)
 I (.\RTE\_Simulation\RTE_Components.h)(0x6155BC26)
 I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\core_cm3.h)(0x5E8F3392)
@@ -32,7 +32,7 @@ I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cms
 I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_compiler.h)(0x5E836932)
 I (C:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include\cmsis_armcc.h)(0x5E8F3392)
 I (C:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include\system_stm32f10x.h)(0x58259ADC)
-F (.\Includes\Driver_TIMER.h)(0x6155D118)()
+F (.\Includes\Driver_TIMER.h)(0x6155D187)()
 F (RTE\Device\STM32F103RB\RTE_Device.h)(0x59284216)()
 F (RTE\Device\STM32F103RB\startup_stm32f10x_md.s)(0x58259ADC)(--cpu Cortex-M3 --pd "__EVAL SETA 1" -g --apcs=interwork --pd "__MICROLIB SETA 1"

-I.\RTE\Device\STM32F103RB

-I.\RTE\_Simulation

-IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

--pd "__UVISION_VERSION SETA 533" --pd "_RTE_ SETA 1" --pd "STM32F10X_MD SETA 1" --pd "_RTE_ SETA 1"

--list .\listings\startup_stm32f10x_md.lst --xref -o .\objects\startup_stm32f10x_md.o --depend .\objects\startup_stm32f10x_md.d)
 F (RTE\Device\STM32F103RB\system_stm32f10x.c)(0x58259ADC)(-c --cpu Cortex-M3 -D__EVAL -D__MICROLIB -g -O0 --apcs=interwork --split_sections -I .\Includes

-I.\RTE\Device\STM32F103RB

-I.\RTE\_Simulation

-IC:\Users\chauz\AppData\Local\Arm\Packs\ARM\CMSIS\5.7.0\CMSIS\Core\Include

-IC:\Users\chauz\AppData\Local\Arm\Packs\Keil\STM32F1xx_DFP\2.3.0\Device\Include

-D__UVISION_VERSION="533" -D_RTE_ -DSTM32F10X_MD -D_RTE_

-o .\objects\system_stm32f10x.o --omf_browse .\objects\system_stm32f10x.crf --depend .\objects\system_stm32f10x.d)

timer_act2/RTE/_carteSTM/RTE_Components.h

@@ -0,0 +1,21 @@
+
+/*
+ * Auto generated Run-Time-Environment Configuration File
+ *      *** Do not modify ! ***
+ *
+ * Project: 'timer_act2' 
+ * Target:  'carteSTM' 
+ */
+
+#ifndef RTE_COMPONENTS_H
+#define RTE_COMPONENTS_H
+
+
+/*
+ * Define the Device Header File: 
+ */
+#define CMSIS_device_header "stm32f10x.h"
+
+
+
+#endif /* RTE_COMPONENTS_H */

timer_act2/Source/principal.c

@@ -12,11 +12,11 @@ void callback_TIM2(void) {
 
 int main(void) {
 	//activation du timer 2 et du GPIO A
-	Activate_TIM(2);
+	Activate_TIM(1);
 	MyGPIO_Activate(1);
 
 	//Configuration du timer 2
-	MonTimer.Timer = TIM2 ;
+	MonTimer.Timer = TIM1 ;
 
 	//méthode PGCD
 	//MonTimer.ARR = 65454;
@@ -29,24 +29,26 @@ int main(void) {
 	MonTimer.PSC = 0 ;
 	MyTimer_Base_Init(&MonTimer);
 
-	//Configuration de la sortie PWM timer 2 channel 3 sur pin PA2
+	//Configuration de la sortie PWM timer 2 channel 4 sur pin PA2
 	sortiePWM.GPIO = GPIOA;
-	sortiePWM.GPIO_Pin = 2 ;
+	sortiePWM.GPIO_Pin = 8 ;
 	sortiePWM.GPIO_Conf = AltOut_Ppull ;
 	MyGPIO_Init(&sortiePWM);
+	MyGPIO_Set(GPIOA, 8) ;
 
-	/*greenLed.GPIO = GPIOA;
+	//Configuration de la diode
+	greenLed.GPIO = GPIOA;
 	greenLed.GPIO_Pin = 5 ;
 	greenLed.GPIO_Conf = Out_Ppull ;
-	 
-	MyGPIO_Init(&greenLed);	*/
+	MyGPIO_Init(&greenLed);	
+
 
 	/*MyGPIO_Set(greenLed.GPIO,greenLed.GPIO_Pin);
 
 	MyTimer_Active_IT(TIM2, 1, callback_TIM2);*/
 	MyTimer_Base_Start(MonTimer.Timer);
-	MyTimer_PWM(MonTimer.Timer, 3);
-	MyTimer_PWM_set_cycle(MonTimer.Timer, 0.20, 3);
+	MyTimer_PWM(MonTimer.Timer, 1);
+	MyTimer_PWM_set_cycle(MonTimer.Timer, 0.2, 1);
 
 	while(1) {}
 

timer_act2/timer_act2.uvoptx

@@ -125,7 +125,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGDARM</Key>
-          <Name>(1010=75,104,451,661,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=91,141,311,601,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=672,91,1093,518,0)(121=75,104,496,531,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=791,113,1385,864,0)(131=530,21,1124,772,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
+          <Name>(1010=75,104,451,661,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=91,141,311,601,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=1070,34,1491,461,0)(121=75,104,496,531,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=791,113,1385,864,0)(131=823,113,1417,864,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -184,13 +184,28 @@
       <LogicAnalyzers>
         <Wi>
           <IntNumber>0</IntNumber>
-          <FirstString>((PORTA &amp; 0x00000004) &gt;&gt; 2 &amp; 0x4) &gt;&gt; 2</FirstString>
-          <SecondString>000080000000000000000000000000000000F03F0000000000000000000000000000000028504F5254412026203078303030303030303429203E3E2032000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F19000000000000000000000000000000000000002C050008</SecondString>
+          <FirstString>`TIM2_CNT</FirstString>
+          <SecondString>00000000000000000000000000000000007086400000000000000000000000000000000054494D325F434E5400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000010000009A9999999999C93F17000000000000000000000000000000000000006E050008</SecondString>
         </Wi>
         <Wi>
           <IntNumber>1</IntNumber>
-          <FirstString>`TIM2_CNT</FirstString>
-          <SecondString>00000000000000000000000000000000007086400000000000000000000000000000000054494D325F434E540000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F19000000000000000000000000000000000000006E050008</SecondString>
+          <FirstString>((porta &amp; 0x00000004) &gt;&gt; 2 &amp; 0x4) &gt;&gt; 2</FirstString>
+          <SecondString>000080000000000000000000000000000000F03F0000000000000000000000000000000028706F7274612026203078303030303030303429203E3E20320000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000020000009A9999999999C93F1700000000000000000000000000000000000000E0060008</SecondString>
+        </Wi>
+        <Wi>
+          <IntNumber>2</IntNumber>
+          <FirstString>((porta &amp; 0x00000008) &gt;&gt; 3 &amp; 0x8) &gt;&gt; 3</FirstString>
+          <SecondString>000080000000000000000000000000000000F03F0000000000000000000000000000000028706F7274612026203078303030303030303829203E3E20330000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000030000009A9999999999C93F1700000000000000000000000000000000000000E0060008</SecondString>
+        </Wi>
+        <Wi>
+          <IntNumber>3</IntNumber>
+          <FirstString>((porta &amp; 0x00000100) &gt;&gt; 8 &amp; 0x100) &gt;&gt; 8</FirstString>
+          <SecondString>000000000000000000000000000000000000F03F0000000000000000000000000000000028706F7274612026203078303030303031303029203E3E20380000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000040000009A9999999999C93F170000000000000000000000000000000000000098060008</SecondString>
+        </Wi>
+        <Wi>
+          <IntNumber>4</IntNumber>
+          <FirstString>`TIM1_CNT</FirstString>
+          <SecondString>FF000000000000000000000000000000007086400000000000000000000000000000000054494D315F434E5400000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000001000000050000009A9999999999C93F170000000000000000000000000000000000000014070008</SecondString>
         </Wi>
       </LogicAnalyzers>
       <DebugDescription>
@@ -307,7 +322,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGTARM</Key>
-          <Name>(1010=75,104,451,661,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=150,126,744,820,0)(131=150,126,744,820,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(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=75,104,451,661,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=120,153,364,701,0)(100=15,39,661,712,0)(110=374,60,594,520,0)(111=361,92,581,552,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=426,114,847,519,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=150,126,744,820,0)(131=307,45,901,739,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(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>
@@ -317,7 +332,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U-O206 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
+          <Name>-U0672FF524951775087241345 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>