diff --git a/ProjetsKEIL/Drivers/Source/Principale.c b/ProjetsKEIL/Drivers/Source/Principale.c
index 1110976..8a259e2 100644
--- a/ProjetsKEIL/Drivers/Source/Principale.c
+++ b/ProjetsKEIL/Drivers/Source/Principale.c
@@ -4,15 +4,16 @@
 
 int main (void)
 {
-	int returnValue;
 	MyGPIO_Struct_TypeDef led = {GPIOA,5,Out_PullUp};	//led
+	MyGPIO_Struct_TypeDef bouton = {GPIOC,13,In_PullDown};	//bouton poussoir
 	MyGPIO_Init(&led);
-	TIM2->PSC = 7199;
-	TIM2->ARR = 499;
-	TIM2->CR1 = TIM2->CR1 | (0x01<<CEN);
-	//Pour reset le timer : RCC_APB1RSTR
-	do{
-		returnValue = TIM2->CNT;
-	}while(1) ;	
-	
-}
+	MyGPIO_Init(&bouton);
+ 	while(1){
+		if(MyGPIO_Read(GPIOC,13))
+		{
+			MyGPIO_Reset(GPIOA,5);
+		} else {
+			MyGPIO_Set(GPIOA,5);
+		}
+ 	};	
+ }
\ No newline at end of file
diff --git a/ProjetsKEIL/Drivers/gpiodriver.uvoptx b/ProjetsKEIL/Drivers/gpiodriver.uvoptx
index bdb47fa..49eb306 100644
--- a/ProjetsKEIL/Drivers/gpiodriver.uvoptx
+++ b/ProjetsKEIL/Drivers/gpiodriver.uvoptx
@@ -155,6 +155,22 @@
           <ExecCommand></ExecCommand>
           <Expression>\\cool_Simule\Source/Principale.c\15</Expression>
         </Bp>
+        <Bp>
+          <Number>1</Number>
+          <Type>0</Type>
+          <LineNumber>19</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>0</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>0</BreakIfRCount>
+          <Filename>.\Source\Principale.c</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression></Expression>
+        </Bp>
       </Breakpoint>
       <WatchWindow1>
         <Ww>
