diff --git a/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx b/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx index 0f4196b..3d67741 100644 --- a/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx +++ b/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx @@ -170,22 +170,6 @@ \\BacASable\Src/principal.c\16 - - 1 - 0 - 55 - 1 -
134220362
- 0 - 0 - 0 - 0 - 0 - 1 - .\Src\Cligno.s - - \\BacASable\Src/Cligno.s\55 -
0 diff --git a/soft/PjtKEIL_StepDeb_2/Src/Cligno.s b/soft/PjtKEIL_StepDeb_2/Src/Cligno.s index b452bc2..7d85ae3 100644 --- a/soft/PjtKEIL_StepDeb_2/Src/Cligno.s +++ b/soft/PjtKEIL_StepDeb_2/Src/Cligno.s @@ -13,6 +13,7 @@ FlagCligno dcb 0 export FlagCligno export timer_callback + ; =============================================================================================== @@ -76,8 +77,4 @@ flag_nul ;} endp - - - - - END \ No newline at end of file + END diff --git a/soft/PjtKEIL_StepSon/Src/GestionSon.s b/soft/PjtKEIL_StepSon/Src/GestionSon.s index 8a75b7a..e6d1229 100644 --- a/soft/PjtKEIL_StepSon/Src/GestionSon.s +++ b/soft/PjtKEIL_StepSon/Src/GestionSon.s @@ -9,22 +9,63 @@ ;Section RAM (read write): area maram,data,readwrite - +SortieSon dcw 0 + export SortieSon + export CallbackSon +Index dcd 0 + export Index ; =============================================================================================== - - +;static short int SortieSon; +;static int i +;if (i*.s*; *.src; *.a* *.obj; *.o *.lib - *.txt; *.h; *.inc + *.txt; *.h; *.inc; *.md *.plm *.cpp 0 @@ -75,7 +75,7 @@ 1 0 - 0 + 1 18 @@ -154,13 +154,28 @@ + + + 0 + 1 + SortieSon + + + + + 1 + 9 + 0xE000E000 + 0 + + 0 0 1 - 1 + 0 0 0 0 @@ -174,7 +189,7 @@ 0 0 0 - 0 + 1 0 0 0 @@ -199,8 +214,8 @@ 0 - ((portb & 0x00000002) >> 1 & 0x2) >> 1 - FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F160000000000000000000000000000000000000096020008 + `SortieSon + 000080000000000000000000000000000080864000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000500000001000000000000000000F03F020000000000000000000000000000000000000030010008 @@ -374,7 +389,7 @@ 0 0 0 - 0 + 1 0 0 0 @@ -460,7 +475,7 @@ 1 0 - 1 + 0 18 @@ -666,6 +681,70 @@ + + Son + 1 + 0 + 0 + 0 + + 4 + 4 + 2 + 0 + 0 + 0 + .\Src\bruitverre.asm + bruitverre.asm + 0 + 0 + + + 4 + 5 + 2 + 0 + 0 + 0 + .\Src\GestionSon.s + GestionSon.s + 0 + 0 + + + + + Lib + 0 + 0 + 0 + 0 + + 5 + 6 + 5 + 0 + 0 + 0 + .\Src\etat.h + etat.h + 0 + 0 + + + 5 + 7 + 5 + 0 + 0 + 0 + .\Src\etat.inc + etat.inc + 0 + 0 + + + ::CMSIS 0 diff --git a/soft/PjtKEIL_StepSon/StepSon.uvprojx b/soft/PjtKEIL_StepSon/StepSon.uvprojx index d0b5c10..23ec7cd 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 @@ -410,6 +410,36 @@ + + Son + + + bruitverre.asm + 2 + .\Src\bruitverre.asm + + + GestionSon.s + 2 + .\Src\GestionSon.s + + + + + Lib + + + etat.h + 5 + .\Src\etat.h + + + etat.inc + 5 + .\Src\etat.inc + + + ::CMSIS @@ -419,7 +449,7 @@ CibleSondeKEIL 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -819,6 +849,36 @@ + + Son + + + bruitverre.asm + 2 + .\Src\bruitverre.asm + + + GestionSon.s + 2 + .\Src\GestionSon.s + + + + + Lib + + + etat.h + 5 + .\Src\etat.h + + + etat.inc + 5 + .\Src\etat.inc + + + ::CMSIS @@ -897,7 +957,7 @@ CibleSondeST 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -1297,6 +1357,36 @@ + + Son + + + bruitverre.asm + 2 + .\Src\bruitverre.asm + + + GestionSon.s + 2 + .\Src\GestionSon.s + + + + + Lib + + + etat.h + 5 + .\Src\etat.h + + + etat.inc + 5 + .\Src\etat.inc + + + ::CMSIS @@ -1322,12 +1412,7 @@ - <Project Info> - - - - - + StepSon 0 1