diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.s b/soft/PjtKEIL_StepSon/Src/GestionSon.s index e3074a2..446bf2c 100644 --- a/soft/PjtKEIL_StepSon/Src/GestionSon.s +++ b/soft/PjtKEIL_StepSon/Src/GestionSon.s @@ -2,6 +2,7 @@ THUMB export CallbackSon + export StartSon include DriverJeuLaser.inc @@ -77,4 +78,15 @@ ret endp +StartSon proc + + ldr r0,=index ; @ index + ldr r1,[r0] + mov r1,#0 + str r1,[r0] + + bx lr + + endp + END \ No newline at end of file diff --git a/soft/PjtKEIL_StepSon/Src/principal.c b/soft/PjtKEIL_StepSon/Src/principal.c index 9b24aa7..6207fc0 100644 --- a/soft/PjtKEIL_StepSon/Src/principal.c +++ b/soft/PjtKEIL_StepSon/Src/principal.c @@ -3,6 +3,8 @@ #include "DriverJeuLaser.h" extern void CallbackSon(void); +extern void StartSon(void); + int main(void) { @@ -15,18 +17,24 @@ int main(void) CLOCK_Configure(); double tick=91*72; + Timer_1234_Init_ff(TIM4,tick); Active_IT_Debordement_Timer( TIM4, 2, CallbackSon ); PWM_Init_ff( TIM3, 3, 720); GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL); + +Systick_Period_ff( 100*72 ); + //============================================================================ while (1) { + Systick_Prio_IT( 1, StartSon ); + } } diff --git a/soft/PjtKEIL_StepSon/StepSon.uvoptx b/soft/PjtKEIL_StepSon/StepSon.uvoptx index 01dbf4d..6f5d82e 100644 --- a/soft/PjtKEIL_StepSon/StepSon.uvoptx +++ b/soft/PjtKEIL_StepSon/StepSon.uvoptx @@ -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 - 57 - 1 -
134220678
- 0 - 0 - 0 - 0 - 0 - 1 - .\Src\GestionSon.s - - \\StepSon\Src/GestionSon.s\57 -
-
+ 0 @@ -182,7 +165,7 @@ 1 265 - R0 + 0x200000A4 0 @@ -232,12 +215,12 @@ 0 `SortieSon - FF0000000000000000000000000000000050824000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F0C00000000000000000000000000000000000000E8080008 + FF0000000000000000000000000000000050824000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1500000000000000000000000000000000000000E8080008 1 ((portb & 0x00000001) & 0x1) >> 0 - 00800000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F0C00000000000000000000000000000000000000080B0008 + 00800000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1500000000000000000000000000000000000000080B0008 @@ -383,11 +366,18 @@ + + + 0 + 1 + SortieSon,0x0A + + 1 - 257 - r0 + 265 + 0x08000BD8 0 @@ -411,7 +401,7 @@ 0 0 0 - 0 + 1 0 0 0 diff --git a/soft/PjtKEIL_StepSon/StepSon.uvprojx b/soft/PjtKEIL_StepSon/StepSon.uvprojx index b34880e..3902e1a 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 @@ -781,7 +781,7 @@ - + .\Driver