norgeux/grpE_ROUSSEAU_NORGEUX
2
0
Fork 0
forked from acco/chti23
Code Issues Pull requests Releases Wiki Activity

Call_back_son PWM

Browse source
This commit is contained in:
Firmin Rousseau 2023-04-14 18:24:58 +02:00
parent a917f93b51
commit e36c2144b9
4 changed files with 69 additions and 14 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -1,3 +1,5 @@
import PWM_Set_Value_TIM3_Ch3
PRESERVE8 PRESERVE8
THUMB THUMB
@ -15,6 +17,7 @@
area maram,data,readwrite area maram,data,readwrite
SortieSon dcw 0 SortieSon dcw 0
Index dcw 0 Index dcw 0
@ -45,18 +48,25 @@ timer_callback_son proc
cmp r0, r1 cmp r0, r1
beq fin beq fin
ldr r3,=SortieSon ldr r3,=SortieSon
ldr r2,=Son ldr r2,=Son
ldrsh r1,[r2,r0, lsl #1] ldrsh r1,[r2,r0, lsl #1]
add r1,#32768 add r1,#32768 ; (1<<16)
mov r2, #720 mov r2, #720
mul r1,r2 mul r1,r2
asr r1,#16 asr r1,#16
str r1, [r3]
mov r4, r0
mov r0, r1
bl PWM_Set_Value_TIM3_Ch3
;str r1, [r3] ;Mise à jour sortie son pas PWM
str r0, [r3] ;Mise à jour sortie son PWM
mov r0, r4
mov r3, r0 mov r3, r0
add r3, #1 add r3, #1
str r3, [r4] str r3, [r4]

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

@ -1,5 +1,3 @@
#include "DriverJeuLaser.h" #include "DriverJeuLaser.h"
extern void timer_callback_son(void); extern void timer_callback_son(void);
@ -17,6 +15,19 @@ CLOCK_Configure();
// configuration du Timer 4 en débordement 91 microsecondes // configuration du Timer 4 en débordement 91 microsecondes
Timer_1234_Init_ff( TIM4, 91*72); Timer_1234_Init_ff( TIM4, 91*72);
Timer_1234_Init_ff( TIM3, 91*72);
int Periode_ticks = 720;
PWM_Init_ff(TIM3, 3, Periode_ticks);
/* Calcul fPWM */
int fPWM ;
fPWM = (1/Periode_ticks)*72000000 ;
GPIO_Configure(GPIOB, 0, OUTPUT, ALT_PPULL);
Active_IT_Debordement_Timer( TIM4, 2, timer_callback_son ); Active_IT_Debordement_Timer( TIM4, 2, timer_callback_son );

35
soft/PjtKEIL_StepSon/StepSon.uvoptx
View file

@ -75,7 +75,7 @@
<OPTFL> <OPTFL>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>1</IsCurrentTarget> <IsCurrentTarget>0</IsCurrentTarget>
</OPTFL> </OPTFL>
<CpuCode>18</CpuCode> <CpuCode>18</CpuCode>
<DebugOpt> <DebugOpt>
@ -154,11 +154,18 @@
</SetRegEntry> </SetRegEntry>
</TargetDriverDllRegistry> </TargetDriverDllRegistry>
<Breakpoint/> <Breakpoint/>
<WatchWindow1>
<Ww>
<count>0</count>
<WinNumber>1</WinNumber>
<ItemText>SortieSon</ItemText>
</Ww>
</WatchWindow1>
<MemoryWindow1> <MemoryWindow1>
<Mm> <Mm>
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<SubType>265</SubType> <SubType>265</SubType>
<ItemText>r3</ItemText> <ItemText>&amp;SortieSon</ItemText>
<AccSizeX>0</AccSizeX> <AccSizeX>0</AccSizeX>
</Mm> </Mm>
</MemoryWindow1> </MemoryWindow1>
@ -207,8 +214,8 @@
<LogicAnalyzers> <LogicAnalyzers>
<Wi> <Wi>
<IntNumber>0</IntNumber> <IntNumber>0</IntNumber>
<FirstString>`SortieSon</FirstString> <FirstString>(SortieSon &amp; 0xFFFF) &gt;&gt; 0</FirstString>
<SecondString>008000000000000000000000000000000080864000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000F00000001000000000000000000F03F0D00000000000000000000000000000000000000AE080008</SecondString> <SecondString>008000000000000000000000000000000000894000000000000000000000000000000000536F72746965536F6E00000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000700000001000000000000000000F03F1400000000000000000000000000000000000000AE080008</SecondString>
</Wi> </Wi>
</LogicAnalyzers> </LogicAnalyzers>
<DebugDescription> <DebugDescription>
@ -275,7 +282,7 @@
<OPTFL> <OPTFL>
<tvExp>1</tvExp> <tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget> <IsCurrentTarget>1</IsCurrentTarget>
</OPTFL> </OPTFL>
<CpuCode>18</CpuCode> <CpuCode>18</CpuCode>
<DebugOpt> <DebugOpt>
@ -382,7 +389,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>
@ -672,6 +679,18 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<bShared>0</bShared> <bShared>0</bShared>
</File> </File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>4</FileNumber>
<FileType>5</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>.\Driver\DriverJeuLaser.inc</PathWithFileName>
<FilenameWithoutPath>DriverJeuLaser.inc</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group> </Group>
<Group> <Group>
@ -682,7 +701,7 @@
<RteFlg>0</RteFlg> <RteFlg>0</RteFlg>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>4</FileNumber> <FileNumber>5</FileNumber>
<FileType>2</FileType> <FileType>2</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
@ -694,7 +713,7 @@
</File> </File>
<File> <File>
<GroupNumber>4</GroupNumber> <GroupNumber>4</GroupNumber>
<FileNumber>5</FileNumber> <FileNumber>6</FileNumber>
<FileType>2</FileType> <FileType>2</FileType>
<tvExp>0</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>

17
soft/PjtKEIL_StepSon/StepSon.uvprojx
View file

@ -408,6 +408,11 @@
<FileType>4</FileType> <FileType>4</FileType>
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath> <FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
</File> </File>
<File>
<FileName>DriverJeuLaser.inc</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\DriverJeuLaser.inc</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -434,7 +439,7 @@
<TargetName>CibleSondeKEIL</TargetName> <TargetName>CibleSondeKEIL</TargetName>
<ToolsetNumber>0x4</ToolsetNumber> <ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName> <ToolsetName>ARM-ADS</ToolsetName>
<pCCUsed>5060750::V5.06 update 6 (build 750)::.\ARMCC</pCCUsed> <pCCUsed>5060960::V5.06 update 7 (build 960)::.\ARMCC</pCCUsed>
<uAC6>0</uAC6> <uAC6>0</uAC6>
<TargetOption> <TargetOption>
<TargetCommonOption> <TargetCommonOption>
@ -832,6 +837,11 @@
<FileType>4</FileType> <FileType>4</FileType>
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath> <FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
</File> </File>
<File>
<FileName>DriverJeuLaser.inc</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\DriverJeuLaser.inc</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>
@ -1325,6 +1335,11 @@
<FileType>4</FileType> <FileType>4</FileType>
<FilePath>.\Driver\DriverJeuLaser.lib</FilePath> <FilePath>.\Driver\DriverJeuLaser.lib</FilePath>
</File> </File>
<File>
<FileName>DriverJeuLaser.inc</FileName>
<FileType>5</FileType>
<FilePath>.\Driver\DriverJeuLaser.inc</FilePath>
</File>
</Files> </Files>
</Group> </Group>
<Group> <Group>