diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.h b/soft/PjtKEIL_StepSon/Src/GestionSon.h
new file mode 100644
index 0000000..e69de29
diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.s b/soft/PjtKEIL_StepSon/Src/GestionSon.s
index 987363b..a2d0f10 100644
--- a/soft/PjtKEIL_StepSon/Src/GestionSon.s
+++ b/soft/PjtKEIL_StepSon/Src/GestionSon.s
@@ -1,7 +1,9 @@
PRESERVE8
THUMB
+ include Driver/DriverJeuLaser.inc
export callback_son;
+ export sortieSon;
extern Son;
; ====================== zone de réservation de données, ======================================
;Section RAM (read only) :
@@ -36,5 +38,14 @@ callback_son
mul r3, r3, r0;
lsr r3, #16;
str r3, [r1];
+ mov r0,r3;
+ bl PWM_Set_Value_TIM3_Ch3;
pop{pc,r4};
- END
\ No newline at end of file
+ END
+
+StartSon
+ push{lr};
+
+
+ pop{pc};
+ END
\ No newline at end of file
diff --git a/soft/PjtKEIL_StepSon/Src/principal.c b/soft/PjtKEIL_StepSon/Src/principal.c
index f9ae64a..9be4734 100644
--- a/soft/PjtKEIL_StepSon/Src/principal.c
+++ b/soft/PjtKEIL_StepSon/Src/principal.c
@@ -1,6 +1,5 @@
#include "DriverJeuLaser.h"
-
extern void callback_son(void);
int main(void)
@@ -14,13 +13,14 @@ int main(void)
CLOCK_Configure();
Timer_1234_Init_ff(TIM4, 6552);
Active_IT_Debordement_Timer(TIM4, 2, callback_son);
-
-
+PWM_Init_ff( TIM3, 3, 720);
+GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL);
//============================================================================
while (1)
{
+
}
}
diff --git a/soft/PjtKEIL_StepSon/StepSon.uvoptx b/soft/PjtKEIL_StepSon/StepSon.uvoptx
index 6876778..d844344 100644
--- a/soft/PjtKEIL_StepSon/StepSon.uvoptx
+++ b/soft/PjtKEIL_StepSon/StepSon.uvoptx
@@ -75,7 +75,7 @@
1
0
- 1
+ 0
18
@@ -153,24 +153,7 @@
-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)
-
-
- 0
- 0
- 26
- 1
- 134219960
- 0
- 0
- 0
- 0
- 0
- 1
- .\Src\GestionSon.s
-
- \\StepSon\Src/GestionSon.s\26
-
-
+
1
@@ -199,7 +182,7 @@
0
0
0
- 0
+ 1
0
0
0
@@ -224,8 +207,13 @@
0
- ((portb & 0x00000002) >> 1 & 0x2) >> 1
- FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F150000000000000000000000000000000000000096020008
+ ((portb & 0x00000001) & 0x1) >> 0
+ FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F130000000000000000000000000000000000000004010008
+
+
+ 1
+ `sortieSon
+ 008000000000000000206840000000000028804000000000000000000000000000000000736F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1300000000000000000000000000000000000000B40A0008
@@ -292,7 +280,7 @@
1
0
- 0
+ 1
18
@@ -399,7 +387,7 @@
0
0
0
- 0
+ 1
0
0
0
diff --git a/soft/PjtKEIL_StepSon/StepSon.uvprojx b/soft/PjtKEIL_StepSon/StepSon.uvprojx
index aa24a2f..b8258a0 100644
--- a/soft/PjtKEIL_StepSon/StepSon.uvprojx
+++ b/soft/PjtKEIL_StepSon/StepSon.uvprojx
@@ -434,7 +434,7 @@
CibleSondeKEIL
0x4
ARM-ADS
- 5060750::V5.06 update 6 (build 750)::.\ARMCC
+ 5060960::V5.06 update 7 (build 960)::.\ARMCC
0