From 37906fbfd88fee2d376fa51628231410b72d98b5 Mon Sep 17 00:00:00 2001 From: Clement Mauperon <47110246+tensaiji@users.noreply.github.com> Date: Wed, 15 Mar 2023 17:39:41 +0100 Subject: [PATCH] KEIL Step 1 --- soft/PjtKEIL_StepDeb_1/BacASable.uvoptx | 68 +++++++++++++++++++++--- soft/PjtKEIL_StepDeb_1/BacASable.uvprojx | 11 ++-- soft/PjtKEIL_StepDeb_1/Src/Delay.s | 22 ++++---- soft/PjtKEIL_StepDeb_1/periode.txt | 6 +++ 4 files changed, 82 insertions(+), 25 deletions(-) create mode 100644 soft/PjtKEIL_StepDeb_1/periode.txt diff --git a/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx b/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx index ed76561..6031a0f 100644 --- a/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx +++ b/soft/PjtKEIL_StepDeb_1/BacASable.uvoptx @@ -10,7 +10,7 @@ *.s*; *.src; *.a* *.obj; *.o *.lib - *.txt; *.h; *.inc + *.txt; *.h; *.inc; *.md *.plm *.cpp 0 @@ -75,7 +75,7 @@ 1 0 - 1 + 0 18 @@ -154,6 +154,26 @@ + + + 0 + 1 + Delay_100ms + + + 1 + 1 + VarTime,0x0A + + + + + 1 + 257 + 0x20000000 + 0 + + 0 @@ -174,7 +194,7 @@ 0 0 0 - 0 + 1 0 0 0 @@ -196,6 +216,18 @@ + + + 0 + ((portb & 0x00000002) >> 1 & 0x2) >> 1 + FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1300000000000000000000000000000000000000DC030008 + + + 1 + `VarTime + 0000800000000000000000000000000080842E410000000000000000000000000000000056617254696D65000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1300000000000000000000000000000000000000D6030008 + + 1 0 @@ -260,7 +292,7 @@ 1 0 - 0 + 1 18 @@ -338,12 +370,36 @@ -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 + 44 + 1 +
134218704
+ 0 + 0 + 0 + 0 + 0 + 1 + .\Src\Delay.s + + \\BacASable\Src/Delay.s\44 +
+
+ + + 0 + 1 + VarTime + + 1 257 - r0 + 0x20000000 0 diff --git a/soft/PjtKEIL_StepDeb_1/BacASable.uvprojx b/soft/PjtKEIL_StepDeb_1/BacASable.uvprojx index 9c192f5..44dfd58 100644 --- a/soft/PjtKEIL_StepDeb_1/BacASable.uvprojx +++ b/soft/PjtKEIL_StepDeb_1/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 @@ -424,7 +424,7 @@ CibleSondeKEIL 0x4 ARM-ADS - 5060750::V5.06 update 6 (build 750)::.\ARMCC + 5060960::V5.06 update 7 (build 960)::.\ARMCC 0 @@ -907,7 +907,7 @@ CibleSondeST 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_1/Src/Delay.s b/soft/PjtKEIL_StepDeb_1/Src/Delay.s index bf49175..a52e82c 100644 --- a/soft/PjtKEIL_StepDeb_1/Src/Delay.s +++ b/soft/PjtKEIL_StepDeb_1/Src/Delay.s @@ -10,17 +10,17 @@ ;Section RAM (read write): area maram,data,readwrite -VarTime dcd 0 +VarTime dcd 0 ; int VarTime = 0; ; =============================================================================================== ;constantes (équivalent du #define en C) -TimeValue equ 900000 +TimeValue equ 900000 ; const int TimeValue = 900000; EXPORT Delay_100ms ; la fonction Delay_100ms est rendue publique donc utilisable par d'autres modules. - + EXPORT VarTime ;Section ROM code (read only) : area moncode,code,readonly @@ -41,19 +41,19 @@ TimeValue equ 900000 Delay_100ms proc - ldr r0,=VarTime + ldr r0,=VarTime ; r0 = &VarTime - ldr r1,=TimeValue - str r1,[r0] + ldr r1,=TimeValue ; r1 = TimeValue + str r1,[r0] ; *VarTime = TimeValue BoucleTempo - ldr r1,[r0] + ldr r1,[r0] ; r1 = &VarTime - subs r1,#1 - str r1,[r0] - bne BoucleTempo + subs r1,#1 ; *r1 -= 1 + str r1,[r0] ; *VarTime = r1 + bne BoucleTempo ; if (*VarTime != 0) BoucleTempo() - bx lr + bx lr ; return endp diff --git a/soft/PjtKEIL_StepDeb_1/periode.txt b/soft/PjtKEIL_StepDeb_1/periode.txt new file mode 100644 index 0000000..dcb2a2a --- /dev/null +++ b/soft/PjtKEIL_StepDeb_1/periode.txt @@ -0,0 +1,6 @@ +t1 = 0.10025057 s +t2 = 0.30025125 s + +P ~= 200ms + +Oscillo : 225.01ms \ No newline at end of file