Skip to content

Commit

Permalink
Refs #1333. Added LPUART support to the STM32L4 port.
Browse files Browse the repository at this point in the history 
git-svn-id: https://svn.code.sf.net/p/openblt/code/trunk@907 5dc33758-31d5-4daf-9ae8-b24bf3d40d73
  • Loading branch information
@feaser
feaser committed Oct 8, 2021
1 parent 50eb570 commit 3568e36
Show file tree
Hide file tree
Showing 5 changed files with 85 additions and 15 deletions.
4 changes: 3 additions & 1 deletion Target/Demo/ARMCM4_STM32L4_Nucleo_L476RG_CubeIDE/Boot/App/blt_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@
#define BOOT_COM_RS232_TX_MAX_DATA (64)
/** \brief Configure number of bytes in the host->target data packet. */
#define BOOT_COM_RS232_RX_MAX_DATA (64)
/** \brief Select the desired UART peripheral as a zero based index. */
/** \brief Select the desired UART peripheral as a zero based index. Note that the LPUART
* peripherals come after the U(S)ART peripherals.
*/
#define BOOT_COM_RS232_CHANNEL_INDEX (1)


Expand Down
4 changes: 3 additions & 1 deletion Target/Demo/ARMCM4_STM32L4_Nucleo_L476RG_GCC/Boot/blt_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@
#define BOOT_COM_RS232_TX_MAX_DATA (64)
/** \brief Configure number of bytes in the host->target data packet. */
#define BOOT_COM_RS232_RX_MAX_DATA (64)
/** \brief Select the desired UART peripheral as a zero based index. */
/** \brief Select the desired UART peripheral as a zero based index. Note that the LPUART
* peripherals come after the U(S)ART peripherals.
*/
#define BOOT_COM_RS232_CHANNEL_INDEX (1)


Expand Down
4 changes: 3 additions & 1 deletion Target/Demo/ARMCM4_STM32L4_Nucleo_L476RG_IAR/Boot/blt_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@
#define BOOT_COM_RS232_TX_MAX_DATA (64)
/** \brief Configure number of bytes in the host->target data packet. */
#define BOOT_COM_RS232_RX_MAX_DATA (64)
/** \brief Select the desired UART peripheral as a zero based index. */
/** \brief Select the desired UART peripheral as a zero based index. Note that the LPUART
* peripherals come after the U(S)ART peripherals.
*/
#define BOOT_COM_RS232_CHANNEL_INDEX (1)


Expand Down
4 changes: 3 additions & 1 deletion Target/Demo/ARMCM4_STM32L4_Nucleo_L476RG_Keil/Boot/blt_conf.h
View file
Original file line number Diff line number Diff line change
Expand Up @@ -100,7 +100,9 @@
#define BOOT_COM_RS232_TX_MAX_DATA (64)
/** \brief Configure number of bytes in the host->target data packet. */
#define BOOT_COM_RS232_RX_MAX_DATA (64)
/** \brief Select the desired UART peripheral as a zero based index. */
/** \brief Select the desired UART peripheral as a zero based index. Note that the LPUART
* peripherals come after the U(S)ART peripherals.
*/
#define BOOT_COM_RS232_CHANNEL_INDEX (1)


Expand Down
84 changes: 73 additions & 11 deletions Target/Source/ARMCM4_STM32L4/rs232.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,11 @@
#include "boot.h" /* bootloader generic header */
#if (BOOT_COM_RS232_ENABLE > 0)
#include "stm32l4xx.h" /* STM32 CPU and HAL header */
#if (BOOT_COM_RS232_CHANNEL_INDEX < 5) /* USART or UART channel */
#include "stm32l4xx_ll_usart.h" /* STM32 LL USART header */
#else /* LPUART channel */
#include "stm32l4xx_ll_lpuart.h" /* STM32 LL LPUART header */
#endif


/****************************************************************************************
Expand All @@ -44,7 +48,9 @@
#define RS232_CTO_RX_PACKET_TIMEOUT_MS (100u)
/** \brief Timeout for transmitting a byte in milliseconds. */
#define RS232_BYTE_TX_TIMEOUT_MS (10u)
/* map the configured UART channel index to the STM32's USART peripheral */
/* map the configured UART channel index to the STM32's USART peripheral. note that the
* LPUART peripheral is mapped after the regular U(S)ART peripherals.
*/
#if (BOOT_COM_RS232_CHANNEL_INDEX == 0)
/** \brief Set UART base address to USART1. */
#define USART_CHANNEL USART1
Expand All @@ -55,11 +61,14 @@
/** \brief Set UART base address to USART3. */
#define USART_CHANNEL USART3
#elif (BOOT_COM_RS232_CHANNEL_INDEX == 3)
/** \brief Set UART base address to USART4. */
/** \brief Set UART base address to UART4. */
#define USART_CHANNEL UART4
#elif (BOOT_COM_RS232_CHANNEL_INDEX == 4)
/** \brief Set UART base address to USART5. */
/** \brief Set UART base address to UART5. */
#define USART_CHANNEL UART5
#elif (BOOT_COM_RS232_CHANNEL_INDEX == 5)
/** \brief Set UART base address to LPUART1. */
#define USART_CHANNEL LPUART1
#endif


