From 39df95caf93c617d88a3656471360c20f28664f1 Mon Sep 17 00:00:00 2001
From: Yohan Boujon <boujon@insa-toulouse.fr>
Date: Mon, 27 Mar 2023 16:15:35 +0200
Subject: [PATCH] ADC avec Interruption fonctionnel.

---
 ProjetsKEIL/Drivers/adcdriver.c     | 29 ++++++++++----
 ProjetsKEIL/Drivers/adcdriver.h     |  5 ++-
 ProjetsKEIL/adc/Source/Principale.c | 31 +++++++++++----
 ProjetsKEIL/adc/adc.uvoptx          | 62 ++++++++++++++++++++++-------
 ProjetsKEIL/adc/adc.uvprojx         | 36 ++++++++---------
 5 files changed, 110 insertions(+), 53 deletions(-)

diff --git a/ProjetsKEIL/Drivers/adcdriver.c b/ProjetsKEIL/Drivers/adcdriver.c
index 7a85bed..603eea0 100644
--- a/ProjetsKEIL/Drivers/adcdriver.c
+++ b/ProjetsKEIL/Drivers/adcdriver.c
@@ -4,17 +4,30 @@ void MyADC_Init(MyADC_Struct_TypeDef * ADCStructPtr)
 {
 	RCC->CFGR |= RCC_CFGR_ADCPRE_1;			// ADC Prescaler : divided by 6 -> 72MHz to 12MHz
 	RCC->APB2ENR |= RCC_APB2ENR_ADC1EN;	//We activate the clock first
-	if(ADCStructPtr->channel < 10)
+	if(ADCStructPtr->channel < 10)			//Cycle and channel selection	-> permet de regler en fonction de la résistance donnée
 	{
-		ADCStructPtr->ADC->SMPR2 |= (ADCStructPtr->resolution<<(ADCStructPtr->channel*3)); // Cycle and channel selection
+		
+		ADCStructPtr->ADC->SMPR2 |= (ADCStructPtr->cycle<<(ADCStructPtr->channel*3)); //Channel < 10
 	}
 	else {
-		ADCStructPtr->ADC->SMPR1 |= (ADCStructPtr->resolution<<((ADCStructPtr->channel-10)*3)); // Cycle and channel selection
+		ADCStructPtr->ADC->SMPR1 |= (ADCStructPtr->cycle<<((ADCStructPtr->channel-10)*3)); //Channel > 10
 	}
+	ADCStructPtr->ADC->SQR1 &= ADC_SQR1_L;						//Channel sequence length -> 1 conversion (0000)
 	ADCStructPtr->ADC->SQR3 |= ADCStructPtr->channel;	//Sequence Reader, seulement le SQ1 est lu dans notre cas, nous associons un channel ŕ ce dernier.
-	ADCStructPtr->ADC->CR2 |= ADC_CR2_ADON;	//ADON Pour l'instant -> PLUS TARD //ADC1->CR2 |= (0x1<<30)	//Software start conversion
-	if(ADCStructPtr->isIT)
-	{
-		ADCStructPtr->ADC->CR1 |= ADC_CR1_EOCIE; //Interruption
-	}
+	ADCStructPtr->ADC->CR2 |= ADC_CR2_EXTTRIG;				//Activation du trigger externe
+	ADCStructPtr->ADC->CR2 |= ADC_CR2_EXTSEL;					//Event externe choisie : SWSTART
+	MyADC_ActiveIT(ADCStructPtr->ADC,0);
+	ADCStructPtr->ADC->CR2 |= ADC_CR2_ADON;						//Init l'ADC
+}
+
+void MyADC_Start (ADC_TypeDef * ADC)
+{
+	ADC->CR2 |= ADC_CR2_SWSTART;	//Start Conversion of regular channels
+}
+
+void MyADC_ActiveIT(ADC_TypeDef * ADC, uint8_t Prio)
+{
+	ADC->CR1 |= ADC_CR1_EOCIE; 								//Interruption active
+	NVIC->IP[ADC1_2_IRQn] |= (Prio << 0x4);			//Prio de l'interruption (p.197 manuel reference RM0008 pour ADC1_IRQn)
+	NVIC->ISER[0] |= (0x1<<ADC1_2_IRQn);				//Active l'interruption au niveau NVIC  (p.119 manuel programming pour ISER[0])
 }
