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 @@
1
0
- 0
+ 1
18
@@ -287,7 +287,7 @@
1
0
- 1
+ 0
18
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 @@
*.s*; *.src; *.a*
*.obj; *.o
*.lib
- *.txt; *.h; *.inc
+ *.txt; *.h; *.inc; *.md
*.plm
*.cpp
0
@@ -154,6 +154,55 @@
+
+
+ 0
+ 1
+ FlagCligno
+
+
+ 1
+ 1
+ r1
+
+
+ 2
+ 1
+ r2
+
+
+
+
+ 1
+ 0
+ FlagCligno
+ 0
+
+
+
+
+ 2
+ 0
+ r1
+ 0
+
+
+
+
+ 3
+ 0
+ r0
+ 0
+
+
+
+
+ 4
+ 0
+ r2
+ 0
+
+
0
@@ -174,7 +223,7 @@
0
0
0
- 0
+ 1
0
0
0
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 @@
Simu
0x4
ARM-ADS
- 5060750::V5.06 update 6 (build 750)::.\ARMCC
+ 5060960::V5.06 update 7 (build 960)::.\ARMCC
0
@@ -1338,11 +1338,6 @@
<Project Info>
-
-
-
-
-
0
1
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);
}
-}
+} */