Skip to content

Commit

Permalink
Merge pull request #2014 from fpistm/CubeL1_v1.10.4
Browse files Browse the repository at this point in the history
Update to latest STM32CubeL1 v1.10.4
  • Loading branch information
fpistm committed Jun 1, 2023
2 parents bd6048b + 9ae0f65 commit 2b4d8ef
Show file tree
Hide file tree
Showing 200 changed files with 11,717 additions and 6,658 deletions.
2 changes: 2 additions & 0 deletions libraries/SrcWrapper/src/HAL/stm32yyxx_hal_smbus.c
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,8 @@
#include "stm32h7xx_hal_smbus.c"
#elif STM32L0xx
#include "stm32l0xx_hal_smbus.c"
#elif STM32L1xx
#include "stm32l1xx_hal_smbus.c"
#elif STM32L4xx
#include "stm32l4xx_hal_smbus.c"
#elif STM32L5xx
Expand Down
47 changes: 27 additions & 20 deletions system/Drivers/CMSIS/Device/ST/STM32L1xx/Include/stm32l100xb.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@
* This file contains:
* - Data structures and the address mapping for all peripherals
* - Peripheral's registers declarations and bits definition
* - Macros to access peripherals registers hardware
* - Macros to access peripheral's registers hardware
*
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
* All rights reserved.</center></h2>
* Copyright (c) 2017-2021 STMicroelectronics.
* All rights reserved.
*
* This software component is licensed by ST under BSD 3-Clause license,
* the "License"; You may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
* opensource.org/licenses/BSD-3-Clause
* This software is licensed under terms that can be found in the LICENSE file
* in the root directory of this software component.
* If no LICENSE file comes with this software, it is provided AS-IS.
*
******************************************************************************
*/
Expand Down Expand Up @@ -863,7 +862,7 @@ typedef struct
#define ADC_CR2_EOCS ADC_CR2_EOCS_Msk /*!< ADC end of unitary or end of sequence conversions selection */
#define ADC_CR2_ALIGN_Pos (11U)
#define ADC_CR2_ALIGN_Msk (0x1UL << ADC_CR2_ALIGN_Pos) /*!< 0x00000800 */
#define ADC_CR2_ALIGN ADC_CR2_ALIGN_Msk /*!< ADC data alignement */
#define ADC_CR2_ALIGN ADC_CR2_ALIGN_Msk /*!< ADC data alignment */

#define ADC_CR2_JEXTSEL_Pos (16U)
#define ADC_CR2_JEXTSEL_Msk (0xFUL << ADC_CR2_JEXTSEL_Pos) /*!< 0x000F0000 */
Expand Down Expand Up @@ -2751,7 +2750,7 @@ typedef struct
/* */
/******************************************************************************/
/*
* @brief Specific device feature definitions (not present on all devices in the STM32L1 serie)
* @brief Specific device feature definitions (not present on all devices in the STM32L1 series)
*/
#define FLASH_CUT1

Expand Down Expand Up @@ -3658,7 +3657,7 @@ typedef struct

#define LCD_FCR_PON_Pos (4U)
#define LCD_FCR_PON_Msk (0x7UL << LCD_FCR_PON_Pos) /*!< 0x00000070 */
#define LCD_FCR_PON LCD_FCR_PON_Msk /*!< PON[2:0] bits (Puls ON Duration) */
#define LCD_FCR_PON LCD_FCR_PON_Msk /*!< PON[2:0] bits (Pulse ON Duration) */
#define LCD_FCR_PON_0 (0x1UL << LCD_FCR_PON_Pos) /*!< 0x00000010 */
#define LCD_FCR_PON_1 (0x2UL << LCD_FCR_PON_Pos) /*!< 0x00000020 */
#define LCD_FCR_PON_2 (0x4UL << LCD_FCR_PON_Pos) /*!< 0x00000040 */
Expand Down Expand Up @@ -4465,7 +4464,7 @@ typedef struct
#define RCC_CSR_RTCSEL_0 (0x1UL << RCC_CSR_RTCSEL_Pos) /*!< 0x00010000 */
#define RCC_CSR_RTCSEL_1 (0x2UL << RCC_CSR_RTCSEL_Pos) /*!< 0x00020000 */