diff --git a/ProjetsKEIL/Drivers/adcdriver.h b/ProjetsKEIL/Drivers/adcdriver.h
index 4807366..4e66665 100644
--- a/ProjetsKEIL/Drivers/adcdriver.h
+++ b/ProjetsKEIL/Drivers/adcdriver.h
@@ -18,11 +18,12 @@ typedef struct
 {
 	ADC_TypeDef *	ADC;			//ADC 1 or 2
 	uint8_t 			channel;	//channel 0 -> 17
-	MyADC_Cycle_t	resolution;
-	char					isIT;			//true -> interrupt driven
+	MyADC_Cycle_t	cycle;		//channel cycle
 } MyADC_Struct_TypeDef;
 
 void MyADC_Init(MyADC_Struct_TypeDef * ADCStructPtr);
+void MyADC_ActiveIT(ADC_TypeDef * ADC, uint8_t Prio);
+void MyADC_Start (ADC_TypeDef * ADC);
 MyGPIO_Struct_TypeDef GPIOFromADC(MyADC_Struct_TypeDef ADC);
 
 
diff --git a/ProjetsKEIL/adc/Source/Principale.c b/ProjetsKEIL/adc/Source/Principale.c
index 25106d0..8110b94 100644
--- a/ProjetsKEIL/adc/Source/Principale.c
+++ b/ProjetsKEIL/adc/Source/Principale.c
@@ -7,29 +7,44 @@
 
 #define	ADON		0
 
+void ADC1_2_IRQHandler(void)
+{
+	if(ADC1->DR >= 3102)
+	{
+		MyGPIO_Set(GPIOA,5);
+	}
+	else{
+		MyGPIO_Reset(GPIOA,5);
+	}
+	MyADC_Start(ADC1);
+	ADC1->SR &= ~ADC_SR_EOC;	//Prochaine lecture pouvant ętre effectuée.
+}
+
 int main (void)
 {
 	MyGPIO_Struct_TypeDef led = {GPIOA,5,Out_PullUp};	//led
-	MyADC_Struct_TypeDef adcStruct = {ADC1,10,cycles41d5,0};
+	MyADC_Struct_TypeDef adcStruct = {ADC1,10,cycles41d5};
 	MyGPIO_Struct_TypeDef adc = {GPIOC,0,In_Analog};
-	char voltageOverflow = 0;
 	
 	MyGPIO_Init(&led);
+	
 	MyADC_Init(&adcStruct);
 	MyGPIO_Init(&adc);
 	
+	MyADC_Start(ADC1);
+	
+
+	
  	while(1){
-		ADC1->CR2 |= (0x1<<ADON);
+		//MyADC_Start(ADC1);
+		/*
 		if(ADC1->DR >= 3102)
 		{
 			MyGPIO_Set(GPIOA,5);
-			voltageOverflow = 1;
 		}
 		else{
-			if(!voltageOverflow)
-			{
-				MyGPIO_Reset(GPIOA,5);
-			}
+			MyGPIO_Reset(GPIOA,5);
 		}
+		*/
 	};	
  }
diff --git a/ProjetsKEIL/adc/adc.uvoptx b/ProjetsKEIL/adc/adc.uvoptx
index 9b71272..2282a8c 100644
--- a/ProjetsKEIL/adc/adc.uvoptx
+++ b/ProjetsKEIL/adc/adc.uvoptx
@@ -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=10,543,409,888,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=723,147,1317,898,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=869,137,1472,888,1)(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=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=10,543,409,888,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=723,147,1317,898,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=1219,267,1822,1018,1)(151=-1,-1,-1,-1,0)</Name>
         </SetRegEntry>
         <SetRegEntry>
           <Number>0</Number>
