From 39ed99424100a787eb28903dc2a75237d1170ecc Mon Sep 17 00:00:00 2001
From: Enzo Slamnia <slamnia@insa-toulouse.fr>
Date: Tue, 21 Mar 2023 18:22:42 +0100
Subject: [PATCH] step deb 2

---
 soft/PjtKEIL_StepDeb_1/BacASable.uvoptx  |  4 +-
 soft/PjtKEIL_StepDeb_2/BacASable.uvoptx  | 53 +++++++++++++++++++++++-
 soft/PjtKEIL_StepDeb_2/BacASable.uvprojx |  7 +---
 soft/PjtKEIL_StepDeb_2/Src/Cligno.s      | 33 +++++++++++----
 soft/PjtKEIL_StepDeb_2/Src/principal.c   |  9 +++-
 5 files changed, 87 insertions(+), 19 deletions(-)

diff --git a/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx b/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx
index 4010242..172486d 100644
--- a/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx
+++ b/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx
@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -287,7 +287,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
diff --git a/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx b/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx
index f1315bb..8f59c84 100644
--- a/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx
+++ b/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx
@@ -10,7 +10,7 @@
     <aExt>*.s*; *.src; *.a*</aExt>
     <oExt>*.obj; *.o</oExt>
     <lExt>*.lib</lExt>
-    <tExt>*.txt; *.h; *.inc</tExt>
+    <tExt>*.txt; *.h; *.inc; *.md</tExt>
     <pExt>*.plm</pExt>
     <CppX>*.cpp</CppX>
     <nMigrate>0</nMigrate>
@@ -154,6 +154,55 @@
         </SetRegEntry>
       </TargetDriverDllRegistry>
       <Breakpoint/>
+      <WatchWindow1>
+        <Ww>
+          <count>0</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>FlagCligno</ItemText>
+        </Ww>
+        <Ww>
+          <count>1</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>r1</ItemText>
+        </Ww>
+        <Ww>
+          <count>2</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>r2</ItemText>
+        </Ww>
+      </WatchWindow1>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>0</SubType>
+          <ItemText>FlagCligno</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
+      <MemoryWindow2>
+        <Mm>
+          <WinNumber>2</WinNumber>
+          <SubType>0</SubType>
+          <ItemText>r1</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow2>
+      <MemoryWindow3>
+        <Mm>
+          <WinNumber>3</WinNumber>
+          <SubType>0</SubType>
+          <ItemText>r0</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow3>
+      <MemoryWindow4>
+        <Mm>
+          <WinNumber>4</WinNumber>
+          <SubType>0</SubType>
+          <ItemText>r2</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow4>
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
@@ -174,7 +223,7 @@
         <AscS3>0</AscS3>
         <aSer3>0</aSer3>
         <eProf>0</eProf>
-        <aLa>0</aLa>
+        <aLa>1</aLa>
         <aPa1>0</aPa1>
         <AscS4>0</AscS4>
         <aSer4>0</aSer4>
diff --git a/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx b/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx
index d99d0f0..e77bfc6 100644
--- a/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx
+++ b/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx
@@ -10,7 +10,7 @@
       <TargetName>Simu</TargetName>
       <ToolsetNumber>0x4</ToolsetNumber>
       <ToolsetName>ARM-ADS</ToolsetName>
-      <pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed>
+      <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
       <uAC6>0</uAC6>
       <TargetOption>
         <TargetCommonOption>
@@ -1338,11 +1338,6 @@
     <Layers>
       <Layer>
         <LayName>&lt;Project Info&gt;</LayName>
-        <LayDesc></LayDesc>
-        <LayUrl></LayUrl>
-        <LayKeys></LayKeys>
-        <LayCat></LayCat>
-        <LayLic></LayLic>
         <LayTarg>0</LayTarg>
         <LayPrjMark>1</LayPrjMark>
       </Layer>
diff --git a/soft/PjtKEIL_StepDeb_2/Src/Cligno.s b/soft/PjtKEIL_StepDeb_2/Src/Cligno.s
index 8a75b7a..4807e07 100644
--- a/soft/PjtKEIL_StepDeb_2/Src/Cligno.s
+++ b/soft/PjtKEIL_StepDeb_2/Src/Cligno.s
@@ -1,6 +1,6 @@
 	PRESERVE8
 	THUMB   
-		
+	INCLUDE Driver/DriverJeuLaser.inc
 
 ; ====================== zone de réservation de données,  ======================================
 ;Section RAM (read only) :
@@ -10,21 +10,40 @@
 ;Section RAM (read write):
 	area    maram,data,readwrite
 		
-
+FlagCligno dcd 0
 	
 ; ===============================================================================================
 	
-
+	EXPORT FlagCligno
+	EXPORT callback
 
 		
 ;Section ROM code (read only) :		
 	area    moncode,code,readonly
 ; écrire le code ici		
 
+	
+	
+callback proc
+	push	{lr}
+	ldr 	r1,=FlagCligno
+	ldr     r2,[r1]
+	cmp 	r2, #1
+	beq 	allume_led
+	mov		r0, #1
+	str  	r0, [r1]
+	bl 		GPIOB_Clear
+	pop 	{lr}
+	bx 		lr
+	
 
-
-
-
-		
+allume_led
+	mov		r0, #0
+	str  	r0, [r1]
+	mov 	r0, #1
+	bl 		GPIOB_Set
+	pop		{lr}
+	bx		lr
+	endp	
 		
 	END	
\ No newline at end of file
diff --git a/soft/PjtKEIL_StepDeb_2/Src/principal.c b/soft/PjtKEIL_StepDeb_2/Src/principal.c
index 4d726a1..8569db1 100644
--- a/soft/PjtKEIL_StepDeb_2/Src/principal.c
+++ b/soft/PjtKEIL_StepDeb_2/Src/principal.c
@@ -4,6 +4,8 @@
 
 void timer_callback(void);
 
+extern void callback(void);
+
 int main(void)
 {
 
@@ -19,6 +21,8 @@ CLOCK_Configure();
 //** Placez votre code là ** // 
 	
 	
+	Timer_1234_Init_ff(TIM4, 7200000 );
+	Active_IT_Debordement_Timer( TIM4, 2, callback );
 	
 // Activation des interruptions issues du Timer 4
 // Association de la fonction à exécuter lors de l'interruption : timer_callback
@@ -39,10 +43,11 @@ GPIO_Configure(GPIOB, 1, OUTPUT, OUTPUT_PPULL);
 	
 while	(1)
 	{
+		
 	}
 }
 
-char FlagCligno;
+/*char FlagCligno;
 
 void timer_callback(void)
 {
@@ -57,5 +62,5 @@ void timer_callback(void)
 		GPIOB_Clear(1);
 	}
 		
-}
+} */