/*!< RTC congiguration */
/*!< RTC configuration */
#define RCC_CSR_RTCSEL_NOCLOCK (0x00000000U) /*!< No clock */
#define RCC_CSR_RTCSEL_LSE_Pos (16U)
#define RCC_CSR_RTCSEL_LSE_Msk (0x1UL << RCC_CSR_RTCSEL_LSE_Pos) /*!< 0x00010000 */
Expand Down Expand Up @@ -4515,7 +4514,7 @@ typedef struct
/* */
/******************************************************************************/
/*
* @brief Specific device feature definitions (not present on all devices in the STM32F0 serie)
* @brief Specific device feature definitions (not present on all devices in the STM32F0 series)
*/
#define RTC_TAMPER1_SUPPORT /*!< TAMPER 1 feature support */
#define RTC_BACKUP_SUPPORT /*!< BACKUP register feature support */
Expand Down Expand Up @@ -5006,7 +5005,7 @@ typedef struct
/******************************************************************************/

/*
* @brief Specific device feature definitions (not present on all devices in the STM32F3 serie)
* @brief Specific device feature definitions (not present on all devices in the STM32F3 series)
*/

/******************* Bit definition for SPI_CR1 register ********************/
Expand Down Expand Up @@ -6078,12 +6077,21 @@ typedef struct
#define USART_DR_DR USART_DR_DR_Msk /*!< Data value */

/****************** Bit definition for USART_BRR register *******************/
#define USART_BRR_DIV_FRACTION_Pos (0U)
#define USART_BRR_DIV_FRACTION_Msk (0xFUL << USART_BRR_DIV_FRACTION_Pos) /*!< 0x0000000F */
#define USART_BRR_DIV_FRACTION USART_BRR_DIV_FRACTION_Msk /*!< Fraction of USARTDIV */
#define USART_BRR_DIV_MANTISSA_Pos (4U)
#define USART_BRR_DIV_MANTISSA_Msk (0xFFFUL << USART_BRR_DIV_MANTISSA_Pos) /*!< 0x0000FFF0 */
#define USART_BRR_DIV_MANTISSA USART_BRR_DIV_MANTISSA_Msk /*!< Mantissa of USARTDIV */
#define USART_BRR_DIV_Fraction_Pos (0U)
#define USART_BRR_DIV_Fraction_Msk (0xFUL << USART_BRR_DIV_Fraction_Pos) /*!< 0x0000000F */
#define USART_BRR_DIV_Fraction USART_BRR_DIV_Fraction_Msk /*!<Fraction of USARTDIV */
#define USART_BRR_DIV_Mantissa_Pos (4U)
#define USART_BRR_DIV_Mantissa_Msk (0xFFFUL << USART_BRR_DIV_Mantissa_Pos) /*!< 0x0000FFF0 */
#define USART_BRR_DIV_Mantissa USART_BRR_DIV_Mantissa_Msk /*!<Mantissa of USARTDIV */

/* Legacy aliases */
#define USART_BRR_DIV_FRACTION_Pos USART_BRR_DIV_Fraction_Pos
#define USART_BRR_DIV_FRACTION_Msk USART_BRR_DIV_Fraction_Msk
#define USART_BRR_DIV_FRACTION USART_BRR_DIV_Fraction

#define USART_BRR_DIV_MANTISSA_Pos USART_BRR_DIV_Mantissa_Pos
#define USART_BRR_DIV_MANTISSA_Msk USART_BRR_DIV_Mantissa_Msk
#define USART_BRR_DIV_MANTISSA USART_BRR_DIV_Mantissa