diff --git a/ProjetsKEIL/Drivers/gpiodriver.uvprojx b/ProjetsKEIL/Drivers/gpiodriver.uvprojx
index 1f4091c..384cd3b 100644
--- a/ProjetsKEIL/Drivers/gpiodriver.uvprojx
+++ b/ProjetsKEIL/Drivers/gpiodriver.uvprojx
@@ -16,7 +16,7 @@
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
+          <PackID>Keil.STM32F1xx_DFP.2.4.0</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000,0x00005000) IROM(0x08000000,0x00020000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -186,6 +186,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -421,7 +422,7 @@
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
+          <PackID>Keil.STM32F1xx_DFP.2.4.0</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000,0x00005000) IROM(0x08000000,0x00020000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -591,6 +592,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -840,7 +842,7 @@
       <file attr="config" category="header" name="RTE_Driver\Config\RTE_Device.h" version="1.1.2">
         <instance index="0">RTE\Device\STM32F103RB\RTE_Device.h</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="Keil" Cversion="1.0.0" condition="STM32F1xx CMSIS"/>
-        <package name="STM32F1xx_DFP" schemaVersion="1.4.0" url="http://www.keil.com/pack/" vendor="Keil" version="2.3.0"/>
+        <package name="STM32F1xx_DFP" schemaVersion="1.7.2" url="http://www.keil.com/pack/" vendor="Keil" version="2.4.0"/>
         <targetInfos>
           <targetInfo name="Réel"/>
           <targetInfo name="Simulé"/>
@@ -849,7 +851,7 @@
       <file attr="config" category="source" condition="STM32F1xx MD ARMCC" name="Device\Source\ARM\startup_stm32f10x_md.s" version="1.0.1">
         <instance index="0">RTE\Device\STM32F103RB\startup_stm32f10x_md.s</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="Keil" Cversion="1.0.0" condition="STM32F1xx CMSIS"/>
-        <package name="STM32F1xx_DFP" schemaVersion="1.4.0" url="http://www.keil.com/pack/" vendor="Keil" version="2.3.0"/>
+        <package name="STM32F1xx_DFP" schemaVersion="1.7.2" url="http://www.keil.com/pack/" vendor="Keil" version="2.4.0"/>
         <targetInfos>
           <targetInfo name="Réel"/>
           <targetInfo name="Simulé"/>
@@ -858,7 +860,7 @@
       <file attr="config" category="source" name="Device\Source\system_stm32f10x.c" version="1.0.1">
         <instance index="0">RTE\Device\STM32F103RB\system_stm32f10x.c</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="Keil" Cversion="1.0.0" condition="STM32F1xx CMSIS"/>
-        <package name="STM32F1xx_DFP" schemaVersion="1.4.0" url="http://www.keil.com/pack/" vendor="Keil" version="2.3.0"/>
+        <package name="STM32F1xx_DFP" schemaVersion="1.7.2" url="http://www.keil.com/pack/" vendor="Keil" version="2.4.0"/>
         <targetInfos>
           <targetInfo name="Réel"/>
           <targetInfo name="Simulé"/>
diff --git a/ProjetsKEIL/Drivers/timerdriver.c b/ProjetsKEIL/Drivers/timerdriver.c
new file mode 100644
index 0000000..2670370
--- /dev/null
+++ b/ProjetsKEIL/Drivers/timerdriver.c
@@ -0,0 +1,50 @@
+#include "timerdriver.h"
+
+void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer)
+{
+	//TIM1 uses the APB2ENR register from RCC. The others uses the APB1ENR, so we check this value.
+	if(Timer->Timer == TIM1)
+	{
+			RCC->APB2ENR |= TimerX2Int(Timer->Timer);
+	} else {
+			RCC->APB1ENR |= TimerX2Int(Timer->Timer);
+	}
+	Timer->Timer->ARR = Timer->ARR;
+	Timer->Timer->PSC = Timer->PSC;
+}
+
+int TimerX2Int(TIM_TypeDef * TimerX)
+{
+	if(TimerX == TIM1)
+	{
+		return (0x01 << 11);
+	} else if (TimerX == TIM2){
+		return (0x01 << 0);
+	} else if (TimerX == TIM3){
+		return (0x01 << 1);
+	} else if (TimerX == TIM4){
+		return (0x01 << 2);
+	} /*else if (TimerX == TIM5){
+		return (0x01 << 3);
+	} else if (TimerX == TIM6){
+		return (0x01 << 4);
+	} else if (TimerX == TIM7){
+		return (0x01 << 5);
+	} else if (TimerX == TIM8){
+		return (0x01 << 13);
+	} else if (TimerX == TIM9){			//For now we dont do timer > 4
+		return (0x01 << 19);
+	} else if (TimerX == TIM10){
+		return (0x01 << 20);
+	} else if (TimerX == TIM11){
+		return (0x01 << 21);
+	} else if (TimerX == TIM12){
+		return (0x01 << 6);
+	} else if (TimerX == TIM13){
+		return (0x01 << 7);
+	} else if (TimerX == TIM14){
+		return (0x01 << 8);
+	}*/ else {
+		return -1;
+	};
+}
\ No newline at end of file
diff --git a/ProjetsKEIL/Drivers/timerdriver.h b/ProjetsKEIL/Drivers/timerdriver.h
new file mode 100644
index 0000000..4e64dd2
--- /dev/null
+++ b/ProjetsKEIL/Drivers/timerdriver.h
@@ -0,0 +1,19 @@
+#ifndef TIMERDRIVER_H
+#define TIMERDRIVER_H
+#include "stm32f10x.h"
+
+#define CEN 0x0
+
+typedef struct {
+	TIM_TypeDef * Timer;	//TIM1 -> TIM4
+	unsigned short ARR;
+	unsigned short PSC;
+} MyTimer_Struct_TypeDef;
+
+void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer);
+int TimerX2Int(TIM_TypeDef * TimerX);
+
+#define MyTimer_Base_Start(Timer) (Timer->CR1 |= (0x01<<CEN))
+#define MyTimer_Base_Stop(Timer)	(Timer->CR1 &= ~(0x01<<CEN))
+
+#endif
diff --git a/ProjetsKEIL/timer_interruption/RTE/_Simul_/RTE_Components.h b/ProjetsKEIL/timer_interruption/RTE/_Simul_/RTE_Components.h
index c54b4f5..31c1923 100644
--- a/ProjetsKEIL/timer_interruption/RTE/_Simul_/RTE_Components.h
+++ b/ProjetsKEIL/timer_interruption/RTE/_Simul_/RTE_Components.h
@@ -3,7 +3,7 @@
  * Auto generated Run-Time-Environment Configuration File
  *      *** Do not modify ! ***
  *
- * Project: 'gpiodriver' 
+ * Project: 'timer_interruption' 
  * Target:  'Simulé' 
  */
 
diff --git a/ProjetsKEIL/timer_interruption/Source/Principale.c b/ProjetsKEIL/timer_interruption/Source/Principale.c
index 9eecff2..7e5546c 100644
--- a/ProjetsKEIL/timer_interruption/Source/Principale.c
+++ b/ProjetsKEIL/timer_interruption/Source/Principale.c
@@ -1,20 +1,18 @@
 #include "stm32f10x.h"
 #include "../../Drivers/gpiodriver.h"
+#include "../../Drivers/timerdriver.h"
 
