diff --git a/soft/PjtKEIL_StepSon/Driver/DriverJeuLaser.lib b/soft/PjtKEIL_StepSon/Driver/DriverJeuLaser.lib
deleted file mode 100644
index b26c40d..0000000
Binary files a/soft/PjtKEIL_StepSon/Driver/DriverJeuLaser.lib and /dev/null differ
diff --git a/soft/PjtKEIL_StepSon/Driver/DriverJeuLaser.h b/soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Driver/DriverJeuLaser.h
similarity index 100%
rename from soft/PjtKEIL_StepSon/Driver/DriverJeuLaser.h
rename to soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Driver/DriverJeuLaser.h
diff --git a/soft/PjtKEIL_StepSon/Driver/DriverJeuLaser.inc b/soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Driver/DriverJeuLaser.inc
similarity index 100%
rename from soft/PjtKEIL_StepSon/Driver/DriverJeuLaser.inc
rename to soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Driver/DriverJeuLaser.inc
diff --git a/soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Src/GestionSon.s b/soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Src/GestionSon.s
new file mode 100644
index 0000000..bec8416
--- /dev/null
+++ b/soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Src/GestionSon.s
@@ -0,0 +1,73 @@
+ PRESERVE8
+ THUMB
+
+
+
+
+; ====================== zone de réservation de données, ======================================
+;Section RAM (read only) :
+ area mesdata,data,readonly
+
+
+;Section RAM (read write):
+ area maram,data,readwrite
+
+
+
+; ===============================================================================================
+
+ export CallbackSon
+ export SortieSon
+ extern LongueurSon
+ extern Son
+
+Index DCW 0
+SortieSon DCD 0
+
+;Section ROM code (read only) :
+ area moncode,code,readonly
+; écrire le code ici
+
+
+CallbackSon proc
+
+ ldr r0,=Index
+ ldr r1,[r0]
+ ldr r2,=Son
+ ldr r3,LongueurSon
+
+ cmp r1,r3
+ ble notEqual
+
+notEqual
+
+ push {r4}
+ push {r5}
+ ldrsh r5,[r2,r1]
+
+
+ mov r4,#32768
+ add r5,r5,r4
+ mov r4,#719
+ mul r5,r4
+ mov r4,#65535
+ udiv r5,r4
+ push {r6}
+ ldr r6,=SortieSon
+
+ strh r5,[r6]
+ add r1, #1
+
+ str r0,[r4]
+ pop{r6}
+ pop {r4}
+ pop {r5}
+ bx lr
+
+
+
+
+ ENDFUNC
+
+
+ END
\ No newline at end of file
diff --git a/soft/PjtKEIL_StepSon/Src/bruitverre.asm b/soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Src/bruitverre.asm
similarity index 100%
rename from soft/PjtKEIL_StepSon/Src/bruitverre.asm
rename to soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Src/bruitverre.asm
diff --git a/soft/PjtKEIL_StepSon/Src/principal.c b/soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Src/principal.c
similarity index 82%
rename from soft/PjtKEIL_StepSon/Src/principal.c
rename to soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Src/principal.c
index d09be75..4944ddd 100644
--- a/soft/PjtKEIL_StepSon/Src/principal.c
+++ b/soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Src/principal.c
@@ -2,7 +2,7 @@
#include "DriverJeuLaser.h"
-
+void CallbackSon();
int main(void)
{
@@ -14,9 +14,9 @@ int main(void)
// Après exécution : le coeur CPU est clocké à 72MHz ainsi que tous les timers
CLOCK_Configure();
-
-
+Timer_1234_Init_ff( TIM4, 91);
+Active_IT_Debordement_Timer( TIM4, 2, CallbackSon);
//============================================================================
@@ -24,5 +24,7 @@ CLOCK_Configure();
while (1)
{
}
+
+
}
diff --git a/soft/PjtKEIL_StepSon/Src/startup-rvds.s b/soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Src/startup-rvds.s
similarity index 100%
rename from soft/PjtKEIL_StepSon/Src/startup-rvds.s
rename to soft/PjtKEIL_StepSon/PjtKEIL_StepSon/Src/startup-rvds.s
diff --git a/soft/PjtKEIL_StepSon/StepSon.uvprojx b/soft/PjtKEIL_StepSon/PjtKEIL_StepSon/StepSon.uvprojx
similarity index 96%
rename from soft/PjtKEIL_StepSon/StepSon.uvprojx
rename to soft/PjtKEIL_StepSon/PjtKEIL_StepSon/StepSon.uvprojx
index d0b5c10..c69c3c5 100644
--- a/soft/PjtKEIL_StepSon/StepSon.uvprojx
+++ b/soft/PjtKEIL_StepSon/PjtKEIL_StepSon/StepSon.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
@@ -410,6 +410,21 @@
+
+ Son
+
+
+ bruitverre.asm
+ 2
+ .\Src\bruitverre.asm
+
+
+ GestionSon.s
+ 2
+ .\Src\GestionSon.s
+
+
+
::CMSIS
@@ -819,6 +834,21 @@
+
+ Son
+
+
+ bruitverre.asm
+ 2
+ .\Src\bruitverre.asm
+
+
+ GestionSon.s
+ 2
+ .\Src\GestionSon.s
+
+
+
::CMSIS
@@ -1297,6 +1327,21 @@
+
+ Son
+
+
+ bruitverre.asm
+ 2
+ .\Src\bruitverre.asm
+
+
+ GestionSon.s
+ 2
+ .\Src\GestionSon.s
+
+
+
::CMSIS
@@ -1322,12 +1367,7 @@
- <Project Info>
-
-
-
-
-
+ StepSon
0
1
diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.s b/soft/PjtKEIL_StepSon/Src/GestionSon.s
deleted file mode 100644
index 8a75b7a..0000000
--- a/soft/PjtKEIL_StepSon/Src/GestionSon.s
+++ /dev/null
@@ -1,30 +0,0 @@
- PRESERVE8
- THUMB
-
-
-; ====================== zone de réservation de données, ======================================
-;Section RAM (read only) :
- area mesdata,data,readonly
-
-
-;Section RAM (read write):
- area maram,data,readwrite
-
-
-
-; ===============================================================================================
-
-
-
-
-;Section ROM code (read only) :
- area moncode,code,readonly
-; écrire le code ici
-
-
-
-
-
-
-
- END
\ No newline at end of file
diff --git a/soft/PjtKEIL_StepSon/StepSon.uvoptx b/soft/PjtKEIL_StepSon/StepSon.uvoptx
deleted file mode 100644
index a13d7da..0000000
--- a/soft/PjtKEIL_StepSon/StepSon.uvoptx
+++ /dev/null
@@ -1,677 +0,0 @@
-
-
-
- 1.0
-
- ### uVision Project, (C) Keil Software
-
-
- *.c
- *.s*; *.src; *.a*
- *.obj; *.o
- *.lib
- *.txt; *.h; *.inc
- *.plm
- *.cpp
- 0
-
-
-
- 0
- 0
-
-
-
- Simu
- 0x4
- ARM-ADS
-
- 8000000
-
- 1
- 1
- 0
- 1
- 0
-
-
- 1
- 65535
- 0
- 0
- 0
-
-
- 79
- 66
- 8
-
-
-
- 1
- 1
- 1
- 0
- 1
- 1
- 0
- 1
- 0
- 0
- 0
- 0
-
-
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 0
- 0
-
-
- 1
- 0
- 0
-
- 18
-
- 1
- 0
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 1
- 0
- 0
- 6
-
-
-
-
-
-
-
-
-
-
- STLink\ST-LINKIII-KEIL_SWO.dll
-
-
-
- 0
- DLGDARM
- (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=75,104,496,531,0)(121=859,154,1280,581,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=614,0,1208,751,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)
-
-
- 0
- ARMRTXEVENTFLAGS
- -L70 -Z18 -C0 -M0 -T1
-
-
- 0
- DLGTARM
- (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)
-
-
- 0
- ARMDBGFLAGS
- -T0
-
-
- 0
- DLGUARM
- (105=-1,-1,-1,-1,0)
-
-
- 0
- UL2CM3
- UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM))
-
-
- 0
- ST-LINKIII-KEIL_SWO
- -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
- 1
- 1
- 0
- 0
- 0
- 0
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
-
-
- 0
- ((portb & 0x00000002) >> 1 & 0x2) >> 1
- FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F160000000000000000000000000000000000000096020008
-
-
-
- 1
- 0
- 0
- 2
- 10000000
-
-
-
-
-
- CibleSondeKEIL
- 0x4
- ARM-ADS
-
- 8000000
-
- 1
- 1
- 0
- 1
- 0
-
-
- 1
- 65535
- 0
- 0
- 0
-
-
- 79
- 66
- 8
-
-
-
- 1
- 1
- 1
- 0
- 1
- 1
- 0
- 1
- 0
- 0
- 0
- 0
-
-
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 0
- 0
-
-
- 1
- 0
- 0
-
- 18
-
- 0
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 1
- 0
- 0
- 0
-
-
-
-
-
-
-
-
-
-
- BIN\UL2CM3.DLL
-
-
-
- 0
- DLGDARM
- (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=75,104,496,531,0)(121=859,154,1280,581,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)
-
-
- 0
- ARMRTXEVENTFLAGS
- -L70 -Z18 -C0 -M0 -T1
-
-
- 0
- DLGTARM
- (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)
-
-
- 0
- ARMDBGFLAGS
- -T0
-
-
- 0
- DLGUARM
- (105=-1,-1,-1,-1,0)
-
-
- 0
- UL2CM3
- -UAny -O206 -S8 -C0 -P00 -N00("ARM CoreSight SW-DP") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)
-
-
- 0
- ST-LINKIII-KEIL_SWO
- -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)
-
-
-
-
-
- 1
- 257
- r0
- 0
-
-
-
- 0
-
-
- 0
- 1
- 1
- 0
- 0
- 0
- 0
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
-
- 1
- 0
- 0
- 2
- 10000000
-
-
-
-
-
- CibleSondeST
- 0x4
- ARM-ADS
-
- 8000000
-
- 1
- 1
- 0
- 1
- 0
-
-
- 1
- 65535
- 0
- 0
- 0
-
-
- 79
- 66
- 8
-
-
-
- 1
- 1
- 1
- 0
- 1
- 1
- 0
- 1
- 0
- 0
- 0
- 0
-
-
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 0
- 0
-
-
- 1
- 0
- 1
-
- 18
-
- 0
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 1
- 0
- 0
- 1
- 0
- 0
- 6
-
-
-
-
-
-
-
-
-
-
- STLink\ST-LINKIII-KEIL_SWO.dll
-
-
-
- 0
- DLGDARM
- (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=75,104,496,531,0)(121=859,154,1280,581,0)(122=-1,-1,-1,-1,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=-1,-1,-1,-1,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)
-
-
- 0
- ARMRTXEVENTFLAGS
- -L70 -Z18 -C0 -M0 -T1
-
-
- 0
- DLGTARM
- (1010=-1,-1,-1,-1,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)
-
-
- 0
- ARMDBGFLAGS
- -T0
-
-
- 0
- DLGUARM
- (105=-1,-1,-1,-1,0)
-
-
- 0
- UL2CM3
- UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM))
-
-
- 0
- ST-LINKIII-KEIL_SWO
- -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)
-
-
-
-
-
- 1
- 257
- r0
- 0
-
-
-
- 0
-
-
- 0
- 1
- 1
- 0
- 0
- 0
- 0
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 0
- 1
- 0
- 0
- 0
- 0
- 0
- 0
- 0
-
-
-
- 0
- 0
- 0
-
-
-
-
-
-
-
-
-
-
- 0
- ((portb & 0x00000002) >> 1 & 0x2) >> 1
- FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F100000000000000000000000000000000000000096020008
-
-
-
- 1
- 0
- 0
- 2
- 10000000
-
-
-
-
-
- Sources
- 1
- 0
- 0
- 0
-
- 1
- 1
- 1
- 0
- 0
- 0
- .\Src\principal.c
- principal.c
- 0
- 0
-
-
-
-
- Sys
- 1
- 0
- 0
- 0
-
- 2
- 2
- 2
- 0
- 0
- 0
- .\Src\startup-rvds.s
- startup-rvds.s
- 0
- 0
-
-
-
-
- Driver
- 1
- 0
- 0
- 0
-
- 3
- 3
- 4
- 0
- 0
- 0
- .\Driver\DriverJeuLaser.lib
- DriverJeuLaser.lib
- 0
- 0
-
-
-
-
- ::CMSIS
- 0
- 0
- 0
- 1
-
-
-