diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.s b/soft/PjtKEIL_StepSon/Src/GestionSon.s index 495ae23..edcfd13 100644 --- a/soft/PjtKEIL_StepSon/Src/GestionSon.s +++ b/soft/PjtKEIL_StepSon/Src/GestionSon.s @@ -1,6 +1,11 @@ PRESERVE8 THUMB + extern Son + extern LongueurSon export CallbackSon + export SortieSon + export Index + include ../Driver/DriverJeuLaser.inc ; ====================== zone de réservation de données, ====================================== ;Section RAM (read only) : @@ -9,31 +14,65 @@ ;Section RAM (read write): area maram,data,readwrite - SortieSon dcd 0x0000 -Index dcd 0 +Index dcd 0x0000 ; =============================================================================================== +;Si Indice 1 0 - 0 + 1 18 @@ -154,6 +154,26 @@ + + + 0 + 1 + Index + + + 1 + 1 + SortieSon + + + + + 1 + 10 + 0x200000A0 + 0 + + 0 @@ -174,7 +194,7 @@ 0 0 0 - 0 + 1 0 0 0 @@ -199,8 +219,8 @@ 0 - ((portb & 0x00000002) >> 1 & 0x2) >> 1 - FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F160000000000000000000000000000000000000096020008 + `portb + 00800000000000000000000000000000E0FFEF4000000000000000000000000000000000706F7274620000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F1A00000000000000000000000000000000000000B40A0008 @@ -460,7 +480,7 @@ 1 0 - 1 + 0 18 diff --git a/soft/PjtKEIL_StepSon/StepSon.uvprojx b/soft/PjtKEIL_StepSon/StepSon.uvprojx index 839c3b9..2849fe6 100644 --- a/soft/PjtKEIL_StepSon/StepSon.uvprojx +++ b/soft/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