From 441e87624d60600913a7d3cf16e7379671621d03 Mon Sep 17 00:00:00 2001
From: Boyu Fu <bfu@insa-toulouse.fr>
Date: Wed, 12 Apr 2023 10:57:42 +0200
Subject: [PATCH] TP Son fini

---
 soft/PjtKEIL_StepSon/Src/GestionSon.s | 13 +++++-----
 soft/PjtKEIL_StepSon/StepSon.uvoptx   | 35 +--------------------------
 2 files changed, 7 insertions(+), 41 deletions(-)

diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.s b/soft/PjtKEIL_StepSon/Src/GestionSon.s
index 799da3e..d00c370 100644
--- a/soft/PjtKEIL_StepSon/Src/GestionSon.s
+++ b/soft/PjtKEIL_StepSon/Src/GestionSon.s
@@ -10,7 +10,6 @@
 ;Section RAM (read write):
 	area    maram,data,readwrite
 		
-Offset   	equ 32768
 SortieSon   equ 0
 Index       equ 0
     
@@ -29,7 +28,7 @@ Index       equ 0
 ; écrire le code ici		
 
 
-CallBackSon proc 
+CallBackSon proc 	
 	ldr r0, =Index
 	ldr r1, [r0]  
 	
@@ -45,17 +44,17 @@ CallBackSon proc
     ldr r3, =Son	
 	ldrsh r3, [r3,r1,LSL #1]	
 	
-	add r3, #Offset	
-	mov r0, #360
+	add r3, #0x8000
+	mov r0, #0x2CF
 	mul r3,r0
-	ldr r0,=Offset
-	udiv r3, r0
+	mov r0,#0xFFFF
+	udiv r3,r0
 	
 	
 	ldr r0, =SortieSon
 	str r3, [r0] 
 	mov r0, r3 
-	
+		
 	bl PWM_Set_Value_TIM3_Ch3	
 
 FIN_Son
diff --git a/soft/PjtKEIL_StepSon/StepSon.uvoptx b/soft/PjtKEIL_StepSon/StepSon.uvoptx
index f3322ec..a6a7ce6 100644
--- a/soft/PjtKEIL_StepSon/StepSon.uvoptx
+++ b/soft/PjtKEIL_StepSon/StepSon.uvoptx
@@ -153,40 +153,7 @@
           <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>53</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>.\Src\GestionSon.s</Filename>
-          <ExecCommand></ExecCommand>
-          <Expression></Expression>
-        </Bp>
-        <Bp>
-          <Number>1</Number>
-          <Type>0</Type>
-          <LineNumber>52</LineNumber>
-          <EnabledFlag>1</EnabledFlag>
-          <Address>134220476</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\52</Expression>
-        </Bp>
-      </Breakpoint>
+      <Breakpoint/>
       <MemoryWindow1>
         <Mm>
           <WinNumber>1</WinNumber>