INSA/boat-project
1
0
Fork 0
mirror of https://git.etud.insa-toulouse.fr/boujon/voilier-team-1.git synced 2025-06-08 16:00:49 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Controle Voile et Debug PWM channel

Browse source
This commit is contained in:
Simon Paris 2023-04-13 13:27:48 +02:00
parent 8793ad9d28
commit 18e312d6c5
4 changed files with 17 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
implementation/girouette.c
View file

@ -2,7 +2,7 @@
void MyGirouette_Init(TIM_TypeDef *TIMX) void MyGirouette_Init(TIM_TypeDef *TIMX)
{ {
RCC->APB1ENR |=RCC_APB1ENR_TIM4EN;
//configuration gpiob6 et gpiob7 en entrées In_Floating imposer par le timer4 //configuration gpiob6 et gpiob7 en entrées In_Floating imposer par le timer4
MyGPIO_Struct_TypeDef MyGPIO={GPIOB,6,In_Floating}; MyGPIO_Struct_TypeDef MyGPIO={GPIOB,6,In_Floating};
MyGPIO_Init(&MyGPIO); MyGPIO_Init(&MyGPIO);

6
implementation/servo.c
View file

@ -13,8 +13,8 @@ void MyServo_Init(void)
MyTimer_Base_Init(&Timer); MyTimer_Base_Init(&Timer);
//Pin Timer 2 Channel 1 PA0 //Pin Timer 2 Channel 1 PA0
MyTimer_PWM(TIM2, 1); MyTimer_PWM(TIM2, 2);
MyTimer_DutyCycle(TIM2, 1, 750); MyTimer_DutyCycle(TIM2, 2, 750);
MyTimer_Base_Start(Timer); MyTimer_Base_Start(Timer);
} }
@ -26,5 +26,5 @@ void MyServo_ChangeAngle(uint8_t Angle)
int DC = 500 + (Angle * 500 / 180); int DC = 500 + (Angle * 500 / 180);
MyTimer_DutyCycle(TIM2, 1, DC); MyTimer_DutyCycle(TIM2, 2, DC);
} }

6
keilproject/Source/Principale.c
View file

@ -25,11 +25,15 @@ int main (void)
MyServo_ChangeAngle(90); MyServo_ChangeAngle(90);
//MyRTC_GetTime(&sec, &min, &hour, &day, &date, &month, &year); //MyRTC_GetTime(&sec, &min, &hour, &day, &date, &month, &year);
while(1){ while(1){
Lecture_accelerometre(&GX,&GY,&GZ); Lecture_accelerometre(&GX,&GY,&GZ);
if(GZ < 5.5) if(GZ < 5.5)
{
MyServo_ChangeAngle(179); MyServo_ChangeAngle(179);
}
Angle_Girouette=MyGirouette_Angle(TIM4); Angle_Girouette=MyGirouette_Angle(TIM4);
MyServo_ChangeAngle(Angle_Girouette/4);
}; };
} }
void initImplementation(void) void initImplementation(void)

11
keilproject/voilier.uvoptx
View file

@ -75,7 +75,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>
@ -125,7 +125,7 @@
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
<Key>DLGDARM</Key> <Key>DLGDARM</Key>
<Name>(1010=752,272,1128,829,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=429,109,850,536,0)(121=247,294,668,721,0)(122=875,109,1296,536,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=123,134,717,885,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name> <Name>(1010=752,272,1128,829,0)(1007=-1,-1,-1,-1,0)(1008=-1,-1,-1,-1,0)(1009=-1,-1,-1,-1,0)(100=-1,-1,-1,-1,0)(110=-1,-1,-1,-1,0)(111=-1,-1,-1,-1,0)(1011=-1,-1,-1,-1,0)(180=-1,-1,-1,-1,0)(120=832,432,1253,859,0)(121=247,294,668,721,0)(122=875,109,1296,536,0)(123=-1,-1,-1,-1,0)(140=-1,-1,-1,-1,0)(240=-1,-1,-1,-1,0)(190=-1,-1,-1,-1,0)(200=-1,-1,-1,-1,0)(170=-1,-1,-1,-1,0)(130=-1,-1,-1,-1,0)(131=751,208,1345,959,0)(132=-1,-1,-1,-1,0)(133=235,63,829,814,0)(160=-1,-1,-1,-1,0)(161=-1,-1,-1,-1,0)(162=-1,-1,-1,-1,0)(210=-1,-1,-1,-1,0)(211=-1,-1,-1,-1,0)(220=-1,-1,-1,-1,0)(221=-1,-1,-1,-1,0)(230=-1,-1,-1,-1,0)(234=-1,-1,-1,-1,0)(231=-1,-1,-1,-1,0)(232=-1,-1,-1,-1,0)(233=-1,-1,-1,-1,0)(150=-1,-1,-1,-1,0)(151=-1,-1,-1,-1,0)</Name>
</SetRegEntry> </SetRegEntry>
<SetRegEntry> <SetRegEntry>
<Number>0</Number> <Number>0</Number>
@ -150,6 +150,11 @@
<WinNumber>1</WinNumber> <WinNumber>1</WinNumber>
<ItemText>returnValue</ItemText> <ItemText>returnValue</ItemText>
</Ww> </Ww>
<Ww>
<count>2</count>
<WinNumber>1</WinNumber>
<ItemText>Angle_Girouette</ItemText>
</Ww>
</WatchWindow1> </WatchWindow1>
<Tracepoint> <Tracepoint>
<THDelay>0</THDelay> <THDelay>0</THDelay>
@ -257,7 +262,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>