/****************** Bit definition for USART_CR1 register *******************/
#define USART_CR1_SBK_Pos (0U)
Expand Down Expand Up @@ -7666,4 +7674,3 @@ typedef struct



/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
49 changes: 28 additions & 21 deletions system/Drivers/CMSIS/Device/ST/STM32L1xx/Include/stm32l100xba.h
Original file line number Diff line number Diff line change
Expand Up @@ -9,18 +9,17 @@
* This file contains:
* - Data structures and the address mapping for all peripherals
* - Peripheral's registers declarations and bits definition
* - Macros to access peripherals registers hardware
* - Macros to access peripheral's registers hardware
*
******************************************************************************
* @attention
*
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
* All rights reserved.</center></h2>
* Copyright (c) 2017-2021 STMicroelectronics.
* All rights reserved.
*
* This software component is licensed by ST under BSD 3-Clause license,
* the "License"; You may not use this file except in compliance with the
* License. You may obtain a copy of the License at:
* opensource.org/licenses/BSD-3-Clause
* This software is licensed under terms that can be found in the LICENSE file
* in the root directory of this software component.
* If no LICENSE file comes with this software, it is provided AS-IS.
*
******************************************************************************
*/
Expand Down Expand Up @@ -863,7 +862,7 @@ typedef struct
#define ADC_CR2_EOCS ADC_CR2_EOCS_Msk /*!< ADC end of unitary or end of sequence conversions selection */
#define ADC_CR2_ALIGN_Pos (11U)
#define ADC_CR2_ALIGN_Msk (0x1UL << ADC_CR2_ALIGN_Pos) /*!< 0x00000800 */
#define ADC_CR2_ALIGN ADC_CR2_ALIGN_Msk /*!< ADC data alignement */
#define ADC_CR2_ALIGN ADC_CR2_ALIGN_Msk /*!< ADC data alignment */

#define ADC_CR2_JEXTSEL_Pos (16U)
#define ADC_CR2_JEXTSEL_Msk (0xFUL << ADC_CR2_JEXTSEL_Pos) /*!< 0x000F0000 */
Expand Down Expand Up @@ -2754,7 +2753,7 @@ typedef struct
/* */
/******************************************************************************/
/*
* @brief Specific device feature definitions (not present on all devices in the STM32L1 serie)
* @brief Specific device feature definitions (not present on all devices in the STM32L1 series)
*/
#define FLASH_CUT2

Expand Down Expand Up @@ -3664,7 +3663,7 @@ typedef struct

#define LCD_FCR_PON_Pos (4U)
#define LCD_FCR_PON_Msk (0x7UL << LCD_FCR_PON_Pos) /*!< 0x00000070 */
#define LCD_FCR_PON LCD_FCR_PON_Msk /*!< PON[2:0] bits (Puls ON Duration) */
#define LCD_FCR_PON LCD_FCR_PON_Msk /*!< PON[2:0] bits (Pulse ON Duration) */
#define LCD_FCR_PON_0 (0x1UL << LCD_FCR_PON_Pos) /*!< 0x00000010 */
#define LCD_FCR_PON_1 (0x2UL << LCD_FCR_PON_Pos) /*!< 0x00000020 */
#define LCD_FCR_PON_2 (0x4UL << LCD_FCR_PON_Pos) /*!< 0x00000040 */
Expand Down Expand Up @@ -3833,7 +3832,7 @@ typedef struct
/* */
/******************************************************************************/
/*
* @brief Specific device feature definitions (not present on all devices in the STM32F0 serie)
* @brief Specific device feature definitions (not present on all devices in the STM32F0 series)
*/
#define RCC_LSECSS_SUPPORT /*!< LSE CSS feature support */

Expand Down Expand Up @@ -4492,7 +4491,7 @@ typedef struct
#define RCC_CSR_RTCSEL_0 (0x1UL << RCC_CSR_RTCSEL_Pos) /*!< 0x00010000 */
#define RCC_CSR_RTCSEL_1 (0x2UL << RCC_CSR_RTCSEL_Pos) /*!< 0x00020000 */

