pfaure/Projet_Voilier_4IR
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

Ajout fonction envoi exceptionnel

Browse source
This commit is contained in:
EyeXion 2020-11-14 11:25:07 +01:00
parent 205c1b535d
commit f145426522
3 changed files with 17 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
MDK-ARM/Project.uvoptx
View file

@ -550,7 +550,7 @@
<GroupNumber>2</GroupNumber> <GroupNumber>2</GroupNumber>
<FileNumber>7</FileNumber> <FileNumber>7</FileNumber>
<FileType>1</FileType> <FileType>1</FileType>
<tvExp>1</tvExp> <tvExp>0</tvExp>
<tvExpOptDlg>0</tvExpOptDlg> <tvExpOptDlg>0</tvExpOptDlg>
<bDave2>0</bDave2> <bDave2>0</bDave2>
<PathWithFileName>..\Src\Transmission.c</PathWithFileName> <PathWithFileName>..\Src\Transmission.c</PathWithFileName>

0
Src/AntiCharvirement.c → Src/AntiChavirement.c
View file

19
Src/Transmission.c
View file

@ -55,6 +55,20 @@ void EnvoiRegulier(char * Allure, char * tension){
LL_GPIO_ResetOutputPin(GPIOA,LL_GPIO_PIN_11); LL_GPIO_ResetOutputPin(GPIOA,LL_GPIO_PIN_11);
} }
void EnvoiExceptionnel(char * msgAlarme){
LL_GPIO_SetOutputPin(GPIOA,LL_GPIO_PIN_11);
int tailleMessage = sizeof(msgAlarme);
int index = 0;
while(index < tailleMessage){
if (LL_USART_IsActiveFlag_TXE(USART1)){ //On regarde si le flag de transmission terminée est actif
LL_USART_TransmitData8(USART1, (uint8_t) msgAlarme[index]); //On envoie le message (8 bits)
index++;
}
}
}
void SystemClock_Config(void) void SystemClock_Config(void)
{ {
/* Set FLASH latency */ /* Set FLASH latency */
@ -100,12 +114,11 @@ int main(){
ConfSysTick(); ConfSysTick();
ConfTransmission(); ConfTransmission();
char * msg1 = "ok "; char * msg1 = "ok ";
char * msg2 = "coucou "; char * msg2 = "coucou ";
//EnvoiRegulier(ToString(RecupAllure()),ToString(RecupTension()));
while(1){ while(1){
if (drapeauTransmission){ if (drapeauTransmission){
//EnvoiRegulier(ToString(RecupAllure()),ToString(RecupTension()));
EnvoiRegulier(msg1, msg2); EnvoiRegulier(msg1, msg2);
drapeauTransmission = 0; drapeauTransmission = 0;
} }