From 9f57b9cc3ce4f59bd915c71cde8704f6093dd60d Mon Sep 17 00:00:00 2001
From: Alan Dutems <dutems@insa-toulouse.fr>
Date: Tue, 18 Apr 2023 17:16:24 +0200
Subject: [PATCH] SonFin

---
 soft/PjtKEIL_StepSon/Src/GestionSon.h |  7 ++++
 soft/PjtKEIL_StepSon/Src/GestionSon.s | 22 +++++++++--
 soft/PjtKEIL_StepSon/Src/principal.c  |  7 +++-
 soft/PjtKEIL_StepSon/StepSon.uvoptx   | 53 ++++++++++++++-------------
 soft/PjtKEIL_StepSon/StepSon.uvprojx  | 17 ++++++++-
 5 files changed, 74 insertions(+), 32 deletions(-)
 create mode 100644 soft/PjtKEIL_StepSon/Src/GestionSon.h

diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.h b/soft/PjtKEIL_StepSon/Src/GestionSon.h
new file mode 100644
index 0000000..7666666
--- /dev/null
+++ b/soft/PjtKEIL_StepSon/Src/GestionSon.h
@@ -0,0 +1,7 @@
+#ifndef GestionSon
+#define GestionSon
+
+void Callbackson(void);
+void StartSon(void);
+
+#endif 
\ No newline at end of file
diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.s b/soft/PjtKEIL_StepSon/Src/GestionSon.s
index cf8d389..522c59f 100644
--- a/soft/PjtKEIL_StepSon/Src/GestionSon.s
+++ b/soft/PjtKEIL_StepSon/Src/GestionSon.s
@@ -16,6 +16,7 @@ SortieSon dcw 0
 	export index 	
 	export SortieSon
 	export Callbackson
+	export StartSon
 		
 	extern Son 
 	extern LongueurSon
@@ -33,8 +34,18 @@ SortieSon dcw 0
 	;r1 Index
 	;r2 Adresse index
 	;r3 Pour les calculs
+	
+	
+StartSon proc
 
-Callbackson
+	ldr r0, =index
+	mov r1, #0
+	str r1,[r0]
+	
+	bx lr 
+	endp
+
+Callbackson proc
 
 	ldr r2, =index
 	ldr r1, [r2]
@@ -48,7 +59,7 @@ Callbackson
 	cmp r3, r1
 	bhs Conversion
 	
-	mov r0,#0
+	mov r0,#-1
 	
 	b fin
 	 
@@ -76,8 +87,11 @@ fin
 	pop{lr, r2, r1, r0}
 	
 	ldr r3, =SortieSon
-	strh r0,[r3]
+	str r0,[r3]
     
     bx lr
+	endp
+
   
-	END	
+  
+END	
diff --git a/soft/PjtKEIL_StepSon/Src/principal.c b/soft/PjtKEIL_StepSon/Src/principal.c
index 11d27c6..f6b3cbc 100644
--- a/soft/PjtKEIL_StepSon/Src/principal.c
+++ b/soft/PjtKEIL_StepSon/Src/principal.c
@@ -1,8 +1,9 @@
 
 
 #include "DriverJeuLaser.h"
+#include "GestionSon.h"
 
-void Callbackson(void);
+extern int SortieSon;
 
 int main(void)
 {
@@ -28,7 +29,9 @@ Active_IT_Debordement_Timer(TIM4, 2, Callbackson);
 	
 while	(1)
 	{
-		
+		if (SortieSon==-1){
+				StartSon();
+		}
 	}
 }
 
diff --git a/soft/PjtKEIL_StepSon/StepSon.uvoptx b/soft/PjtKEIL_StepSon/StepSon.uvoptx
index fa075ec..e34f4da 100644
--- a/soft/PjtKEIL_StepSon/StepSon.uvoptx
+++ b/soft/PjtKEIL_StepSon/StepSon.uvoptx
@@ -75,7 +75,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>1</IsCurrentTarget>
+        <IsCurrentTarget>0</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -153,24 +153,15 @@
           <Name>-U066CFF574857847167074929 -O2254 -S0 -C0 -A0 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO18 -TC10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC800 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
         </SetRegEntry>
       </TargetDriverDllRegistry>