-int main ( void )
+int main (void)
 {
 	int returnValue;
 	MyGPIO_Struct_TypeDef led = {GPIOA,5,Out_PullUp};	//led
-	MyGPIO_Struct_TypeDef bouton = {GPIOC,13,In_PullDown};	//bouton poussoir
+	MyTimer_Struct_TypeDef timer2 = {TIM2,499,7199};
 	MyGPIO_Init(&led);
-	MyGPIO_Init(&bouton);
+	MyTimer_Base_Init(&timer2);
+	MyTimer_Base_Start(TIM2);
+	//Pour reset le timer : RCC_APB1RSTR
 	do{
-		if(MyGPIO_Read(GPIOC,13))
-		{
-			MyGPIO_Reset(GPIOA,5);
-		} else {
-			MyGPIO_Set(GPIOA,5);
-		}
+		returnValue = TIM2->CNT;
 	}while(1) ;	
 	
 }
diff --git a/ProjetsKEIL/timer_interruption/timer_interruption.uvoptx b/ProjetsKEIL/timer_interruption/timer_interruption.uvoptx
index f4c3c93..4d77c3c 100644
--- a/ProjetsKEIL/timer_interruption/timer_interruption.uvoptx
+++ b/ProjetsKEIL/timer_interruption/timer_interruption.uvoptx
@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -125,7 +125,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>DLGDARM</Key>
-          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=1468,53,1889,480,1)(121=1469,437,1890,864,1)(122=875,109,1296,536,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
+          <Name>(1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=486,94,907,521,1)(121=464,533,885,960,1)(122=875,109,1296,536,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=21,94,615,845,1)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -138,72 +138,7 @@
           <Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM))</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>15</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134218832</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Source\Principale.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\cool_Simule\Source/Principale.c\15</Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>13</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134218816</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Source\Principale.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\cool_Simule\Source/Principale.c\13</Expression>
-        </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
-          <LineNumber>14</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134218824</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Source\Principale.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\cool_Simule\Source/Principale.c\14</Expression>
-        </Bp>
-        <Bp>
-          <Number>3</Number>
-          <Type>0</Type>
-          <LineNumber>12</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134218808</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Source\Principale.c</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\cool_Simule\Source/Principale.c\12</Expression>
-        </Bp>
-      </Breakpoint>
+      <Breakpoint/>
       <WatchWindow1>
         <Ww>
           <count>0</count>
@@ -258,16 +193,6 @@
       <pszMrulep></pszMrulep>
       <pSingCmdsp></pSingCmdsp>
       <pMultCmdsp></pMultCmdsp>
-      <SystemViewers>
-        <Entry>
-          <Name>System Viewer\GPIOA</Name>
-          <WinId>35905</WinId>
-        </Entry>
-        <Entry>
-          <Name>System Viewer\GPIOB</Name>
-          <WinId>35904</WinId>
-        </Entry>
-      </SystemViewers>
       <DebugDescription>
         <Enable>1</Enable>
         <EnableFlashSeq>1</EnableFlashSeq>
@@ -332,7 +257,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -517,11 +442,23 @@
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
-      <PathWithFileName>..\..\..\gpiodriver\gpiodriver.c</PathWithFileName>
+      <PathWithFileName>..\Drivers\gpiodriver.c</PathWithFileName>
       <FilenameWithoutPath>gpiodriver.c</FilenameWithoutPath>
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>3</FileNumber>
+      <FileType>1</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>..\Drivers\timerdriver.c</PathWithFileName>
+      <FilenameWithoutPath>timerdriver.c</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
diff --git a/ProjetsKEIL/timer_interruption/timer_interruption.uvprojx b/ProjetsKEIL/timer_interruption/timer_interruption.uvprojx
index 6ae299a..b58c002 100644
--- a/ProjetsKEIL/timer_interruption/timer_interruption.uvprojx
+++ b/ProjetsKEIL/timer_interruption/timer_interruption.uvprojx
@@ -10,13 +10,14 @@
       <TargetName>Simulé</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
