Skip to content

Update STM32F3xx and STM32L4xx #263

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 4 commits into from
Jun 13, 2018
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9,905 changes: 4,954 additions & 4,951 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l431xx.h

Large diffs are not rendered by default.

9,779 changes: 4,891 additions & 4,888 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l432xx.h

Large diffs are not rendered by default.

10,527 changes: 5,265 additions & 5,262 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l433xx.h

Large diffs are not rendered by default.

9,881 changes: 4,942 additions & 4,939 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l442xx.h

Large diffs are not rendered by default.

10,629 changes: 5,316 additions & 5,313 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l443xx.h

Large diffs are not rendered by default.

10,049 changes: 5,026 additions & 5,023 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l451xx.h

Large diffs are not rendered by default.

10,571 changes: 5,287 additions & 5,284 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l452xx.h

Large diffs are not rendered by default.

10,673 changes: 5,338 additions & 5,335 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l462xx.h

Large diffs are not rendered by default.

11,155 changes: 5,579 additions & 5,576 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l471xx.h

Large diffs are not rendered by default.

13,014 changes: 6,484 additions & 6,530 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l475xx.h

Large diffs are not rendered by default.

13,114 changes: 6,534 additions & 6,580 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l476xx.h

Large diffs are not rendered by default.

13,116 changes: 6,535 additions & 6,581 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l485xx.h

Large diffs are not rendered by default.

13,216 changes: 6,585 additions & 6,631 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l486xx.h

Large diffs are not rendered by default.

14,148 changes: 7,051 additions & 7,097 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l496xx.h

Large diffs are not rendered by default.

14,320 changes: 7,137 additions & 7,183 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l4a6xx.h

Large diffs are not rendered by default.

14,463 changes: 7,207 additions & 7,256 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l4r5xx.h

Large diffs are not rendered by default.

14,683 changes: 7,317 additions & 7,366 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l4r7xx.h

Large diffs are not rendered by default.

16,643 changes: 8,297 additions & 8,346 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l4r9xx.h

Large diffs are not rendered by default.

14,645 changes: 7,298 additions & 7,347 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l4s5xx.h

Large diffs are not rendered by default.

14,865 changes: 7,408 additions & 7,457 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l4s7xx.h

Large diffs are not rendered by default.

16,825 changes: 8,388 additions & 8,437 deletions system/Drivers/CMSIS/Device/ST/STM32L4xx/Include/stm32l4s9xx.h

Large diffs are not rendered by default.

Original file line number Diff line number Diff line change
Expand Up @@ -118,7 +118,7 @@
*/
#define __STM32L4_CMSIS_VERSION_MAIN (0x01) /*!< [31:24] main version */
#define __STM32L4_CMSIS_VERSION_SUB1 (0x04) /*!< [23:16] sub1 version */
#define __STM32L4_CMSIS_VERSION_SUB2 (0x02) /*!< [15:8] sub2 version */
#define __STM32L4_CMSIS_VERSION_SUB2 (0x03) /*!< [15:8] sub2 version */
#define __STM32L4_CMSIS_VERSION_RC (0x00) /*!< [7:0] release candidate */
#define __STM32L4_CMSIS_VERSION ((__STM32L4_CMSIS_VERSION_MAIN << 24)\
|(__STM32L4_CMSIS_VERSION_SUB1 << 16)\
Expand Down

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion system/Drivers/CMSIS/Device/ST/STM32YYxx_CMSIS_version.md
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
* STM32F7: 1.2.2
* STM32L0: 1.7.2
* STM32L1: 2.2.3
* STM32L4: 1.4.2
* STM32L4: 1.4.3

Release notes of each STM32YYxx CMSIS available here:

Expand Down
36 changes: 35 additions & 1 deletion system/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal.h
Original file line number Diff line number Diff line change
Expand Up @@ -70,6 +70,27 @@
/** @defgroup HAL_Exported_Constants HAL Exported Constants
* @{
*/

/** @defgroup HAL_TICK_FREQ Tick Frequency
* @{
*/
typedef enum
{
HAL_TICK_FREQ_10HZ = 100U,
HAL_TICK_FREQ_100HZ = 10U,
HAL_TICK_FREQ_1KHZ = 1U,
HAL_TICK_FREQ_DEFAULT = HAL_TICK_FREQ_1KHZ
} HAL_TickFreqTypeDef;
/**
* @}
*/