-      <Breakpoint>
-        <Bp>
-          <Number>0</Number>
-          <Type>0</Type>
-          <LineNumber>51</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134220556</Address>
-          <ByteObject>0</ByteObject>
-          <HtxType>0</HtxType>
-          <ManyObjects>0</ManyObjects>
-          <SizeOfObject>0</SizeOfObject>
-          <BreakByAccess>0</BreakByAccess>
-          <BreakIfRCount>1</BreakIfRCount>
-          <Filename>.\Src\GestionSon.s</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression>\\StepSon\Src/GestionSon.s\51</Expression>
-        </Bp>
-      </Breakpoint>
+      <Breakpoint/>
+      <MemoryWindow1>
+        <Mm>
+          <WinNumber>1</WinNumber>
+          <SubType>257</SubType>
+          <ItemText>r0</ItemText>
+          <AccSizeX>0</AccSizeX>
+        </Mm>
+      </MemoryWindow1>
       <Tracepoint>
         <THDelay>0</THDelay>
       </Tracepoint>
@@ -217,12 +208,12 @@
         <Wi>
           <IntNumber>0</IntNumber>
           <FirstString>`SortieSon</FirstString>
-          <SecondString>008000000000000000000000000000000000894000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1600000000000000000000000000000000000000080A0008</SecondString>
+          <SecondString>008000000000000000000000000000000000894000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1500000000000000000000000000000000000000080A0008</SecondString>
         </Wi>
         <Wi>
           <IntNumber>1</IntNumber>
           <FirstString>((portb &amp; 0x00000001) &amp; 0x1) &gt;&gt; 0</FirstString>
-          <SecondString>00800000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1600000000000000000000000000000000000000B40A0008</SecondString>
+          <SecondString>00800000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1500000000000000000000000000000000000000B40A0008</SecondString>
         </Wi>
       </LogicAnalyzers>
       <DebugDescription>
@@ -289,7 +280,7 @@
       <OPTFL>
         <tvExp>1</tvExp>
         <tvExpOptDlg>0</tvExpOptDlg>
-        <IsCurrentTarget>0</IsCurrentTarget>
+        <IsCurrentTarget>1</IsCurrentTarget>
       </OPTFL>
       <CpuCode>18</CpuCode>
       <DebugOpt>
@@ -396,7 +387,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>
@@ -670,6 +661,18 @@
       <RteFlg>0</RteFlg>
       <bShared>0</bShared>
     </File>
+    <File>
+      <GroupNumber>1</GroupNumber>
+      <FileNumber>4</FileNumber>
+      <FileType>5</FileType>
+      <tvExp>0</tvExp>
+      <tvExpOptDlg>0</tvExpOptDlg>
+      <bDave2>0</bDave2>
+      <PathWithFileName>.\Src\GestionSon.h</PathWithFileName>
+      <FilenameWithoutPath>GestionSon.h</FilenameWithoutPath>
+      <RteFlg>0</RteFlg>
+      <bShared>0</bShared>
+    </File>
   </Group>
 
   <Group>
@@ -680,7 +683,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>2</GroupNumber>
-      <FileNumber>4</FileNumber>
+      <FileNumber>5</FileNumber>
       <FileType>2</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
@@ -700,7 +703,7 @@
     <RteFlg>0</RteFlg>
     <File>
       <GroupNumber>3</GroupNumber>
-      <FileNumber>5</FileNumber>
+      <FileNumber>6</FileNumber>
       <FileType>4</FileType>
       <tvExp>0</tvExp>
       <tvExpOptDlg>0</tvExpOptDlg>
diff --git a/soft/PjtKEIL_StepSon/StepSon.uvprojx b/soft/PjtKEIL_StepSon/StepSon.uvprojx
index b5f2dde..e5507c4 100644
--- a/soft/PjtKEIL_StepSon/StepSon.uvprojx
+++ b/soft/PjtKEIL_StepSon/StepSon.uvprojx
@@ -398,6 +398,11 @@
               <FileType>2</FileType>
               <FilePath>.\Src\bruitverre.asm</FilePath>
             </File>
+            <File>
+              <FileName>GestionSon.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>.\Src\GestionSon.h</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -429,7 +434,7 @@
       <TargetName>CibleSondeKEIL</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>
@@ -817,6 +822,11 @@
               <FileType>2</FileType>
               <FilePath>.\Src\bruitverre.asm</FilePath>
             </File>
+            <File>
+              <FileName>GestionSon.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>.\Src\GestionSon.h</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>
@@ -1305,6 +1315,11 @@
               <FileType>2</FileType>
               <FilePath>.\Src\bruitverre.asm</FilePath>
             </File>
+            <File>
+              <FileName>GestionSon.h</FileName>
+              <FileType>5</FileType>
+              <FilePath>.\Src\GestionSon.h</FilePath>
+            </File>
           </Files>
         </Group>
         <Group>