dutems/chti23
1
0
Fork 0
forked from acco/chti23
Code Issues Pull requests Releases Wiki Activity

fintp4

Browse source
This commit is contained in:
Alan Dutems 2023-04-11 18:19:40 +02:00
parent 66b712c46a
commit 95aeccd4b4
4 changed files with 87 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

37
soft/PjtKEIL_StepSon/Src/GestionSon.s
View file

@ -1,6 +1,6 @@
PRESERVE8 PRESERVE8
THUMB THUMB
include ../Driver/DriverJeuLaser.inc include ../Driver/DriverJeuLaser.inc;
; ====================== zone de réservation de données, ====================================== ; ====================== zone de réservation de données, ======================================
;Section RAM (read only) : ;Section RAM (read only) :
@ -10,7 +10,7 @@
;Section RAM (read write): ;Section RAM (read write):
area maram,data,readwrite area maram,data,readwrite
index dcd 5512 index dcd 0
SortieSon dcw 0 SortieSon dcw 0
export index export index
@ -39,30 +39,45 @@ Callbackson
ldr r2, =index ldr r2, =index
ldr r1, [r2] ldr r1, [r2]
ldr r0, =Son
ldr r3, =LongueurSon ldr r3, =LongueurSon
ldr r3, [r3]
cmp r1, r3 mov r0, #2
bne Conversion mul r3, r0
mov r0, #0 cmp r3, r1
bhs Conversion
mov r0,#0
b fin
Conversion Conversion
ldr r0, =Son
ldrsh r0, [r0,r1]
add r0, #32768 add r0, #32768
mov r3, #719 mov r3, #719
mul r0, r3 mul r0, r3
mov r3, #65535 mov r3, #65535
udiv r0, r3 udiv r0, r3
add r1, #2
add r1, #1
str r1, [r2] str r1, [r2]
ldr r3, =SortieSon
str r3,[r0]
fin
push{lr, r2, r1, r0}
bl PWM_Set_Value_TIM3_Ch3
pop{lr, r2, r1, r0}
ldr r3, =SortieSon
strh r0,[r3]
bx lr
END END

4
soft/PjtKEIL_StepSon/Src/principal.c
View file

@ -16,7 +16,9 @@ CLOCK_Configure();
Timer_1234_Init_ff(TIM4,6552); Timer_1234_Init_ff(TIM4,6552);
GPIO_Configure(GPIOB, 1, OUTPUT, OUTPUT_PPULL); GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL);
PWM_Init_ff(TIM3, 3, 720);
Active_IT_Debordement_Timer(TIM4, 2, Callbackson); Active_IT_Debordement_Timer(TIM4, 2, Callbackson);

46
soft/PjtKEIL_StepSon/StepSon.uvoptx
View file

@ -153,7 +153,24 @@
<Name>-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)</Name> <Name>-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)</Name>
</SetRegEntry> </SetRegEntry>
</TargetDriverDllRegistry> </TargetDriverDllRegistry>
<Breakpoint/> <Breakpoint>
<Bp>
<Number>0</Number>
<Type>0</Type>
<LineNumber>51</LineNumber>
<EnabledFlag>1</EnabledFlag>
<Address>134220556</Address>
<ByteObject>0</ByteObject>
<HtxType>0</HtxType>
<ManyObjects>0</ManyObjects>
<SizeOfObject>0</SizeOfObject>
<BreakByAccess>0</BreakByAccess>
<BreakIfRCount>1</BreakIfRCount>
<Filename>.\Src\GestionSon.s</Filename>
<ExecCommand></ExecCommand>
<Expression>\\StepSon\Src/GestionSon.s\51</Expression>
</Bp>
</Breakpoint>
<Tracepoint> <Tracepoint>
<THDelay>0</THDelay> <THDelay>0</THDelay>
</Tracepoint> </Tracepoint>
@ -174,7 +191,7 @@
<AscS3>0</AscS3> <AscS3>0</AscS3>
<aSer3>0</aSer3> <aSer3>0</aSer3>
<eProf>0</eProf> <eProf>0</eProf>
<aLa>0</aLa> <aLa>1</aLa>
<aPa1>0</aPa1> <aPa1>0</aPa1>
<AscS4>0</AscS4> <AscS4>0</AscS4>
<aSer4>0</aSer4> <aSer4>0</aSer4>
@ -199,8 +216,13 @@
<LogicAnalyzers> <LogicAnalyzers>
<Wi> <Wi>
<IntNumber>0</IntNumber> <IntNumber>0</IntNumber>
<FirstString>((portb &amp; 0x00000002) &gt;&gt; 1 &amp; 0x2) &gt;&gt; 1</FirstString> <FirstString>`SortieSon</FirstString>
<SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028706F7274622026203078303030303030303229203E3E2031000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F160000000000000000000000000000000000000096020008</SecondString> <SecondString>008000000000000000000000000000000000894000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000E03F1600000000000000000000000000000000000000080A0008</SecondString>
</Wi>
<Wi>
<IntNumber>1</IntNumber>
<FirstString>((portb &amp; 0x00000001) &amp; 0x1) &gt;&gt; 0</FirstString>
<SecondString>00800000000000000000000000000000E0FFEF400100000000000000000000000000000028706F72746220262030783030303030303031290000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000002000000000000000000E03F1600000000000000000000000000000000000000B40A0008</SecondString>
</Wi> </Wi>
</LogicAnalyzers> </LogicAnalyzers>
<DebugDescription> <DebugDescription>
@ -636,6 +658,18 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File>
<GroupNumber>1</GroupNumber>
<FileNumber>3</FileNumber>
<FileType>2</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Src\bruitverre.asm</PathWithFileName>
<FilenameWithoutPath>bruitverre.asm</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group> </Group>
<Group> <Group>
@ -646,7 +680,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>2</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>3</FileNumber> <FileNumber>4</FileNumber>
<FileType>2</FileType> <FileType>2</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -666,7 +700,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>3</GroupNumber> <GroupNumber>3</GroupNumber>
<FileNumber>4</FileNumber> <FileNumber>5</FileNumber>
<FileType>4</FileType> <FileType>4</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>

15
soft/PjtKEIL_StepSon/StepSon.uvprojx
View file

@ -393,6 +393,11 @@
<FileType>2</FileType> <FileType>2</FileType>
<FilePath>.\Src\GestionSon.s</FilePath> <FilePath>.\Src\GestionSon.s</FilePath>
</File> </File>
<File>
<FileName>bruitverre.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\bruitverre.asm</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -807,6 +812,11 @@
<FileType>2</FileType> <FileType>2</FileType>
<FilePath>.\Src\GestionSon.s</FilePath> <FilePath>.\Src\GestionSon.s</FilePath>
</File> </File>
<File>
<FileName>bruitverre.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\bruitverre.asm</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -1290,6 +1300,11 @@
<FileType>2</FileType> <FileType>2</FileType>
<FilePath>.\Src\GestionSon.s</FilePath> <FilePath>.\Src\GestionSon.s</FilePath>
</File> </File>
<File>
<FileName>bruitverre.asm</FileName>
<FileType>2</FileType>
<FilePath>.\Src\bruitverre.asm</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>