@@ -142,9 +142,9 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>29</LineNumber>
+          <LineNumber>31</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134218844</Address>
+          <Address>134219116</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -153,14 +153,14 @@
           <BreakIfRCount>1</BreakIfRCount>
           <Filename>.\Source\Principale.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\cool_Simule\Source/Principale.c\29</Expression>
+          <Expression>\\cool_Simule\Source/Principale.c\31</Expression>
         </Bp>
         <Bp>
           <Number>1</Number>
           <Type>0</Type>
-          <LineNumber>23</LineNumber>
+          <LineNumber>14</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134218838</Address>
+          <Address>134218074</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -169,14 +169,14 @@
           <BreakIfRCount>1</BreakIfRCount>
           <Filename>.\Source\Principale.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\cool_Simule\Source/Principale.c\23</Expression>
+          <Expression>\\cool_Simule\Source/Principale.c\14</Expression>
         </Bp>
         <Bp>
           <Number>2</Number>
           <Type>0</Type>
-          <LineNumber>22</LineNumber>
+          <LineNumber>12</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134218830</Address>
+          <Address>134218062</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -185,7 +185,39 @@
           <BreakIfRCount>1</BreakIfRCount>
           <Filename>.\Source\Principale.c</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\cool_Simule\Source/Principale.c\22</Expression>
+          <Expression>\\cool_Simule\Source/Principale.c\12</Expression>
+        </Bp>
+        <Bp>
+          <Number>3</Number>
+          <Type>0</Type>
+          <LineNumber>16</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134218082</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\16</Expression>
+        </Bp>
+        <Bp>
+          <Number>4</Number>
+          <Type>0</Type>
+          <LineNumber>17</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134218090</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\17</Expression>
         </Bp>
       </Breakpoint>
       <WatchWindow1>
@@ -208,7 +240,7 @@
         <periodic>1</periodic>
         <aLwin>1</aLwin>
         <aCover>0</aCover>
-        <aSer1>0</aSer1>
+        <aSer1>1</aSer1>
         <aSer2>0</aSer2>
         <aPa>0</aPa>
         <viewmode>1</viewmode>
@@ -361,7 +393,7 @@
         <SetRegEntry>
           <Number>0</Number>
           <Key>ST-LINKIII-KEIL_SWO</Key>
-          <Name>-U066FFF504955857567155843 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM) -WA0 -WE0 -WVCE4 -WS2710 -WM0 -WP2</Name>
+          <Name>-U066FFF504955857567155843 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO131090 -TC10000000 -TT10000000 -TP21 -TDS8000 -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>
@@ -405,7 +437,7 @@
         <periodic>1</periodic>
         <aLwin>1</aLwin>
         <aCover>0</aCover>
-        <aSer1>0</aSer1>
+        <aSer1>1</aSer1>
         <aSer2>0</aSer2>
         <aPa>0</aPa>
         <viewmode>1</viewmode>
@@ -485,7 +517,7 @@
       <GroupNumber>2</GroupNumber>
       <FileNumber>2</FileNumber>
       <FileType>1</FileType>
-      <tvExp>1</tvExp>
+      <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\Drivers\gpiodriver.c</PathWithFileName>
@@ -509,7 +541,7 @@
       <GroupNumber>2</GroupNumber>
       <FileNumber>4</FileNumber>
       <FileType>1</FileType>
-      <tvExp>0</tvExp>
+      <tvExp>1</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
       <bDave2>0</bDave2>
       <PathWithFileName>..\Drivers\adcdriver.c</PathWithFileName>