/**
* @}
*/
/** @defgroup HAL_Exported_Constants HAL Exported Constants
* @{
*/
/** @defgroup SYSCFG_BitAddress_AliasRegion SYSCFG registers bit address in the alias region
* @brief SYSCFG registers bit address in the alias region
* @{
Expand Down Expand Up @@ -847,6 +868,16 @@
*/
#endif /* SYSCFG_RCR_PAGE0 */

/**
* @}
*/
/* Private macro -------------------------------------------------------------*/
/** @defgroup HAL_Private_Macros HAL Private Macros
* @{
*/
#define IS_TICKFREQ(FREQ) (((FREQ) == HAL_TICK_FREQ_10HZ) || \
((FREQ) == HAL_TICK_FREQ_100HZ) || \
((FREQ) == HAL_TICK_FREQ_1KHZ))
/**
* @}
*/
Expand Down Expand Up @@ -875,10 +906,13 @@ HAL_StatusTypeDef HAL_InitTick (uint32_t TickPriority);
*/
/* Peripheral Control functions ************************************************/
void HAL_IncTick(void);
void HAL_Delay(__IO uint32_t Delay);
void HAL_Delay(uint32_t Delay);
void HAL_SuspendTick(void);
void HAL_ResumeTick(void);
uint32_t HAL_GetTick(void);
uint32_t HAL_GetTickPrio(void);
HAL_StatusTypeDef HAL_SetTickFreq(HAL_TickFreqTypeDef Freq);
HAL_TickFreqTypeDef HAL_GetTickFreq(void);
uint32_t HAL_GetHalVersion(void);
uint32_t HAL_GetREVID(void);
uint32_t HAL_GetDEVID(void);
Expand Down
13 changes: 7 additions & 6 deletions system/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal_def.h
Original file line number Diff line number Diff line change
Expand Up @@ -72,19 +72,20 @@ typedef enum
} HAL_LockTypeDef;

/* Exported macro ------------------------------------------------------------*/

#define UNUSED(X) (void)X /* To avoid gcc/g++ warnings */

#define HAL_MAX_DELAY 0xFFFFFFFFU

#define HAL_IS_BIT_SET(REG, BIT) (((REG) & (BIT)) != RESET)
#define HAL_IS_BIT_CLR(REG, BIT) (((REG) & (BIT)) == RESET)
#define HAL_IS_BIT_SET(REG, BIT) (((REG) & (BIT)) == BIT)
#define HAL_IS_BIT_CLR(REG, BIT) (((REG) & (BIT)) == 0U)

#define __HAL_LINKDMA(__HANDLE__, __PPP_DMA_FIELD_, __DMA_HANDLE_) \
do{ \
(__HANDLE__)->__PPP_DMA_FIELD_ = &(__DMA_HANDLE_); \
(__DMA_HANDLE_).Parent = (__HANDLE__); \
} while(0U)

#define UNUSED(x) ((void)(x))

/** @brief Reset the Handle's State field.
* @param __HANDLE__ specifies the Peripheral Handle.
* @note This macro can be used for the following purpose:
Expand Down Expand Up @@ -123,7 +124,7 @@ typedef enum
}while (0U)
#endif /* USE_RTOS */

#if defined ( __GNUC__ )
#if defined ( __GNUC__ ) && !defined (__CC_ARM) /* GNU Compiler */
#ifndef __weak
#define __weak __attribute__((weak))
#endif /* __weak */
Expand All @@ -134,7 +135,7 @@ typedef enum