Expand All @@ -77,17 +86,23 @@ static void Rs232TransmitByte(blt_int8u data);
****************************************************************************************/
void Rs232Init(void)
{
LL_USART_InitTypeDef USART_InitStruct;
#if (BOOT_COM_RS232_CHANNEL_INDEX < 5) /* USART or UART channel */
LL_USART_InitTypeDef USART_InitStruct = {0};
#else /* LPUART channel */
LL_LPUART_InitTypeDef LPUART_InitStruct = {0};
#endif

/* the current implementation supports USART1 - USART5. throw an assertion error in
* case a different UART channel is configured.
/* The current implementation supports USART1 - UART5 and LPUART1. throw an assertion
* error in case a different UART channel is configured.
*/
ASSERT_CT((BOOT_COM_RS232_CHANNEL_INDEX == 0) ||
(BOOT_COM_RS232_CHANNEL_INDEX == 1) ||
(BOOT_COM_RS232_CHANNEL_INDEX == 2) ||
(BOOT_COM_RS232_CHANNEL_INDEX == 3) ||
(BOOT_COM_RS232_CHANNEL_INDEX == 4));
(BOOT_COM_RS232_CHANNEL_INDEX == 4) ||
(BOOT_COM_RS232_CHANNEL_INDEX == 5));

#if (BOOT_COM_RS232_CHANNEL_INDEX < 5) /* USART or UART channel */
/* disable the UART peripheral */
LL_USART_Disable(USART_CHANNEL);
/* configure UART peripheral */
Expand All @@ -101,6 +116,20 @@ void Rs232Init(void)
/* initialize the UART peripheral */
LL_USART_Init(USART_CHANNEL, &USART_InitStruct);
LL_USART_Enable(USART_CHANNEL);
#else /* LPUART channel */
/* disable the peripheral */
LL_LPUART_Disable(USART_CHANNEL);
/* configure UART peripheral */
LPUART_InitStruct.BaudRate = BOOT_COM_RS232_BAUDRATE;
LPUART_InitStruct.DataWidth = LL_LPUART_DATAWIDTH_8B;
LPUART_InitStruct.StopBits = LL_LPUART_STOPBITS_1;
LPUART_InitStruct.Parity = LL_LPUART_PARITY_NONE;
LPUART_InitStruct.TransferDirection = LL_LPUART_DIRECTION_TX_RX;
LPUART_InitStruct.HardwareFlowControl = LL_LPUART_HWCONTROL_NONE;
/* initialize the UART peripheral */
LL_LPUART_Init(USART_CHANNEL, &LPUART_InitStruct);
LL_LPUART_Enable(USART_CHANNEL);
#endif
} /*** end of Rs232Init ***/


Expand Down Expand Up @@ -210,15 +239,30 @@ blt_bool Rs232ReceivePacket(blt_int8u *data, blt_int8u *len)
****************************************************************************************/
static blt_bool Rs232ReceiveByte(blt_int8u *data)
{
blt_bool result = BLT_FALSE;

#if (BOOT_COM_RS232_CHANNEL_INDEX < 5) /* USART or UART channel */
/* check if a new byte was received on the configured channel */
if (LL_USART_IsActiveFlag_RXNE(USART_CHANNEL) != 0)
{
/* retrieve and store the newly received byte */
*data = LL_USART_ReceiveData8(USART_CHANNEL);
/* all done */
return BLT_TRUE;
/* update the result */
result = BLT_TRUE;
}
/* still here to no new byte received */
return BLT_FALSE;
#else /* LPUART channel */
/* check if a new byte was received on the configured channel */
if (LL_LPUART_IsActiveFlag_RXNE(USART_CHANNEL) != 0)
{
/* retrieve and store the newly received byte */
*data = LL_LPUART_ReceiveData8(USART_CHANNEL);
/* update the result */
result = BLT_TRUE;
}
#endif

/* give the result back to the caller */
return result;
} /*** end of Rs232ReceiveByte ***/


Expand All @@ -232,6 +276,7 @@ static void Rs232TransmitByte(blt_int8u data)
{
blt_int32u timeout;

#if (BOOT_COM_RS232_CHANNEL_INDEX < 5) /* USART or UART channel */
/* write byte to transmit holding register */
LL_USART_TransmitData8(USART_CHANNEL, data);
/* set timeout time to wait for transmit completion. */
Expand All @@ -247,6 +292,23 @@ static void Rs232TransmitByte(blt_int8u data)
break;
}
}
#else /* LPUART channel */
/* write byte to transmit holding register */
LL_LPUART_TransmitData8(USART_CHANNEL, data);
/* set timeout time to wait for transmit completion. */
timeout = TimerGet() + RS232_BYTE_TX_TIMEOUT_MS;
/* wait for tx holding register to be empty */
while (LL_LPUART_IsActiveFlag_TXE(USART_CHANNEL) == 0)
{
/* keep the watchdog happy */
CopService();
/* break loop upon timeout. this would indicate a hardware failure. */
if (TimerGet() > timeout)
{
break;
}
}
#endif
} /*** end of Rs232TransmitByte ***/
#endif /* BOOT_COM_RS232_ENABLE > 0 */

Expand Down

0 comments on commit 3568e36

Please sign in to comment.