diff --git a/ProjetsKEIL/adc/adc.uvprojx b/ProjetsKEIL/adc/adc.uvprojx
index 7a718a6..e7ebe7a 100644
--- a/ProjetsKEIL/adc/adc.uvprojx
+++ b/ProjetsKEIL/adc/adc.uvprojx
@@ -10,14 +10,13 @@
       <TargetName>Simulé</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pArmCC>6190000::V6.19::ARMCLANG</pArmCC>
-      <pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
+      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
+      <uAC6>0</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.2.4.0</PackID>
+          <PackID>Keil.STM32F1xx_DFP.2.3.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>
@@ -187,7 +186,6 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
-            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -315,7 +313,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>2</Optim>
+            <Optim>1</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
@@ -324,7 +322,7 @@
             <PlainCh>0</PlainCh>
             <Ropi>0</Ropi>
             <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
+            <wLevel>2</wLevel>
             <uThumb>0</uThumb>
             <uSurpInc>0</uSurpInc>
             <uC99>0</uC99>
@@ -424,14 +422,13 @@
       <TargetName>RĂ©el</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pArmCC>6190000::V6.19::ARMCLANG</pArmCC>
-      <pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
-      <uAC6>1</uAC6>
+      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
+      <uAC6>0</uAC6>
       <TargetOption>
         <TargetCommonOption>
           <Device>STM32F103RB</Device>
           <Vendor>STMicroelectronics</Vendor>
-          <PackID>Keil.STM32F1xx_DFP.2.4.0</PackID>
+          <PackID>Keil.STM32F1xx_DFP.2.3.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>
@@ -601,7 +598,6 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
-            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -729,7 +725,7 @@
           </ArmAdsMisc>
           <Cads>
             <interw>1</interw>
-            <Optim>2</Optim>
+            <Optim>1</Optim>
             <oTime>0</oTime>
             <SplitLS>0</SplitLS>
             <OneElfS>1</OneElfS>
@@ -738,7 +734,7 @@
             <PlainCh>0</PlainCh>
             <Ropi>0</Ropi>
             <Rwpi>0</Rwpi>
-            <wLevel>3</wLevel>
+            <wLevel>2</wLevel>
             <uThumb>0</uThumb>
             <uSurpInc>0</uSurpInc>
             <uC99>0</uC99>
@@ -839,15 +835,15 @@
   <RTE>
     <apis/>
     <components>
-      <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"/>
+      <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"/>
         <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.7.2" url="http://www.keil.com/pack/" vendor="Keil" version="2.4.0"/>
+        <package name="STM32F1xx_DFP" schemaVersion="1.4.0" url="http://www.keil.com/pack/" vendor="Keil" version="2.3.0"/>
         <targetInfos>
           <targetInfo name="RĂ©el"/>
           <targetInfo name="Simulé"/>
@@ -858,7 +854,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.7.2" url="http://www.keil.com/pack/" vendor="Keil" version="2.4.0"/>
+        <package name="STM32F1xx_DFP" schemaVersion="1.4.0" url="http://www.keil.com/pack/" vendor="Keil" version="2.3.0"/>
         <targetInfos>
           <targetInfo name="RĂ©el"/>
           <targetInfo name="Simulé"/>
@@ -867,7 +863,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.7.2" url="http://www.keil.com/pack/" vendor="Keil" version="2.4.0"/>
+        <package name="STM32F1xx_DFP" schemaVersion="1.4.0" url="http://www.keil.com/pack/" vendor="Keil" version="2.3.0"/>
         <targetInfos>
           <targetInfo name="RĂ©el"/>
           <targetInfo name="Simulé"/>
@@ -876,7 +872,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.7.2" url="http://www.keil.com/pack/" vendor="Keil" version="2.4.0"/>
+        <package name="STM32F1xx_DFP" schemaVersion="1.4.0" url="http://www.keil.com/pack/" vendor="Keil" version="2.3.0"/>
         <targetInfos>
           <targetInfo name="RĂ©el"/>
           <targetInfo name="Simulé"/>