-      <uAC6>0</uAC6>
+      <pArmCC>6190000::V6.19::ARMCLANG</pArmCC>
+      <pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
+      <uAC6>1</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
+          <PackID>Keil.STM32F1xx_DFP.2.4.0</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000,0x00005000) IROM(0x08000000,0x00020000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -186,6 +187,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -313,7 +315,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>1</Optim>
+            <Optim>2</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
@@ -322,7 +324,7 @@
             <PlainCh>0</PlainCh>
             <Ropi>0</Ropi>
             <Rwpi>0</Rwpi>
-            <wLevel>2</wLevel>
+            <wLevel>3</wLevel>
             <uThumb>0</uThumb>
             <uSurpInc>0</uSurpInc>
             <uC99>0</uC99>
@@ -391,7 +393,12 @@
             <File>
               <FileName>gpiodriver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\gpiodriver\gpiodriver.c</FilePath>
+              <FilePath>..\Drivers\gpiodriver.c</FilePath>
+            </File>
+            <File>
+              <FileName>timerdriver.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Drivers\timerdriver.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -416,7 +423,7 @@
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.2.3.0</PackID>
+          <PackID>Keil.STM32F1xx_DFP.2.4.0</PackID>
           <PackURL>http://www.keil.com/pack/</PackURL>
           <Cpu>IRAM(0x20000000,0x00005000) IROM(0x08000000,0x00020000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -586,6 +593,7 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
+            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -791,7 +799,12 @@
             <File>
               <FileName>gpiodriver.c</FileName>
               <FileType>1</FileType>
-              <FilePath>..\..\..\gpiodriver\gpiodriver.c</FilePath>
+              <FilePath>..\Drivers\gpiodriver.c</FilePath>
+            </File>
+            <File>
+              <FileName>timerdriver.c</FileName>
+              <FileType>1</FileType>
+              <FilePath>..\Drivers\timerdriver.c</FilePath>
             </File>
           </Files>
         </Group>
@@ -811,15 +824,15 @@
   <RTE>
     <apis/>
     <components>
-      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.4.0" condition="ARMv6_7_8-M Device">
-        <package name="CMSIS" schemaVersion="1.3" url="http://www.keil.com/pack/" vendor="ARM" version="5.7.0"/>
+      <component Cclass="CMSIS" Cgroup="CORE" Cvendor="ARM" Cversion="5.6.0" condition="ARMv6_7_8-M Device">
+        <package name="CMSIS" schemaVersion="1.7.7" url="http://www.keil.com/pack/" vendor="ARM" version="5.9.0"/>
         <targetInfos>
           <targetInfo name="Réel"/>
           <targetInfo name="Simulé"/>
         </targetInfos>
       </component>
       <component Cclass="Device" Cgroup="Startup" Cvendor="Keil" Cversion="1.0.0" condition="STM32F1xx CMSIS">
-        <package name="STM32F1xx_DFP" schemaVersion="1.4.0" url="http://www.keil.com/pack/" vendor="Keil" version="2.3.0"/>
+        <package name="STM32F1xx_DFP" schemaVersion="1.7.2" url="http://www.keil.com/pack/" vendor="Keil" version="2.4.0"/>
         <targetInfos>
           <targetInfo name="Réel"/>
           <targetInfo name="Simulé"/>
@@ -830,7 +843,7 @@
       <file attr="config" category="header" name="RTE_Driver\Config\RTE_Device.h" version="1.1.2">
         <instance index="0">RTE\Device\STM32F103RB\RTE_Device.h</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="Keil" Cversion="1.0.0" condition="STM32F1xx CMSIS"/>
-        <package name="STM32F1xx_DFP" schemaVersion="1.4.0" url="http://www.keil.com/pack/" vendor="Keil" version="2.3.0"/>
+        <package name="STM32F1xx_DFP" schemaVersion="1.7.2" url="http://www.keil.com/pack/" vendor="Keil" version="2.4.0"/>
         <targetInfos>
           <targetInfo name="Réel"/>
           <targetInfo name="Simulé"/>
@@ -839,7 +852,7 @@
       <file attr="config" category="source" condition="STM32F1xx MD ARMCC" name="Device\Source\ARM\startup_stm32f10x_md.s" version="1.0.1">
         <instance index="0">RTE\Device\STM32F103RB\startup_stm32f10x_md.s</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="Keil" Cversion="1.0.0" condition="STM32F1xx CMSIS"/>
-        <package name="STM32F1xx_DFP" schemaVersion="1.4.0" url="http://www.keil.com/pack/" vendor="Keil" version="2.3.0"/>
+        <package name="STM32F1xx_DFP" schemaVersion="1.7.2" url="http://www.keil.com/pack/" vendor="Keil" version="2.4.0"/>
         <targetInfos>
           <targetInfo name="Réel"/>
           <targetInfo name="Simulé"/>
@@ -848,7 +861,7 @@
       <file attr="config" category="source" name="Device\Source\system_stm32f10x.c" version="1.0.1">
         <instance index="0">RTE\Device\STM32F103RB\system_stm32f10x.c</instance>
         <component Cclass="Device" Cgroup="Startup" Cvendor="Keil" Cversion="1.0.0" condition="STM32F1xx CMSIS"/>
-        <package name="STM32F1xx_DFP" schemaVersion="1.4.0" url="http://www.keil.com/pack/" vendor="Keil" version="2.3.0"/>
+        <package name="STM32F1xx_DFP" schemaVersion="1.7.2" url="http://www.keil.com/pack/" vendor="Keil" version="2.4.0"/>
         <targetInfos>
           <targetInfo name="Réel"/>
           <targetInfo name="Simulé"/>