/*!< RTC congiguration */
/*!< RTC configuration */
#define RCC_CSR_RTCSEL_NOCLOCK (0x00000000U) /*!< No clock */
#define RCC_CSR_RTCSEL_LSE_Pos (16U)
#define RCC_CSR_RTCSEL_LSE_Msk (0x1UL << RCC_CSR_RTCSEL_LSE_Pos) /*!< 0x00010000 */
Expand Down Expand Up @@ -4542,7 +4541,7 @@ typedef struct
/* */
/******************************************************************************/
/*
* @brief Specific device feature definitions (not present on all devices in the STM32F0 serie)
* @brief Specific device feature definitions (not present on all devices in the STM32F0 series)
*/
#define RTC_TAMPER1_SUPPORT /*!< TAMPER 1 feature support */
#define RTC_TAMPER2_SUPPORT /*!< TAMPER 2 feature support */
Expand Down Expand Up @@ -5154,7 +5153,7 @@ typedef struct
/******************************************************************************/

/*
* @brief Specific device feature definitions (not present on all devices in the STM32F3 serie)
* @brief Specific device feature definitions (not present on all devices in the STM32F3 series)
*/

/******************* Bit definition for SPI_CR1 register ********************/
Expand Down Expand Up @@ -6226,12 +6225,21 @@ typedef struct
#define USART_DR_DR USART_DR_DR_Msk /*!< Data value */

/****************** Bit definition for USART_BRR register *******************/
#define USART_BRR_DIV_FRACTION_Pos (0U)
#define USART_BRR_DIV_FRACTION_Msk (0xFUL << USART_BRR_DIV_FRACTION_Pos) /*!< 0x0000000F */
#define USART_BRR_DIV_FRACTION USART_BRR_DIV_FRACTION_Msk /*!< Fraction of USARTDIV */
#define USART_BRR_DIV_MANTISSA_Pos (4U)
#define USART_BRR_DIV_MANTISSA_Msk (0xFFFUL << USART_BRR_DIV_MANTISSA_Pos) /*!< 0x0000FFF0 */
#define USART_BRR_DIV_MANTISSA USART_BRR_DIV_MANTISSA_Msk /*!< Mantissa of USARTDIV */
#define USART_BRR_DIV_Fraction_Pos (0U)
#define USART_BRR_DIV_Fraction_Msk (0xFUL << USART_BRR_DIV_Fraction_Pos) /*!< 0x0000000F */
#define USART_BRR_DIV_Fraction USART_BRR_DIV_Fraction_Msk /*!<Fraction of USARTDIV */
#define USART_BRR_DIV_Mantissa_Pos (4U)
#define USART_BRR_DIV_Mantissa_Msk (0xFFFUL << USART_BRR_DIV_Mantissa_Pos) /*!< 0x0000FFF0 */
#define USART_BRR_DIV_Mantissa USART_BRR_DIV_Mantissa_Msk /*!<Mantissa of USARTDIV */

/* Legacy aliases */
#define USART_BRR_DIV_FRACTION_Pos USART_BRR_DIV_Fraction_Pos
#define USART_BRR_DIV_FRACTION_Msk USART_BRR_DIV_Fraction_Msk
#define USART_BRR_DIV_FRACTION USART_BRR_DIV_Fraction

#define USART_BRR_DIV_MANTISSA_Pos USART_BRR_DIV_Mantissa_Pos
#define USART_BRR_DIV_MANTISSA_Msk USART_BRR_DIV_Mantissa_Msk
#define USART_BRR_DIV_MANTISSA USART_BRR_DIV_Mantissa

/****************** Bit definition for USART_CR1 register *******************/
#define USART_CR1_SBK_Pos (0U)
Expand Down Expand Up @@ -7814,4 +7822,3 @@ typedef struct



/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
Loading

0 comments on commit 2b4d8ef

Please sign in to comment.