/* Macro to get variable aligned on 4-bytes, for __ICCARM__ the directive "#pragma data_alignment=4" must be used instead */
#if defined (__GNUC__) /* GNU Compiler */
#if defined ( __GNUC__ ) && !defined (__CC_ARM) /* GNU Compiler */
#ifndef __ALIGN_END
#define __ALIGN_END __attribute__ ((aligned (4)))
#endif /* __ALIGN_END */
Expand Down
10 changes: 6 additions & 4 deletions system/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal_i2c.h
Original file line number Diff line number Diff line change
Expand Up @@ -248,6 +248,7 @@ typedef struct __I2C_HandleTypeDef
#define I2C_NEXT_FRAME ((uint32_t)(I2C_RELOAD_MODE | I2C_SOFTEND_MODE))
#define I2C_FIRST_AND_LAST_FRAME ((uint32_t)I2C_AUTOEND_MODE)
#define I2C_LAST_FRAME ((uint32_t)I2C_AUTOEND_MODE)
#define I2C_LAST_FRAME_NO_STOP ((uint32_t)I2C_SOFTEND_MODE)
/**
* @}
*/
Expand Down Expand Up @@ -335,9 +336,9 @@ typedef struct __I2C_HandleTypeDef
* @{
*/
#define I2C_NO_STARTSTOP (0x00000000U)
#define I2C_GENERATE_STOP I2C_CR2_STOP
#define I2C_GENERATE_START_READ (uint32_t)(I2C_CR2_START | I2C_CR2_RD_WRN)
#define I2C_GENERATE_START_WRITE I2C_CR2_START
#define I2C_GENERATE_STOP (uint32_t)(0x80000000U | I2C_CR2_STOP)
#define I2C_GENERATE_START_READ (uint32_t)(0x80000000U | I2C_CR2_START | I2C_CR2_RD_WRN)
#define I2C_GENERATE_START_WRITE (uint32_t)(0x80000000U | I2C_CR2_START)
/**
* @}
*/
Expand Down Expand Up @@ -659,7 +660,8 @@ uint32_t HAL_I2C_GetError(I2C_HandleTypeDef *hi2c);
((REQUEST) == I2C_FIRST_AND_NEXT_FRAME) || \
((REQUEST) == I2C_NEXT_FRAME) || \
((REQUEST) == I2C_FIRST_AND_LAST_FRAME) || \
((REQUEST) == I2C_LAST_FRAME))
((REQUEST) == I2C_LAST_FRAME) || \
((REQUEST) == I2C_LAST_FRAME_NO_STOP))

#define I2C_RESET_CR2(__HANDLE__) ((__HANDLE__)->Instance->CR2 &= (uint32_t)~((uint32_t)(I2C_CR2_SADD | I2C_CR2_HEAD10R | I2C_CR2_NBYTES | I2C_CR2_RELOAD | I2C_CR2_RD_WRN)))

Expand Down
4 changes: 2 additions & 2 deletions system/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal_pcd.h
Original file line number Diff line number Diff line change
Expand Up @@ -402,10 +402,10 @@ PCD_StateTypeDef HAL_PCD_GetState(PCD_HandleTypeDef *hpcd);
*/

/* SetENDPOINT */
#define PCD_SET_ENDPOINT(USBx, bEpNum,wRegValue) (*((uint16_t *)(((uint32_t)(&(USBx)->EP0R + (bEpNum) * 2U))))= (uint16_t)(wRegValue))
#define PCD_SET_ENDPOINT(USBx, bEpNum,wRegValue) (*((__IO uint16_t *)(((uint32_t)(&(USBx)->EP0R + (bEpNum) * 2U))))= (uint16_t)(wRegValue))

/* GetENDPOINT */
#define PCD_GET_ENDPOINT(USBx, bEpNum) (*((uint16_t *)(((uint32_t)(&(USBx)->EP0R + (bEpNum) * 2U)))))
#define PCD_GET_ENDPOINT(USBx, bEpNum) (*((__IO uint16_t *)(((uint32_t)(&(USBx)->EP0R + (bEpNum) * 2U)))))



Expand Down
6 changes: 3 additions & 3 deletions system/Drivers/STM32F3xx_HAL_Driver/Inc/stm32f3xx_hal_smbus.h
Original file line number Diff line number Diff line change
Expand Up @@ -279,9 +279,9 @@ typedef struct
*/

#define SMBUS_NO_STARTSTOP (0x00000000U)
#define SMBUS_GENERATE_STOP I2C_CR2_STOP
#define SMBUS_GENERATE_START_READ (uint32_t)(I2C_CR2_START | I2C_CR2_RD_WRN)
#define SMBUS_GENERATE_START_WRITE I2C_CR2_START
#define SMBUS_GENERATE_STOP (uint32_t)(0x80000000U | I2C_CR2_STOP)
#define SMBUS_GENERATE_START_READ (uint32_t)(0x80000000U | I2C_CR2_START | I2C_CR2_RD_WRN)
#define SMBUS_GENERATE_START_WRITE (uint32_t)(0x80000000U | I2C_CR2_START)
/**
* @}
*/
Expand Down
Loading