From 596e3758e7598f333665eba7d15e91569e715577 Mon Sep 17 00:00:00 2001
From: Sanim Gharbi <gharb@insa-toulouse.fr>
Date: Tue, 11 Apr 2023 18:16:20 +0200
Subject: [PATCH] fin de seance 11/04

---
 soft/PjtKEIL_StepDeb_2/BacASable.uvoptx  |  2 +-
 soft/PjtKEIL_StepDeb_2/BacASable.uvprojx |  5 -----
 soft/PjtKEIL_StepSon/Src/GestionSon.s    |  6 ++++++
 soft/PjtKEIL_StepSon/Src/principal.c     |  5 ++---
 soft/PjtKEIL_StepSon/StepSon.uvoptx      | 12 +++++++++++-
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx b/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx
index f1315bb..e732af2 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>
diff --git a/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx b/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx
index d99d0f0..f684f0d 100644
--- a/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx
+++ b/soft/PjtKEIL_StepDeb_2/BacASable.uvprojx
@@ -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_StepSon/Src/GestionSon.s b/soft/PjtKEIL_StepSon/Src/GestionSon.s
index 38d6d83..db0ae7c 100644
--- a/soft/PjtKEIL_StepSon/Src/GestionSon.s
+++ b/soft/PjtKEIL_StepSon/Src/GestionSon.s
@@ -20,6 +20,8 @@ indexTab dcd 0
 	EXPORT SortieSon;
 	EXTERN LongueurSon;
 	EXTERN Son;
+	EXTERN PWM_Set_Value_TIM3_Ch3;	
+	INCLUDE ../Driver/DriverJeuLaser.inc;
 
 
 		
@@ -47,6 +49,10 @@ CallbackSon proc
 	LSR r5,r5,#16
 	
 	STR r5,[r0] ; dans sortieson la valeur de son[index]
+	MOV r0,r5
+	push {lr}
+	BL PWM_Set_Value_TIM3_Ch3
+	pop{lr}
 	add r6,r6,#1
 	STR r6,[r3]
 	
diff --git a/soft/PjtKEIL_StepSon/Src/principal.c b/soft/PjtKEIL_StepSon/Src/principal.c
index 421a6ae..e86dc30 100644
--- a/soft/PjtKEIL_StepSon/Src/principal.c
+++ b/soft/PjtKEIL_StepSon/Src/principal.c
@@ -6,18 +6,17 @@ void CallbackSon(void);
 
 int main(void)
 {
-
 // ===========================================================================
 // ============= INIT PERIPH (faites qu'une seule fois)  =====================
 // ===========================================================================
-
 // Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers
 CLOCK_Configure();
 
 
 Timer_1234_Init_ff( TIM4, 91.0f*10e-6/(1.0f/72.0f*10e-6));
-	
+PWM_Init_ff( TIM3, 3, 720); //655 ms	
 Active_IT_Debordement_Timer( TIM4, 2, CallbackSon );
+GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL);
 //============================================================================	
 	
 	
diff --git a/soft/PjtKEIL_StepSon/StepSon.uvoptx b/soft/PjtKEIL_StepSon/StepSon.uvoptx
index b7ab2fa..da50abb 100644
--- a/soft/PjtKEIL_StepSon/StepSon.uvoptx
+++ b/soft/PjtKEIL_StepSon/StepSon.uvoptx
@@ -170,6 +170,11 @@
           <WinNumber>1</WinNumber>
           <ItemText>r6</ItemText>
         </Ww>
+        <Ww>
+          <count>3</count>
+          <WinNumber>1</WinNumber>
+          <ItemText>r0,0x0A</ItemText>
+        </Ww>
       </WatchWindow1>
       <MemoryWindow1>
         <Mm>
@@ -225,7 +230,12 @@
         <Wi>
           <IntNumber>0</IntNumber>
           <FirstString>`SortieSon</FirstString>
-          <SecondString>008000000000000000000000000000000000894000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000001000000000000000000F03F150000000000000000000000000000000000000094080008</SecondString>
+          <SecondString>0080000000000000000000000000000000408F4000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000001000000000000000000E03F1900000000000000000000000000000000000000540A0008</SecondString>
+        </Wi>
+        <Wi>
+          <IntNumber>1</IntNumber>
+          <FirstString>((portb &amp; 0x00000001) &amp; 0x1) &gt;&gt; 0</FirstString>
+          <SecondString>0080000000000000000000000000000000408F400000000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000002000000000000000000E03F1900000000000000000000000000000000000000B40A0008</SecondString>
         </Wi>
       </LogicAnalyzers>
       <DebugDescription>