From a4e139f119cc2a300bbdccf1e2b39d27b50f05d0 Mon Sep 17 00:00:00 2001
From: Yohan Boujon <yo.boujon@gmail.com>
Date: Thu, 30 Mar 2023 10:29:42 +0200
Subject: [PATCH] fix de bug : Leds 16 octets, 12 bits. Logique inverse pour le
 capteur. Ajout d'un nouveau jeu de LED

---
 Etape_2.uvoptx     | 263 ++++++++++-----------------------------------
 Etape_2.uvprojx    |  20 ++--
 FonctionEtape2.asm |   8 +-
 LUMIERES.inc       |  81 ++++++++------
 Principale.asm     |  20 ++--
 5 files changed, 127 insertions(+), 265 deletions(-)

diff --git a/Etape_2.uvoptx b/Etape_2.uvoptx
index 0841409..f2cec2a 100644
--- a/Etape_2.uvoptx
+++ b/Etape_2.uvoptx
@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</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=15,39,661,712,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=1040,425,1461,852,1)(121=1499,392,1920,819,1)(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=18,101,612,852,0)(131=255,99,849,850,0)(132=49,93,643,844,0)(133=-1105,32,-511,783,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=15,39,661,712,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=1397,118,1818,545,0)(121=1499,392,1920,819,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=18,101,612,852,0)(131=255,99,849,850,0)(132=49,93,643,844,0)(133=0,32,594,783,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>
@@ -142,25 +142,25 @@
         <Bp>
           <Number>0</Number>
           <Type>0</Type>
-          <LineNumber>100</LineNumber>
+          <LineNumber>204</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134222484</Address>
+          <Address>134222900</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
           <SizeOfObject>0</SizeOfObject>
           <BreakByAccess>0</BreakByAccess>
           <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Principale.asm</Filename>
+          <Filename>.\FonctionEtape2.asm</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\Simu_Etape0\Principale.asm\100</Expression>
+          <Expression>\\Simu_Etape0\FonctionEtape2.asm\204</Expression>
         </Bp>
         <Bp>
           <Number>1</Number>
           <Type>0</Type>
-          <LineNumber>70</LineNumber>
+          <LineNumber>51</LineNumber>
           <EnabledFlag>1</EnabledFlag>
-          <Address>134222470</Address>
+          <Address>134222440</Address>
           <ByteObject>0</ByteObject>
           <HtxType>0</HtxType>
           <ManyObjects>0</ManyObjects>
@@ -169,199 +169,7 @@
           <BreakIfRCount>1</BreakIfRCount>
           <Filename>.\Principale.asm</Filename>
           <ExecCommand></ExecCommand>
-          <Expression>\\Simu_Etape0\Principale.asm\70</Expression>
-        </Bp>
-        <Bp>
-          <Number>2</Number>
-          <Type>0</Type>
-          <LineNumber>73</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134222480</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Principale.asm</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\Simu_Etape0\Principale.asm\73</Expression>
-        </Bp>
-        <Bp>
-          <Number>3</Number>
-          <Type>0</Type>
-          <LineNumber>47</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>.\FonctionEtape.asm</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>4</Number>
-          <Type>0</Type>
-          <LineNumber>51</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>.\FonctionEtape.asm</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>5</Number>
-          <Type>0</Type>
-          <LineNumber>47</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>.\FonctionEtape2.asm</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>6</Number>
-          <Type>0</Type>
-          <LineNumber>51</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>.\FonctionEtape2.asm</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>7</Number>
-          <Type>0</Type>
-          <LineNumber>134</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>.\FonctionEtape2.asm</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>8</Number>
-          <Type>0</Type>
-          <LineNumber>173</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>.\FonctionEtape2.asm</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>9</Number>
-          <Type>0</Type>
-          <LineNumber>174</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>.\FonctionEtape2.asm</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>10</Number>
-          <Type>0</Type>
-          <LineNumber>45</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>.\Principale.asm</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>11</Number>
-          <Type>0</Type>
-          <LineNumber>48</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>.\Principale.asm</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>12</Number>
-          <Type>0</Type>
-          <LineNumber>95</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>.\Principale.asm</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>13</Number>
-          <Type>0</Type>
-          <LineNumber>47</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>REG_UTILES.inc</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
+          <Expression>\\Simu_Etape0\Principale.asm\51</Expression>
         </Bp>
       </Breakpoint>
       <MemoryWindow1>
@@ -390,7 +198,7 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>1</periodic>
-        <aLwin>1</aLwin>
+        <aLwin>0</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
@@ -430,12 +238,12 @@
         <Wi>
           <IntNumber>0</IntNumber>
           <FirstString>(portA &amp; 0x20 &amp; 0x20) &gt;&gt; 0</FirstString>
-          <SecondString>FF000000000000000000000000000000E0FFEF4001000000000000000000000000000000706F7274412026203078323000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1400000000000000000000000000000000000000E4120008</SecondString>
+          <SecondString>FF000000000000000000000000000000E0FFEF4001000000000000000000000000000000706F7274412026203078323000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F0600000000000000000000000000000000000000E4120008</SecondString>
         </Wi>
         <Wi>
           <IntNumber>1</IntNumber>
           <FirstString>(portA &amp; 0x80 &amp; 0x80) &gt;&gt; 0</FirstString>
-          <SecondString>00800000000000000000000000000000E0FFEF4001000000000000000000000000000000706F7274412026203078383000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F140000000000000000000000000000000000000062120008</SecondString>
+          <SecondString>00800000000000000000000000000000E0FFEF4001000000000000000000000000000000706F7274412026203078383000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F060000000000000000000000000000000000000062120008</SecondString>
         </Wi>
       </LogicAnalyzers>
       <DebugDescription>
@@ -502,7 +310,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -570,12 +378,45 @@
           <Name>-UAny -O206 -S8 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO15 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_CL.FLM -FS08000000 -FL080000 -FP0($$Device:STM32F107VC$Flash\STM32F10x_CL.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint/>
+      <Breakpoint>
+        <Bp>
+          <Number>0</Number>
+          <Type>0</Type>
+          <LineNumber>67</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134222690</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>.\Principale.asm</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\Reel_Etape0\Principale.asm\67</Expression>
+        </Bp>
+        <Bp>
+          <Number>1</Number>
+          <Type>0</Type>
+          <LineNumber>60</LineNumber>
+          <EnabledFlag>1</EnabledFlag>
+          <Address>134222668</Address>
+          <ByteObject>0</ByteObject>
+          <HtxType>0</HtxType>
+          <ManyObjects>0</ManyObjects>
+          <SizeOfObject>0</SizeOfObject>
+          <BreakByAccess>0</BreakByAccess>
+          <BreakIfRCount>1</BreakIfRCount>
+          <Filename>.\Principale.asm</Filename>
+          <ExecCommand></ExecCommand>
+          <Expression>\\Reel_Etape0\Principale.asm\60</Expression>
+        </Bp>
+      </Breakpoint>
       <MemoryWindow1>
         <Mm>
           <WinNumber>1</WinNumber>
           <SubType>0</SubType>
-          <ItemText>0x40010BF0</ItemText>
+          <ItemText>0x40010800</ItemText>
           <AccSizeX>0</AccSizeX>
         </Mm>
       </MemoryWindow1>
@@ -585,7 +426,7 @@
       <DebugFlag>
         <trace>0</trace>
         <periodic>0</periodic>
-        <aLwin>0</aLwin>
+        <aLwin>1</aLwin>
         <aCover>0</aCover>
         <aSer1>0</aSer1>
         <aSer2>0</aSer2>
@@ -621,6 +462,12 @@
       <pszMrulep></pszMrulep>
       <pSingCmdsp></pSingCmdsp>
       <pMultCmdsp></pMultCmdsp>
+      <SystemViewers>
+        <Entry>
+          <Name>System Viewer\GPIOA</Name>
+          <WinId>35905</WinId>
+        </Entry>
+      </SystemViewers>
       <DebugDescription>
         <Enable>1</Enable>
         <EnableFlashSeq>0</EnableFlashSeq>
diff --git a/Etape_2.uvprojx b/Etape_2.uvprojx
index ae8db7a..819b966 100644
--- a/Etape_2.uvprojx
+++ b/Etape_2.uvprojx
@@ -10,13 +10,13 @@
       <TargetName>Simulé</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>6190000::V6.19::ARMCLANG</pCCUsed>
+      <pCCUsed>6160000::V6.16::ARMCLANG</pCCUsed>
       <uAC6>1</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,0x5000) IROM(0x08000000,0x20000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -186,7 +186,6 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
-            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -429,7 +428,7 @@
         <TargetCommonOption>
           <Device>STM32F107VC</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,0x10000) IROM(0x08000000,0x40000) CPUTYPE("Cortex-M3") CLOCK(12000000) ELITTLE</Cpu>
           <FlashUtilSpec></FlashUtilSpec>
@@ -599,7 +598,6 @@
             <RvdsVP>0</RvdsVP>
             <RvdsMve>0</RvdsMve>
             <RvdsCdeCp>0</RvdsCdeCp>
-            <nBranchProt>0</nBranchProt>
             <hadIRAM2>0</hadIRAM2>
             <hadIROM2>0</hadIROM2>
             <StupSel>8</StupSel>
@@ -856,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="Simulé"/>
         </targetInfos>
@@ -864,7 +862,7 @@
       <file attr="config" category="source" condition="STM32F1xx MD ARMCC" name="Device\Source\ARM\startup_stm32f10x_md.s" version="1.0.0">
         <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="Simulé"/>
         </targetInfos>
@@ -878,7 +876,7 @@
       <file attr="config" category="source" name="Device\Source\system_stm32f10x.c" version="1.0.0">
         <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="Simulé"/>
         </targetInfos>
@@ -886,7 +884,7 @@
       <file attr="config" category="header" name="RTE_Driver\Config\RTE_Device.h" version="1.1.2">
         <instance index="0">RTE\Device\STM32F107VC\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"/>
         </targetInfos>
@@ -894,7 +892,7 @@
       <file attr="config" category="source" condition="STM32F1xx CL ARMCC" name="Device\Source\ARM\startup_stm32f10x_cl.s" version="1.0.0">
         <instance index="0">RTE\Device\STM32F107VC\startup_stm32f10x_cl.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"/>
         </targetInfos>
@@ -908,7 +906,7 @@
       <file attr="config" category="source" name="Device\Source\system_stm32f10x.c" version="1.0.0">
         <instance index="0">RTE\Device\STM32F107VC\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"/>
         </targetInfos>
diff --git a/FonctionEtape2.asm b/FonctionEtape2.asm
index f1f328f..8d1a714 100644
--- a/FonctionEtape2.asm
+++ b/FonctionEtape2.asm
@@ -148,14 +148,14 @@ PoidFortOKJUMP				;Fin Si
 		BNE WHILE_NBBIT
 		
 		ADD R2, R2, #1		;On incrémente NBLed
-		CMP R2, #47			;SI NBLED==47 alors on arrête la boucle
+		CMP R2, #48			;SI NBLED==47 alors on arrête la boucle
 		BNE WHILE_NBLED
 		
 		MOV R0, #SCLK	;Argument SCLK
 		BL Reset_X;		;Reset_X(SCLK)
 		LDR R0,=DataSend;Adresse de DataSend
 		MOV R1,#0		; DataSend
-		STRB R1,[R0,#0]	;DataSend=0
+		STRB R1,[R0]	;DataSend=0
 		B .				;while(1)
 		
 PoidFortOKIF
@@ -198,11 +198,11 @@ REG_PoidFortOKJUMP			;Fin Si
 		MOV R0, #SCLK		;Argument SCLK
 		BL Set_X;			;Set_X(SCLK)
 		ADD R4, R4, #1		;On incrémente NBBit
-		CMP R4, #11			;SI NBBIT==11 alors on arrête la boucle
+		CMP R4, #12			;SI NBBIT==11 alors on arrête la boucle
 		BNE REG_WHILE_NBBIT
 		
 		ADD R2, R2, #1		;On incrémente NBLed
-		CMP R2, #47			;SI NBLED==47 alors on arrête la boucle
+		CMP R2, #48			;SI NBLED==47 alors on arrête la boucle
 		BNE REG_WHILE_NBLED
 		
 		MOV R0, #SCLK	;Argument SCLK
diff --git a/LUMIERES.inc b/LUMIERES.inc
index bd542ae..4700ade 100644
--- a/LUMIERES.inc
+++ b/LUMIERES.inc
@@ -6,39 +6,56 @@
 	 AREA  MesDonnees, data, readwrite
 ;**************************************************************************
 
-Barette1 	DCB 0xad,0xff,0
-			DCB 0,0xff,0
-			DCB 0,0,0xff
-			DCB 0xff,0,0
-			DCB 0xff,0xff,0
-			DCB 0xff,0xff,0xff
-			DCB 0xff,0,0
-			DCB 0,0xff,0
-			DCB 0,0,0xff
-			DCB 0xff,0,0
-			DCB 0xff,0xff,0
-			DCB 0xff,0xff,0xff
-			DCB 0xff,0,0
-			DCB 0xff,0xff,0
-			DCB 0xff,0xff,0xff
-			DCB 0x0f,0xff,0x00
+Barette1 	DCB 0xff,0x00,0x0
+			DCB 0xff,0x00,0x0
+			DCB 0xff,0x00,0x0
+			DCB 0xff,0x00,0x0
+			DCB 0xff,0x00,0x0
+			DCB 0xff,0x00,0x0
+			DCB 0xff,0x00,0x0
+			DCB 0xff,0x00,0x0
+			DCB 0xff,0x00,0x0
+			DCB 0xff,0x00,0x0
+			DCB 0xff,0x00,0x0
+			DCB 0xff,0x00,0x00
+			DCB 0xff,0x00,0x00
+			DCB 0xff,0x00,0x00
+			DCB 0xff,0x00,0x00
+			DCB 0x00,0x00,0x00
 			
-Barette2 	DCB 0xe6,0x3f,0
-			DCB 0,0x56,0x64
-			DCB 0x52,0,0xfe
-			DCB 0x1f,0x1e,0
-			DCB 0xff,0x5a,0
-			DCB 0x6f,0xf7,0x8d
-			DCB 0xdf,0x3e,0
-			DCB 0,0xfa,0x6f
-			DCB 0xe6,0x8c,0x2d
-			DCB 0xf4,0x4f,0
-			DCB 0,0x56,0x64
-			DCB 0x52,0,0xfe
-			DCB 0x1f,0x1e,0
-			DCB 0xff,0x5a,0
-			DCB 0x6f,0xf7,0x8d
-			DCB 0xff,0,0	
+Barette2 	DCB 0x00,0x00,0x00
+			DCB 0xAA,0x00,0x00
+			DCB 0x00,0x00,0x00
+			DCB 0xAA,0x00,0x00
+			DCB 0x00,0x00,0x00
+			DCB 0xAA,0x00,0x00
+			DCB 0x00,0x00,0x00
+			DCB 0xAA,0x00,0x00
+			DCB 0x00,0x00,0x00
+			DCB 0xAA,0x00,0x00
+			DCB 0x00,0x00,0x00
+			DCB 0xAA,0x00,0x00
+			DCB 0x00,0x00,0x00
+			DCB 0xAA,0x00,0x00
+			DCB 0x00,0x00,0x00
+			DCB 0xAA,0x00,0x00
+			
+Barette3 	DCB 0xAA,0x00,0x00
+			DCB 0xAA,0x00,0x00
+			DCB 0xAA,0x00,0x00
+			DCB 0xAA,0x00,0x00
+			DCB 0x80,0x80,0x80
+			DCB 0x80,0x80,0x80
+			DCB 0x80,0x80,0x80
+			DCB 0x80,0x80,0x80
+			DCB 0x80,0x80,0x80
+			DCB 0x80,0x80,0x80
+			DCB 0x80,0x80,0x80
+			DCB 0x80,0x80,0x80
+			DCB 0x00,0x00,0xAA
+			DCB 0x00,0x00,0xAA
+			DCB 0x00,0x00,0xAA
+			DCB 0x00,0x00,0xAA
 			
 	END
 		
\ No newline at end of file
diff --git a/Principale.asm b/Principale.asm
index a73387e..a03cce2 100644
--- a/Principale.asm
+++ b/Principale.asm
@@ -39,7 +39,7 @@
 	AREA  mesdonnees, data, readwrite
 ;*******************************************************************************
 		
-M		EQU 10
+M		EQU 20
 
 ;***************CODE************************************************************
    	AREA  moncode, code, readonly
@@ -48,30 +48,30 @@ M		EQU 10
 main   PROC 
 ;*******************************************************************************
 		BL Run_Timer3			;Allumage du Timer 3
-		LDR R4, [pc,#-2124]		;***********************************************
-		MOV R5, #1				;RetroEngineering : 0x40021000 << 18 -> Argument ? 
-		STR R5,[R4,#0x18]		;***********************************************
+		MOV R0,#1
 		BL Init_Cible;
 ;*******************************************************************************
 ; ETAPE 2
 ;*******************************************************************************
 		MOV R7,#0
 Etape2								;for(int=0;i<M;i++)
-		LDR R6,=GPIOBASEA			;On récup l'adresse	du GPIOA
-		LDR R0, =Barette1			;Adresse Jeu de led 1 : Argument
+		LDR R0, =Barette3			;Adresse Jeu de led 1 : Argument
 		BL DriverReg				;*******************
-		MOV R0, #10					;Argument : 10ms
+		MOV R0, #500					;Argument : 500ms
 		BL Tempo;					:Tempo(10)
 		LDR R0, =Barette2			;Adresse Jeu de led 2 : Argument
 		BL DriverReg				;*******************
+		MOV R0, #500					;Argument : 500ms
+		BL Tempo;					:Tempo(10)
 		
+		LDR R6,=GPIOBASEA			;On récup l'adresse	du GPIOA
 		LDR R6,[R6,#OffsetInput]	;On lit le GPIOA_IDR
 		AND R6, R6, #(0x01<<8)		;On masque pour n'avoir que le 9ème bit (Capteur)
 		CMP R6, #(0x01<<8)			;On vérifie que ce dernier bit est bien à 1.
-		BEQ TheEnd					;if capteur = true -> on sort de la boucle
+		BNE TheEnd					;if capteur = true -> on sort de la boucle
 		ADD R7,R7,#1				;i++
-		CMP R7, #10					;i==10 ?
-		BNE Etape2					;if i!=10 -> on continue la boucle (Au final : R7 == 10 || R6)
+		CMP R7, #M					;i==M ?
+		BNE Etape2					;if i!=10 -> on continue la boucle (Au final : R7 == M || R6)
 ;*******************************************************************************
 ; ETAPE 1
 ;*******************************************************************************