marce/Voilier
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Compare commits

base: marce:master
Branches Tags
marce:master
marce:Girouette
marce:feature-ADC
marce:feature-branch
..
compare: marce:Girouette
Branches Tags
marce:master
marce:Girouette
marce:feature-ADC
marce:feature-branch

1 commit
master ... Girouette

Author SHA1 Message Date
Your Name
da6f8a6b34 timer encoder 2023-04-11 15:31:47 +02:00
17 changed files with 234 additions and 448 deletions
Show stats Expand all files Collapse all files

1
Drivers/Include/Driver_GPIO.h
View file

@ -9,7 +9,6 @@ char GPIO_Pin ; //numero de 0 a 15
char GPIO_Conf ; // voir ci dessous
} MyGPIO_Struct_TypeDef ;
#define Out_PullUp 0x01
#define In_Floating 0x4
#define In_PullDown 0x8
#define In_PullUp 0x8

37
Drivers/Sources/Driver_ADC.c
View file

@ -2,29 +2,29 @@
#include "Driver_GPIO.h"
void (*PtrfctADC)(void); /* Déclaration du pointeur de fonction ADC pour l'interrupt */
void (*PtrfctADC)(void); //Déclaration du pointeur de fonction ADC
//---------------------INIT-------------------//
void MyADC_Base_Init(MyADC_Struct_TypeDef * ADC){
MyGPIO_Struct_TypeDef * GPIO_ADC; /* Déclaration du GPIO lié à l'ADC */
MyGPIO_Struct_TypeDef * GPIO_ADC; //Déclaration du GPIO de l'ADC
RCC->CFGR |= RCC_CFGR_ADCPRE_DIV6; /*Division par 6 de la clock (72MHz) pour l'ADC (12MHz) car clock max ADC : 14MHz */
RCC->APB2ENR |= RCC_APB2ENR_ADC1EN; /* Start clock de l'ADC1 */
RCC->CFGR |= RCC_CFGR_ADCPRE_DIV6; //Division par 6 de la clock (72MHz) pour l'ADC (12MHz)
RCC->APB2ENR |= RCC_APB2ENR_ADC1EN; //Start clock ADC1
GPIO_ADC->GPIO = GPIOC; /* Initialisation du GPIO lié à l'ADC */
GPIO_ADC->GPIO = GPIOC; //Initialisation du GPIO de l'ADC
GPIO_ADC->GPIO_Conf = In_Analog;
GPIO_ADC->GPIO_Pin = 0;
MyGPIO_Init(GPIO_ADC);
ADC1->SQR1 &= ADC_SQR1_L; /* Fixation du nombre de conversion à 1 */
ADC1->SQR3|= ADC->Channel; /* Choix de la voie à convertir */
ADC1->CR2 |= ADC_CR2_EXTTRIG; /* Activation du trigger externe */
ADC1->CR2 |= ADC_CR2_EXTSEL; /* event externe choisis : SWSTART */
ADC1->SQR1 &= ADC_SQR1_L; //fixe le nombre de conversion à 1
ADC1->SQR3|= ADC->Channel; //indique la voie à convertir
ADC1->CR2 |= ADC_CR2_EXTTRIG; //activation du trigger externe
ADC1->CR2 |= ADC_CR2_EXTSEL; //event externe choisis : SWSTART
MyADC_Base_Start(ADC->ADC); /* Sart ADC1 et Horloge ADC1 */
MyADC_Base_Start(ADC->ADC); //Sart ADC1 et Horloge ADC1
}
@ -36,25 +36,26 @@ void MyADC_Base_Start(ADC_TypeDef * ADC){
//------------------INTERRUPTION--------------//
void MyADC_Base_Interuption(ADC_TypeDef * ADC){
/* Activation du trigger externe */
ADC->CR1 |= ADC_CR1_EOCIE; /* Interruption de l'ADC autorisée */
NVIC->ISER[0] |= (0x1<<ADC1_2_IRQn); /* Interruption active au niveau NVIC */
NVIC->IP[ADC1_2_IRQn] |= 1<<4; /* Affectation du niveau de priorité */
//Activation du trigger externe
ADC->CR1 |= ADC_CR1_EOCIE; //Interruption de l'ADC autorisée
NVIC->ISER[0] |= (0x1<<ADC1_2_IRQn); //Interruption active au niveau NVIC
NVIC->IP[ADC1_2_IRQn] |= 1<<4; //Affectation du niveau de priorité
}
//--------------------HANDLER-----------------//
void ADC1_2_IRQHandler (void) {
(*PtrfctADC)(); /* Appel de la fonction pointée par le pointeur fonction ADC */
(*PtrfctADC)(); //Appel de la fonction pointée par le pointeur fonction ADC
MyADC_Base_Start(ADC1);
ADC1->SR &= ~ADC_SR_EOC; /* RAZ du flag de fin de conversion */
ADC1->SR &= ~ADC_SR_EOC; //RAZ du flag end of conversion
}
//--------------------DATA--------------------//
int MyADC_Base_Result (MyADC_Struct_TypeDef * ADC){
return ADC1->DR & ~((0x0F)<<12); /* Récuperation du résultat de la conversion de l'ADC */
return ADC1->DR & ~((0x0F)<<12); //Retour de la conversion de l'ADC
}
//-------------------POINTEUR-----------------//
void MyADC_Init_Periph (void (*fct)(void)){
PtrfctADC=fct; /* Affectation du pointeur de fonction ADC */
PtrfctADC=fct; //Affectation du pointeur de fonction ADC
}

13
Drivers/Sources/Driver_GPIO.c
View file

@ -5,7 +5,7 @@
void MyGPIO_Init ( MyGPIO_Struct_TypeDef * GPIOStructPtr )
{
/* Activation de la clock liée au GPIO sélectionné */
/* Activation of the GPIO port specific clock */
if (GPIOStructPtr->GPIO == GPIOA)
{
RCC->APB2ENR |= RCC_APB2ENR_IOPAEN;
@ -24,7 +24,7 @@ void MyGPIO_Init ( MyGPIO_Struct_TypeDef * GPIOStructPtr )
}
/* Reset & configuration de la pin avec le mode adéquat */
/* Reset, and then configuration writing of the selected GPIO Pin */
if(GPIOStructPtr->GPIO_Pin <= 8)
{
GPIOStructPtr->GPIO->CRL &= ~0xF<<(4*(GPIOStructPtr->GPIO_Pin));
@ -36,7 +36,6 @@ void MyGPIO_Init ( MyGPIO_Struct_TypeDef * GPIOStructPtr )
GPIOStructPtr->GPIO->CRH |= (GPIOStructPtr->GPIO_Conf)<<(4*((GPIOStructPtr->GPIO_Pin)%8));
}
/* Ecriture de l'ODR pour choisir entre pulldown & pushpull*/
if(GPIOStructPtr->GPIO_Conf == (char)In_PullDown)
{
GPIOStructPtr->GPIO->ODR &= ~(0x1<<(GPIOStructPtr->GPIO_Pin));
@ -50,8 +49,7 @@ void MyGPIO_Init ( MyGPIO_Struct_TypeDef * GPIOStructPtr )
//----------------------------READ--------------------------//
int MyGPIO_Read ( GPIO_TypeDef * GPIO , char GPIO_Pin ){
int etatbit;
/* Verification de la valeur de l'IDR */
//On vérifie si la valeur lue dans l'IDR est un 0 ou un 1
if((GPIO->IDR & (1<<GPIO_Pin))!=0){
etatbit = 1;
}
@ -63,16 +61,13 @@ int MyGPIO_Read ( GPIO_TypeDef * GPIO , char GPIO_Pin ){
//---------------------SET-------------------//
void MyGPIO_Set ( GPIO_TypeDef * GPIO , char GPIO_Pin ){
/*Ecriture du 1 sur le numéro de la pin dans le registre BSRR*/
GPIO->BSRR |= (1 << GPIO_Pin);
}
//---------------------RESET-----------------//
void MyGPIO_Reset ( GPIO_TypeDef * GPIO , char GPIO_Pin ){
/*Ecriture du 1 sur le numéro de la pin dans le registre BRR*/
GPIO->BRR = (1 << GPIO_Pin);
//Pas besoin de | puisque les 0 n'impactent pas la fonction reset
}
//---------------------TOGGLE-----------------//

18
Drivers/Sources/Driver_Timer.c
View file

@ -2,8 +2,6 @@
//-----------------------INITIALISATION TIMER---------------------//
void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer){
/* Activation de la clock liée au TIMER sélectionné */
if(Timer->Timer == TIM1){
//RCC->APB2ENR |= 0x0001<<11;
RCC->APB2ENR |= RCC_APB2ENR_TIM1EN;
@ -21,7 +19,6 @@ void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer){
RCC->APB1ENR |= RCC_APB1ENR_TIM4EN;
}
/* Load des valeurs de l'ARR et du PSC pour définir la période de comptage du TIMER et sa limite*/
Timer->Timer->ARR = Timer->ARR;
Timer->Timer->PSC = Timer->PSC;
@ -30,21 +27,20 @@ void MyTimer_Base_Init(MyTimer_Struct_TypeDef * Timer){
//-----------------------START----------------------//
void MyTimer_Base_Start(TIM_TypeDef * Timer){
Timer->CR1 |= TIM_CR1_CEN; //* Masque OU pour placer un 1 décalé avec des 0 */
Timer->CR1 |= TIM_CR1_CEN; //Masque OU pour placer un 1 décalé avec des 0
}
//------------------------STOP----------------------//
void MyTimer_Base_Stop(TIM_TypeDef * Timer){
Timer->CR1 |= ~TIM_CR1_CEN; /* Masque ET pour placer un 0 décalé avec des 1 (~) */
Timer->CR1 |= ~TIM_CR1_CEN; //Masque ET pour placer un 0 décalé avec des 1 (~)
}
void MyTimer_PWM( MyTimer_Struct_TypeDef * Timer, uint16_t cycle){
Timer->Timer->CCMR1 &= ~TIM_CCMR1_OC1M_0; //Configuration du canal CH1
Timer->Timer->CCMR1 |= TIM_CCMR1_OC1M_1| TIM_CCMR1_OC1M_2; // Ajouter 110 aux bits OC1M (registre CCMR1)
Timer->Timer->CCMR1 &= ~TIM_CCMR1_OC1M_0; /* Configuration du canal CH1 */
Timer->Timer->CCMR1 |= TIM_CCMR1_OC1M_1| TIM_CCMR1_OC1M_2; /* Ajouter 110 aux bits OC1M (registre CCMR1) */
Timer->Timer->CCER |= TIM_CCER_CC1E; /* Canal CH1 validé par bit CC1E (registre CCER) */
Timer->Timer->CR1 |= TIM_CR1_CEN; /* Lancement du timer */
Timer->Timer->CCR1 = (cycle * Timer->ARR) / 100; /* Fixer la durée à 20% */
Timer->Timer->CCER |= TIM_CCER_CC1E; // Canal CH1 validé par bit CC1E (registre CCER)
Timer->Timer->CR1 |= TIM_CR1_CEN; // Lancement du timer
Timer->Timer->CCR1 = (cycle * Timer->ARR) / 100; // Fixer la durée à 20%
}

38
Drivers/Voilier_fonction/Girouette.c
View file

@ -1 +1,39 @@
#include "Girouette.h"
#include "Driver_ADC.h"
#include "Driver_Timer.h"
#include "Driver_GPIO.h"
void init_encoder_timer (void){
//Déclaration du Timer et de ses GPIO
MyGPIO_Struct_TypeDef * GPIO_PB6;
MyGPIO_Struct_TypeDef * GPIO_PB7;
MyTimer_Struct_TypeDef * Encoder_Timer;
//Parametrage des GPIO
GPIO_PB6->GPIO = GPIOB;
GPIO_PB6->GPIO_Conf = In_Floating;
GPIO_PB6->GPIO_Pin = 6;
MyGPIO_Init(GPIO_PB6);
GPIO_PB7->GPIO = GPIOB;
GPIO_PB7->GPIO_Conf = In_Floating;
GPIO_PB7->GPIO_Pin = 7;
MyGPIO_Init(GPIO_PB7);
//Parametrage du Timer
Encoder_Timer->Timer = TIM4;
Encoder_Timer->ARR = 400; //ARR doit être supérieur à 360° puisque la RAZ du Timer se fait au tour complet de la girouette
Encoder_Timer->PSC = 0; //On ne divise pas la précision de notre mesure
MyTimer_Base_Init(Encoder_Timer);
//Passage du Timer en mode Encoder
TIM4->SMCR &= ~(0x0007);
TIM4->SMCR |= TIM_SMCR_SMS_1;
TIM4->CCMR1 &= ~(0xF2F2);
TIM4->CCMR1 |= TIM_CCMR1_CC1S_0;
TIM4->CCMR1 |= TIM_CCMR1_CC2S_0;
TIM4->CCER &= TIM_CCER_CC1P;
TIM4->CCER &= TIM_CCER_CC2P;
TIM4->CR1 |= TIM_CR1_CEN;
}

3
Drivers/Voilier_fonction/Girouette.h Normal file
View file

@ -0,0 +1,3 @@
void init_encoder_timer (void);

42
Drivers/Voilier_fonction/Plateau.c
View file

@ -1,42 +0,0 @@
#include "Driver_Timer.h"
#include "Driver_UART.h"
#include "Plateau.h"
#include "Driver_GPIO.h"
void Plateau_init(void)
{
MyTimer_Struct_TypeDef Timer;
MyGPIO_Struct_TypeDef Pin_Sens;
Pin_Sens.GPIO=GPIOB;
Pin_Sens.GPIO_Pin=1;
Pin_Sens.GPIO_Conf = Out_PullUp;
//Fréquence
Timer.Timer = TIM3;
Timer.ARR=3599;
Timer.PSC=0;
MyTimer_Base_Init(&Timer);
MyGPIO_Init(&Pin_Sens);
MyTimer_PWM(&Timer, 50);
MyTimer_Base_Start(TIM3);
Plateau_direction(DROITE);
}
void Plateau_direction(uint8_t Sens)
{
if(Sens == DROITE)
MyGPIO_Set(GPIOB,1);
if (Sens == GAUCHE)
MyGPIO_Reset(GPIOB,1);
}

12
Drivers/Voilier_fonction/Plateau.h
View file

@ -1,12 +0,0 @@
#ifndef MYPLATEAU_H
#define MYPLATEAU_H
#include "stm32f10x.h"
#define DROITE 0x1
#define GAUCHE 0x0
void Plateau_init(void);
void Plateau_direction(uint8_t Sens);
#endif

32
Drivers/Voilier_fonction/telecommande.c
View file

@ -1,32 +0,0 @@
#include "telecommande.h"
#include "Driver_GPIO.h"
#include "Plateau.h"
MyUART_Struct_Typedef UART_plateau = {USART1,9600};
void init_telecommande(void)
{
UART_InitGPIO(&UART_plateau);
UART_init(&UART_plateau);
}
void telecommande_plateau (int data)
{
int datar;
UART_send(data);
datar = data;
if(datar >= 0)
Plateau_direction(DROITE);
else
Plateau_direction(GAUCHE);
}
void testRemote(void)
{
UART_send('t');
UART_send('e');
UART_send('s');
UART_send('t');
}

12
Drivers/Voilier_fonction/telecommande.h
View file

@ -1,12 +0,0 @@
#ifndef TELECOMMANDE_H
#define TELECOMMANDE_H
#include "Driver_UART.h"
#include "stm32f10x.h"
void init_telecommande(void);
void telecommande_plateau (int data);
void testRemote(void);
#endif

390
GPIO_Test/GPIO_Test.uvoptx
View file

@ -26,189 +26,7 @@
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<TargetOption>
<CLKADS>8000000</CLKADS>
<OPTTT>
<gFlags>1</gFlags>
<BeepAtEnd>1</BeepAtEnd>
<RunSim>0</RunSim>
<RunTarget>1</RunTarget>
<RunAbUc>0</RunAbUc>
</OPTTT>
<OPTHX>
<HexSelection>1</HexSelection>
<FlashByte>65535</FlashByte>
<HexRangeLowAddress>0</HexRangeLowAddress>
<HexRangeHighAddress>0</HexRangeHighAddress>
<HexOffset>0</HexOffset>
</OPTHX>
<OPTLEX>
<PageWidth>79</PageWidth>
<PageLength>66</PageLength>
<TabStop>8</TabStop>
<ListingPath>.\Listings\</ListingPath>
</OPTLEX>
<ListingPage>
<CreateCListing>1</CreateCListing>
<CreateAListing>1</CreateAListing>
<CreateLListing>1</CreateLListing>
<CreateIListing>0</CreateIListing>
<AsmCond>1</AsmCond>
<AsmSymb>1</AsmSymb>
<AsmXref>0</AsmXref>
<CCond>1</CCond>
<CCode>0</CCode>
<CListInc>0</CListInc>
<CSymb>0</CSymb>
<LinkerCodeListing>0</LinkerCodeListing>
</ListingPage>
<OPTXL>
<LMap>1</LMap>
<LComments>1</LComments>
<LGenerateSymbols>1</LGenerateSymbols>
<LLibSym>1</LLibSym>
<LLines>1</LLines>
<LLocSym>1</LLocSym>
<LPubSym>1</LPubSym>
<LXref>0</LXref>
<LExpSel>0</LExpSel>
</OPTXL>
<OPTFL>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
<uSim>1</uSim>
<uTrg>0</uTrg>
<sLdApp>1</sLdApp>
<sGomain>1</sGomain>
<sRbreak>1</sRbreak>
<sRwatch>1</sRwatch>
<sRmem>1</sRmem>
<sRfunc>1</sRfunc>
<sRbox>1</sRbox>
<tLdApp>1</tLdApp>
<tGomain>1</tGomain>
<tRbreak>1</tRbreak>
<tRwatch>1</tRwatch>
<tRmem>1</tRmem>
<tRfunc>0</tRfunc>
<tRbox>1</tRbox>
<tRtrace>1</tRtrace>
<sRSysVw>1</sRSysVw>
<tRSysVw>1</tRSysVw>
<sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn>
<bSchkAxf>0</bSchkAxf>
<bTchkAxf>0</bTchkAxf>
<nTsel>6</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
<sDlgPa></sDlgPa>
<sIfile></sIfile>
<tDll></tDll>
<tDllPa></tDllPa>
<tDlgDll></tDlgDll>
<tDlgPa></tDlgPa>
<tIfile></tIfile>
<pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
</DebugOpt>
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
<Key>ARMRTXEVENTFLAGS</Key>
<Name>-L70 -Z18 -C0 -M0 -T1</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>DLGDARM</Key>
<Name>(1010=937,133,1313,690,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=1357,482,1778,909,0)(121=1042,189,1463,616,0)(122=546,289,967,716,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=911,135,1505,886,0)(131=997,343,1591,1094,0)(132=-1,-1,-1,-1,0)(133=-1,-1,-1,-1,0)(160=1375,56,1823,470,0)(161=1383,268,1831,682,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=240,283,843,1034,0)(151=-1,-1,-1,-1,0)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>ARMDBGFLAGS</Key>
<Name>-T0</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>ST-LINKIII-KEIL_SWO</Key>
<Name>-U066FFF575256867067031930 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>UL2CM3</Key>
<Name>-U -O206 -S8 -C0 -P00 -N00("") -D00(00000000) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
<aLwin>0</aLwin>
<aCover>0</aCover>
<aSer1>1</aSer1>
<aSer2>0</aSer2>
<aPa>0</aPa>
<viewmode>1</viewmode>
<vrSel>0</vrSel>
<aSym>0</aSym>
<aTbox>0</aTbox>
<AscS1>0</AscS1>
<AscS2>0</AscS2>
<AscS3>0</AscS3>
<aSer3>0</aSer3>
<eProf>0</eProf>
<aLa>0</aLa>
<aPa1>0</aPa1>
<AscS4>0</AscS4>
<aSer4>0</aSer4>
<StkLoc>0</StkLoc>
<TrcWin>0</TrcWin>
<newCpu>0</newCpu>
<uProt>0</uProt>
</DebugFlag>
<LintExecutable></LintExecutable>
<LintConfigFile></LintConfigFile>
<bLintAuto>0</bLintAuto>
<bAutoGenD>0</bAutoGenD>
<LntExFlags>0</LntExFlags>
<pMisraName></pMisraName>
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
<pMisraNamep></pMisraNamep>
<pszMrulep></pszMrulep>
<pSingCmdsp></pSingCmdsp>
<pMultCmdsp></pMultCmdsp>
<LogicAnalyzers>
<Wi>
<IntNumber>0</IntNumber>
<FirstString>((PORTA &amp; 0x00000020) &gt;&gt; 5 &amp; 0x20) &gt;&gt; 5</FirstString>
<SecondString>FF000000000000000000000000000000E0FFEF400100000000000000000000000000000028504F5254412026203078303030303030323029203E3E2035000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000000100000001000000000000000000F03F1700000000000000000000000000000000000000DA040008</SecondString>
</Wi>
</LogicAnalyzers>
<DebugDescription>
<Enable>1</Enable>
<EnableFlashSeq>0</EnableFlashSeq>
<EnableLog>0</EnableLog>
<Protocol>2</Protocol>
<DbgClock>10000000</DbgClock>
</DebugDescription>
</TargetOption>
</Target>
<Target>
<TargetName>cible</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<TargetOption>
<CLKADS>8000000</CLKADS>
<CLKADS>12000000</CLKADS>
<OPTTT>
<gFlags>1</gFlags>
<BeepAtEnd>1</BeepAtEnd>
@ -285,7 +103,7 @@
<bEvRecOn>1</bEvRecOn>
<bSchkAxf>0</bSchkAxf>
<bTchkAxf>0</bTchkAxf>
<nTsel>6</nTsel>
<nTsel>0</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
@ -296,38 +114,13 @@
<tDlgDll></tDlgDll>
<tDlgPa></tDlgPa>
<tIfile></tIfile>
<pMon>STLink\ST-LINKIII-KEIL_SWO.dll</pMon>
<pMon>BIN\UL2CM3.DLL</pMon>
</DebugOpt>
<TargetDriverDllRegistry>
<SetRegEntry>
<Number>0</Number>
<Key>ARMRTXEVENTFLAGS</Key>
<Name>-L70 -Z18 -C0 -M0 -T1</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>DLGTARM</Key>
<Name>(1010=-1,-1,-1,-1,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=-1,-1,-1,-1,0)(121=-1,-1,-1,-1,0)(122=-1,-1,-1,-1,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=-1,-1,-1,-1,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)(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>
<Number>0</Number>
<Key>ARMDBGFLAGS</Key>
<Name></Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>DLGUARM</Key>
<Name>(105=-1,-1,-1,-1,0)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>ST-LINKIII-KEIL_SWO</Key>
<Name>-U066FFF575256867067031930 -O206 -SF10000 -C0 -A0 -I0 -HNlocalhost -HP7184 -P1 -N00("ARM CoreSight SW-DP (ARM Core") -D00(1BA01477) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
</SetRegEntry>
<SetRegEntry>
<Number>0</Number>
<Key>UL2CM3</Key>
<Name>-U -O206 -S8 -C0 -P00 -N00("") -D00(00000000) -L00(0) -TO65554 -TC10000000 -TT10000000 -TP21 -TDS8007 -TDT0 -TDC1F -TIEFFFFFFFF -TIP8 -FO7 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128.FLM -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM)</Name>
<Name>UL2CM3(-S0 -C0 -P0 -FD20000000 -FC1000 -FN1 -FF0STM32F10x_128 -FS08000000 -FL020000 -FP0($$Device:STM32F103RB$Flash\STM32F10x_128.FLM))</Name>
</SetRegEntry>
</TargetDriverDllRegistry>
<Breakpoint/>
@ -336,13 +129,13 @@
</Tracepoint>
<DebugFlag>
<trace>0</trace>
<periodic>1</periodic>
<periodic>0</periodic>
<aLwin>0</aLwin>
<aCover>0</aCover>
<aSer1>1</aSer1>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
<aPa>0</aPa>
<viewmode>1</viewmode>
<viewmode>0</viewmode>
<vrSel>0</vrSel>
<aSym>0</aSym>
<aTbox>0</aTbox>
@ -375,7 +168,7 @@
<pMultCmdsp></pMultCmdsp>
<DebugDescription>
<Enable>1</Enable>
<EnableFlashSeq>0</EnableFlashSeq>
<EnableFlashSeq>1</EnableFlashSeq>
<EnableLog>0</EnableLog>
<Protocol>2</Protocol>
<DbgClock>10000000</DbgClock>
@ -383,6 +176,147 @@
</TargetOption>
</Target>
<Target>
<TargetName>cible</TargetName>
<ToolsetNumber>0x4</ToolsetNumber>
<ToolsetName>ARM-ADS</ToolsetName>
<TargetOption>
<CLKADS>12000000</CLKADS>
<OPTTT>
<gFlags>0</gFlags>
<BeepAtEnd>1</BeepAtEnd>
<RunSim>1</RunSim>
<RunTarget>0</RunTarget>
<RunAbUc>0</RunAbUc>
</OPTTT>
<OPTHX>
<HexSelection>1</HexSelection>
<FlashByte>65535</FlashByte>
<HexRangeLowAddress>0</HexRangeLowAddress>
<HexRangeHighAddress>0</HexRangeHighAddress>
<HexOffset>0</HexOffset>
</OPTHX>
<OPTLEX>
<PageWidth>79</PageWidth>
<PageLength>66</PageLength>
<TabStop>8</TabStop>
<ListingPath>.\Listings\</ListingPath>
</OPTLEX>
<ListingPage>
<CreateCListing>1</CreateCListing>
<CreateAListing>1</CreateAListing>
<CreateLListing>1</CreateLListing>
<CreateIListing>0</CreateIListing>
<AsmCond>1</AsmCond>
<AsmSymb>1</AsmSymb>
<AsmXref>0</AsmXref>
<CCond>1</CCond>
<CCode>0</CCode>
<CListInc>0</CListInc>
<CSymb>0</CSymb>
<LinkerCodeListing>0</LinkerCodeListing>
</ListingPage>
<OPTXL>
<LMap>1</LMap>
<LComments>1</LComments>
<LGenerateSymbols>1</LGenerateSymbols>
<LLibSym>1</LLibSym>
<LLines>1</LLines>
<LLocSym>1</LLocSym>
<LPubSym>1</LPubSym>
<LXref>0</LXref>
<LExpSel>0</LExpSel>
</OPTXL>
<OPTFL>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<IsCurrentTarget>0</IsCurrentTarget>
</OPTFL>
<CpuCode>18</CpuCode>
<DebugOpt>
<uSim>1</uSim>
<uTrg>0</uTrg>
<sLdApp>1</sLdApp>
<sGomain>1</sGomain>
<sRbreak>1</sRbreak>
<sRwatch>1</sRwatch>
<sRmem>1</sRmem>
<sRfunc>1</sRfunc>
<sRbox>1</sRbox>
<tLdApp>1</tLdApp>
<tGomain>0</tGomain>
<tRbreak>1</tRbreak>
<tRwatch>1</tRwatch>
<tRmem>1</tRmem>
<tRfunc>0</tRfunc>
<tRbox>1</tRbox>
<tRtrace>1</tRtrace>
<sRSysVw>1</sRSysVw>
<tRSysVw>1</tRSysVw>
<sRunDeb>0</sRunDeb>
<sLrtime>0</sLrtime>
<bEvRecOn>1</bEvRecOn>
<bSchkAxf>0</bSchkAxf>
<bTchkAxf>0</bTchkAxf>
<nTsel>-1</nTsel>
<sDll></sDll>
<sDllPa></sDllPa>
<sDlgDll></sDlgDll>
<sDlgPa></sDlgPa>
<sIfile></sIfile>
<tDll></tDll>
<tDllPa></tDllPa>
<tDlgDll></tDlgDll>
<tDlgPa></tDlgPa>
<tIfile></tIfile>
<pMon></pMon>
</DebugOpt>
<Breakpoint/>
<Tracepoint>
<THDelay>0</THDelay>
</Tracepoint>
<DebugFlag>
<trace>0</trace>
<periodic>0</periodic>
<aLwin>0</aLwin>
<aCover>0</aCover>
<aSer1>0</aSer1>
<aSer2>0</aSer2>
<aPa>0</aPa>
<viewmode>0</viewmode>
<vrSel>0</vrSel>
<aSym>0</aSym>
<aTbox>0</aTbox>
<AscS1>0</AscS1>
<AscS2>0</AscS2>
<AscS3>0</AscS3>
<aSer3>0</aSer3>
<eProf>0</eProf>
<aLa>0</aLa>
<aPa1>0</aPa1>
<AscS4>0</AscS4>
<aSer4>0</aSer4>
<StkLoc>0</StkLoc>
<TrcWin>0</TrcWin>
<newCpu>0</newCpu>
<uProt>0</uProt>
</DebugFlag>
<LintExecutable></LintExecutable>
<LintConfigFile></LintConfigFile>
<bLintAuto>0</bLintAuto>
<bAutoGenD>0</bAutoGenD>
<LntExFlags>0</LntExFlags>
<pMisraName></pMisraName>
<pszMrule></pszMrule>
<pSingCmds></pSingCmds>
<pMultCmds></pMultCmds>
<pMisraNamep></pMisraNamep>
<pszMrulep></pszMrulep>
<pSingCmdsp></pSingCmdsp>
<pMultCmdsp></pMultCmdsp>
</TargetOption>
</Target>
<Group>
<GroupName>Driver</GroupName>
<tvExp>1</tvExp>
@ -441,7 +375,7 @@
<Group>
<GroupName>SRC</GroupName>
<tvExp>0</tvExp>
<tvExp>1</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<cbSel>0</cbSel>
<RteFlg>0</RteFlg>
@ -472,35 +406,11 @@
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Drivers\Voilier_fonction\telecommande.c</PathWithFileName>
<FilenameWithoutPath>telecommande.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>7</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Drivers\Voilier_fonction\Girouette.c</PathWithFileName>
<FilenameWithoutPath>Girouette.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
<File>
<GroupNumber>3</GroupNumber>
<FileNumber>8</FileNumber>
<FileType>1</FileType>
<tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2>
<PathWithFileName>..\Drivers\Voilier_fonction\Plateau.c</PathWithFileName>
<FilenameWithoutPath>Plateau.c</FilenameWithoutPath>
<RteFlg>0</RteFlg>
<bShared>0</bShared>
</File>
</Group>
<Group>

22
GPIO_Test/GPIO_Test.uvprojx
View file

@ -418,21 +418,11 @@
<Group>
<GroupName>Voilier_fonction</GroupName>
<Files>
<File>
<FileName>telecommande.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\Voilier_fonction\telecommande.c</FilePath>
</File>
<File>
<FileName>Girouette.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\Voilier_fonction\Girouette.c</FilePath>
</File>
<File>
<FileName>Plateau.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\Voilier_fonction\Plateau.c</FilePath>
</File>
</Files>
</Group>
<Group>
@ -776,7 +766,7 @@
<MiscControls></MiscControls>
<Define></Define>
<Undefine></Undefine>
<IncludePath>..\Drivers\Include;..\Drivers\Voilier_fonction</IncludePath>
<IncludePath>..\Drivers\Include</IncludePath>
</VariousControls>
</Cads>
<Aads>
@ -855,21 +845,11 @@
<Group>
<GroupName>Voilier_fonction</GroupName>
<Files>
<File>
<FileName>telecommande.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\Voilier_fonction\telecommande.c</FilePath>
</File>
<File>
<FileName>Girouette.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\Voilier_fonction\Girouette.c</FilePath>
</File>
<File>
<FileName>Plateau.c</FileName>
<FileType>1</FileType>
<FilePath>..\Drivers\Voilier_fonction\Plateau.c</FilePath>
</File>
</Files>
</Group>
<Group>

21
GPIO_Test/Sources/Main.c
View file

@ -2,32 +2,13 @@
#include "Driver_Timer.h"
#include "Driver_UART.h"
#include "Driver_ADC.h"
#include "Plateau.h"
#include "telecommande.h"
int main (void){
MyGPIO_Struct_TypeDef * GPIO;
//init_telecommande();
//Plateau_init();
//Plateau_direction(DROITE);
//testRemote();
MyGPIO_Init(GPIO);
while(1){
MyGPIO_Set(GPIOA,3);
}
}

19
README.md
View file

@ -1,19 +0,0 @@
# Projet Voilier
## Equipe 4
* Clement MARCE
* Louis ROUSSET
* Cedric CHANFREAU
## Réalisation des drivers :
* [GPIOS](https://git.etud.insa-toulouse.fr/marce/Voilier/src/branch/master/Drivers/Sources/Driver_GPIO.c) //Done
* [TIMERS](https://git.etud.insa-toulouse.fr/marce/Voilier/src/branch/master/Drivers/Sources/Driver_Timer.c) //Done
* [PWM](https://git.etud.insa-toulouse.fr/marce/Voilier/src/branch/master/Drivers/Sources/Driver_Timer.c) //Done (Cédric)
* [ADC](https://git.etud.insa-toulouse.fr/marce/Voilier/src/branch/master/Drivers/Sources/Driver_ADC.c) //Done (Clement+Louis)
* [UART](https://git.etud.insa-toulouse.fr/marce/Voilier/src/branch/master/Drivers/Sources/Driver_UART.c) //Done (Cédric)
## Réalisation des différentes fonctions du bateau :
* [Girouette](https://git.etud.insa-toulouse.fr/marce/Voilier/src/branch/master/Drivers/Voilier_fonction/Girouette.c) //Work in progress (Clement)
* [Plateau](https://git.etud.insa-toulouse.fr/marce/Voilier/src/branch/master/Drivers/Voilier_fonction/Plateau.c) //Need to test (Cédric)
! : Rousset Louis a été absent à 3séances de TP sur les 6 prévues, ce qui a causé du retard à l'équipe.

BIN
README_picture/APB2ENR.png
View file

Binary file not shown.
Side by side

Before

Width:  |  Height:  |  Size: 13 KiB

BIN
README_picture/Thumbs.db
View file

Binary file not shown.