From 1556c5145f09513d7db2cf50124a92c5d226c002 Mon Sep 17 00:00:00 2001 From: Neluji <38362829+Neluji@users.noreply.github.com> Date: Sun, 22 Nov 2020 18:49:30 +0100 Subject: [PATCH] Configuration fonct OK --- MDK-ARM/Project.uvoptx | 32 ++++++++++++++++++++++---------- MDK-ARM/Project.uvprojx | 10 ++++++++++ MyDrivers/MyUSART.c | 10 +++++++++- 3 files changed, 41 insertions(+), 11 deletions(-) diff --git a/MDK-ARM/Project.uvoptx b/MDK-ARM/Project.uvoptx index dad60dc..39ec91c 100644 --- a/MDK-ARM/Project.uvoptx +++ b/MDK-ARM/Project.uvoptx @@ -420,7 +420,7 @@ 1 1 1 - 1 + 0 0 0 ../Src/main.c @@ -448,7 +448,7 @@ 3 2 1 - 1 + 0 0 0 ..\MyDrivers\MyTimer.c @@ -456,6 +456,18 @@ 0 0 + + 3 + 3 + 1 + 1 + 0 + 0 + ..\MyDrivers\MyUSART.c + MyUSART.c + 0 + 0 + @@ -466,7 +478,7 @@ 0 4 - 3 + 4 1 0 0 @@ -478,7 +490,7 @@ 4 - 4 + 5 1 0 0 @@ -490,7 +502,7 @@ 4 - 5 + 6 1 0 0 @@ -502,7 +514,7 @@ 4 - 6 + 7 1 0 0 @@ -514,7 +526,7 @@ 4 - 7 + 8 1 0 0 @@ -534,7 +546,7 @@ 0 5 - 8 + 9 5 0 0 @@ -554,7 +566,7 @@ 0 6 - 9 + 10 1 0 0 @@ -574,7 +586,7 @@ 0 7 - 10 + 11 2 0 0 diff --git a/MDK-ARM/Project.uvprojx b/MDK-ARM/Project.uvprojx index cd43e32..35d72bc 100644 --- a/MDK-ARM/Project.uvprojx +++ b/MDK-ARM/Project.uvprojx @@ -400,6 +400,11 @@ 1 ..\MyDrivers\MyTimer.c + + MyUSART.c + 1 + ..\MyDrivers\MyUSART.c + @@ -861,6 +866,11 @@ 1 ..\MyDrivers\MyTimer.c + + MyUSART.c + 1 + ..\MyDrivers\MyUSART.c + diff --git a/MyDrivers/MyUSART.c b/MyDrivers/MyUSART.c index 57caff4..5a20a14 100644 --- a/MyDrivers/MyUSART.c +++ b/MyDrivers/MyUSART.c @@ -12,19 +12,26 @@ void MyUSART_Conf(USART_TypeDef * USART, int TransferDir) { LL_USART_InitTypeDef My_LL_USART_Init_Struct; + LL_USART_ClockInitTypeDef My_LL_USART_Clock; // Validation horloge locale if (USART==USART1) LL_APB2_GRP1_EnableClock(LL_APB2_GRP1_PERIPH_USART1); else if (USART==USART2) LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_USART2); else LL_APB1_GRP1_EnableClock(LL_APB1_GRP1_PERIPH_USART3); + //Activation clk de l'USART en entrée et sortie + LL_USART_ClockStructInit(&My_LL_USART_Clock); + My_LL_USART_Clock.ClockOutput = LL_USART_CLOCK_ENABLE; + LL_USART_ClockInit(USART, &My_LL_USART_Clock); + //Initialisation de l'USART LL_USART_StructInit(&My_LL_USART_Init_Struct); - My_LL_USART_Init_Struct.TransferDirection = TransferDir; + //My_LL_USART_Init_Struct.TransferDirection = TransferDir; LL_USART_Init(USART, &My_LL_USART_Init_Struct); + LL_USART_Enable(USART); } /** @@ -60,4 +67,5 @@ void MyUSART_IT_Disable(USART_TypeDef * USART) void MyUSART_Transmit_Data_8b(USART_TypeDef * USART, int data) { LL_USART_TransmitData8(USART, data); + while (LL_USART_IsActiveFlag_TC(USART) != 1){} }