Skip to content

Commit bafee17

Browse files
committed
[F7] Update STM32F7xx HAL Drivers to v1.2.8
Included in STM32CubeF7 FW v1.16.0 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 8bc6975 commit bafee17

File tree

84 files changed

+13360
-7838
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

84 files changed

+13360
-7838
lines changed

system/Drivers/STM32F7xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

Lines changed: 347 additions & 22 deletions
Large diffs are not rendered by default.

system/Drivers/STM32F7xx_HAL_Driver/Inc/Legacy/stm32f7xx_hal_can_legacy.h

Lines changed: 22 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,29 @@
66
******************************************************************************
77
* @attention
88
*
9-
* <h2><center>&copy; Copyright (c) 2017 STMicroelectronics.
10-
* All rights reserved.</center></h2>
9+
* <h2><center>&copy; COPYRIGHT(c) 2017 STMicroelectronics</center></h2>
1110
*
12-
* This software component is licensed by ST under BSD 3-Clause license,
13-
* the "License"; You may not use this file except in compliance with the
14-
* License. You may obtain a copy of the License at:
15-
* opensource.org/licenses/BSD-3-Clause
11+
* Redistribution and use in source and binary forms, with or without modification,
12+
* are permitted provided that the following conditions are met:
13+
* 1. Redistributions of source code must retain the above copyright notice,
14+
* this list of conditions and the following disclaimer.
15+
* 2. Redistributions in binary form must reproduce the above copyright notice,
16+
* this list of conditions and the following disclaimer in the documentation
17+
* and/or other materials provided with the distribution.
18+
* 3. Neither the name of STMicroelectronics nor the names of its contributors
19+
* may be used to endorse or promote products derived from this software
20+
* without specific prior written permission.
21+
*
22+
* THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
23+
* AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
24+
* IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
25+
* DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR CONTRIBUTORS BE LIABLE
26+
* FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
27+
* DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
28+
* SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER
29+
* CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
30+
* OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
31+
* OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
1632
*
1733
******************************************************************************
1834
*/

system/Drivers/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_adc.h

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919

2020
/* Define to prevent recursive inclusion -------------------------------------*/
21-
#ifndef __STM32F7xx_ADC_H
22-
#define __STM32F7xx_ADC_H
21+
#ifndef STM32F7xx_ADC_H
22+
#define STM32F7xx_ADC_H
2323

2424
#ifdef __cplusplus
2525
extern "C" {
@@ -416,8 +416,10 @@ typedef void (*pADC_CallbackTypeDef)(ADC_HandleTypeDef *hadc); /*!< pointer to
416416
#define ADC_CHANNEL_17 ((uint32_t)(ADC_CR1_AWDCH_4 | ADC_CR1_AWDCH_0))
417417
#define ADC_CHANNEL_18 ((uint32_t)(ADC_CR1_AWDCH_4 | ADC_CR1_AWDCH_1))
418418

419+
#define ADC_INTERNAL_NONE 0x80000000U
419420
#define ADC_CHANNEL_VREFINT ((uint32_t)ADC_CHANNEL_17)
420421
#define ADC_CHANNEL_VBAT ((uint32_t)ADC_CHANNEL_18)
422+
#define ADC_CHANNEL_TEMPSENSOR ((uint32_t)(ADC_CHANNEL_18 | 0x10000000U))
421423
/**
422424
* @}
423425
*/
@@ -732,6 +734,10 @@ uint32_t HAL_ADC_GetError(ADC_HandleTypeDef *hadc);
732734
*/
733735
#define ADC_CLEAR_ERRORCODE(__HANDLE__) \
734736
((__HANDLE__)->ErrorCode = HAL_ADC_ERROR_NONE)
737+
738+
#define IS_ADC_CHANNEL(CHANNEL) (((CHANNEL) <= ADC_CHANNEL_18) || \
739+
((CHANNEL) == ADC_CHANNEL_TEMPSENSOR) || \
740+
((CHANNEL) == ADC_INTERNAL_NONE))
735741
#define IS_ADC_CLOCKPRESCALER(__ADC_CLOCK__) (((__ADC_CLOCK__) == ADC_CLOCK_SYNC_PCLK_DIV2) || \
736742
((__ADC_CLOCK__) == ADC_CLOCK_SYNC_PCLK_DIV4) || \
737743
((__ADC_CLOCK__) == ADC_CLOCK_SYNC_PCLK_DIV6) || \
@@ -947,7 +953,7 @@ uint32_t HAL_ADC_GetError(ADC_HandleTypeDef *hadc);
947953
}
948954
#endif
949955

950-
#endif /*__STM32F7xx_ADC_H */
956+
#endif /* STM32F7xx_ADC_H */
951957

952958

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

system/Drivers/STM32F7xx_HAL_Driver/Inc/stm32f7xx_hal_adc_ex.h

Lines changed: 4 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
*/
1919

2020
/* Define to prevent recursive inclusion -------------------------------------*/
21-
#ifndef __STM32F7xx_ADC_EX_H
22-
#define __STM32F7xx_ADC_EX_H
21+
#ifndef STM32F7xx_ADC_EX_H
22+
#define STM32F7xx_ADC_EX_H
2323

2424
#ifdef __cplusplus
2525
extern "C" {
@@ -210,7 +210,7 @@ typedef struct
210210
/** @defgroup ADCEx_channels ADC Specific Channels
211211
* @{
212212
*/
213-
#define ADC_CHANNEL_TEMPSENSOR ((uint32_t)ADC_CHANNEL_18 | 0x10000000U)
213+
214214
/**
215215
* @}
216216
*/
@@ -274,8 +274,6 @@ HAL_StatusTypeDef HAL_ADCEx_MultiModeConfigChannel(ADC_HandleTypeDef* hadc, ADC_
274274
/** @defgroup ADCEx_Private_Macros ADC Private Macros
275275
* @{
276276
*/
277-
#define IS_ADC_CHANNEL(CHANNEL) (((CHANNEL) <= ADC_CHANNEL_18) || \
278-
((CHANNEL) == ADC_CHANNEL_TEMPSENSOR))
279277

280278
#define IS_ADC_MODE(__MODE__) (((__MODE__) == ADC_MODE_INDEPENDENT) || \
281279
((__MODE__) == ADC_DUALMODE_REGSIMULT_INJECSIMULT) || \
@@ -352,7 +350,7 @@ HAL_StatusTypeDef HAL_ADCEx_MultiModeConfigChannel(ADC_HandleTypeDef* hadc, ADC_
352350
}
353351
#endif
354352

355-
#endif /*__STM32F7xx_ADC_EX_H */
353+
#endif /* STM32F7xx_ADC_EX_H */
356354

357355

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

0 commit comments

Comments
 (0)