diff --git a/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx b/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx index fc0185f..f59582b 100644 --- a/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx +++ b/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx @@ -153,7 +153,24 @@ -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 + 56 + 1 +
134218718
+ 0 + 0 + 0 + 0 + 0 + 1 + .\Src\Delay.s + + \\BacASable\Src/Delay.s\56 +
+
0 @@ -215,12 +232,12 @@ 0 ((PORTB & 0x00000002) >> 1 & 0x2) >> 1 - FF0000000000000000000000000000000000F03F0000000000000000000000000000000028504F5254422026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1400000000000000000000000000000000000000B6030008 + FF000000000000000000F03F000000000000F03F0000000000000000000000000000000028504F5254422026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1000000000000000000000000000000000000000B6030008 1 `VarTime - 0080000000000000000000000000000040772B410000000000000000000000000000000056617254696D65000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1400000000000000000000000000000000000000D2030008 + 0080000000000000000000000000000040772B410000000000000000000000000000000056617254696D65000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1000000000000000000000000000000000000000D2030008 diff --git a/soft/PjtKEIL_StepDeb_1/Src/Delay.s b/soft/PjtKEIL_StepDeb_1/Src/Delay.s index 8dbbfbd..a672105 100644 --- a/soft/PjtKEIL_StepDeb_1/Src/Delay.s +++ b/soft/PjtKEIL_StepDeb_1/Src/Delay.s @@ -16,7 +16,7 @@ VarTime dcd 0 ; =============================================================================================== ;constantes (équivalent du #define en C) -TimeValue equ 900000 +TimeValue equ 800000 EXPORT Delay_100ms ; la fonction Delay_100ms est rendue publique donc utilisable par d'autres modules. diff --git a/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx b/soft/PjtKEIL_StepDeb_2/BacASable.uvoptx index f1315bb..c0c92ae 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 @@ -174,7 +174,7 @@ 0 0 0 - 0 + 1 0 0 0 @@ -200,7 +200,12 @@ 0 ((portb & 0x00000002) >> 1 & 0x2) >> 1 - FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F160000000000000000000000000000000000000096020008 + FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F170000000000000000000000000000000000000096020008 + + + 1 + ((PORTB & 0x00000002) >> 1 & 0x2) >> 1 + 00800000000000000000000000000000E0FFEF400000000000000000000000000000000028504F5254422026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1700000000000000000000000000000000000000BC090008 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..c660c4e 100644 --- a/soft/PjtKEIL_StepDeb_2/Src/Cligno.s +++ b/soft/PjtKEIL_StepDeb_2/Src/Cligno.s @@ -1,6 +1,7 @@ PRESERVE8 THUMB - + +include DriverJeuLaser.inc ; ====================== zone de réservation de données, ====================================== ;Section RAM (read only) : @@ -10,21 +11,34 @@ ;Section RAM (read write): area maram,data,readwrite - +FlagCligno dcd 0 ; =============================================================================================== - + EXPORT timer_callback ;Section ROM code (read only) : area moncode,code,readonly ; écrire le code ici - - - - - +timer_callback proc + push lr + mov r0,#1 ; r0 : constant = 1 (arg fonct GPIOB) + ldr r2,=FlagCligno ; r2 : addr de FlagCligno + mov r1,[r2] ; r1 : valeur FlagCligno + cmp r1,#0 + beq FC0 + ; if FlagCligno == 1 + str #0,[r2] + bl GPIOB_Set + b fin + ; if FlagCligno == 0 +FC0 + str r3,[r2] + bl GPIOB_Clear +fin + pop pc + 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..2a0ba63 100644 --- a/soft/PjtKEIL_StepDeb_2/Src/principal.c +++ b/soft/PjtKEIL_StepDeb_2/Src/principal.c @@ -17,8 +17,9 @@ CLOCK_Configure(); // configuration du Timer 4 en débordement 100ms //** Placez votre code là ** // - - + +Timer_1234_Init_ff( TIM4, 7200000 ); + // Activation des interruptions issues du Timer 4 // Association de la fonction à exécuter lors de l'interruption : timer_callback @@ -26,7 +27,7 @@ CLOCK_Configure(); //** Placez votre code là ** // - +Active_IT_Debordement_Timer( TIM4, 2, timer_callback ); // configuration de PortB.1 (PB1) en sortie push-pull GPIO_Configure(GPIOB, 1, OUTPUT, OUTPUT_PPULL); @@ -42,7 +43,7 @@ while (1) } } -char FlagCligno; +/*char FlagCligno; void timer_callback(void) { @@ -57,5 +58,5 @@ void timer_callback(void) GPIOB_Clear(1); } -} +}*/