Skip to content

Commit 4f19f7f

Browse files
fpistmfpistm
committed
system: L0: update STM32L0xx HAL Drivers to v1.10.5
Included in STM32CubeL0 FW v1.12.1 Signed-off-by: Frederic Pillon <frederic.pillon@st.com>
1 parent 5e72ff9 commit 4f19f7f

File tree

79 files changed

+3388
-2249
lines changed

Some content is hidden

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

79 files changed

+3388
-2249
lines changed

‎system/Drivers/STM32L0xx_HAL_Driver/Inc/Legacy/stm32_hal_legacy.h

Lines changed: 167 additions & 110 deletions
Large diffs are not rendered by default.

‎system/Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal_crc.h

Lines changed: 28 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -60,19 +60,22 @@ typedef struct
6060
{
6161
uint8_t DefaultPolynomialUse; /*!< This parameter is a value of @ref CRC_Default_Polynomial and indicates if default polynomial is used.
6262
If set to DEFAULT_POLYNOMIAL_ENABLE, resort to default
63-
X^32 + X^26 + X^23 + X^22 + X^16 + X^12 + X^11 + X^10 +X^8 + X^7 + X^5 + X^4 + X^2+ X +1.
63+
X^32 + X^26 + X^23 + X^22 + X^16 + X^12 + X^11 + X^10 +X^8 + X^7 + X^5 +
64+
X^4 + X^2+ X +1.
6465
In that case, there is no need to set GeneratingPolynomial field.
65-
If otherwise set to DEFAULT_POLYNOMIAL_DISABLE, GeneratingPolynomial and CRCLength fields must be set. */
66+
If otherwise set to DEFAULT_POLYNOMIAL_DISABLE, GeneratingPolynomial and
67+
CRCLength fields must be set. */
6668

6769
uint8_t DefaultInitValueUse; /*!< This parameter is a value of @ref CRC_Default_InitValue_Use and indicates if default init value is used.
6870
If set to DEFAULT_INIT_VALUE_ENABLE, resort to default
69-
0xFFFFFFFF value. In that case, there is no need to set InitValue field.
70-
If otherwise set to DEFAULT_INIT_VALUE_DISABLE, InitValue field must be set. */
71+
0xFFFFFFFF value. In that case, there is no need to set InitValue field. If
72+
otherwise set to DEFAULT_INIT_VALUE_DISABLE, InitValue field must be set. */
7173

7274
uint32_t GeneratingPolynomial; /*!< Set CRC generating polynomial as a 7, 8, 16 or 32-bit long value for a polynomial degree
73-
respectively equal to 7, 8, 16 or 32. This field is written in normal representation,
74-
e.g., for a polynomial of degree 7, X^7 + X^6 + X^5 + X^2 + 1 is written 0x65.
75-
No need to specify it if DefaultPolynomialUse is set to DEFAULT_POLYNOMIAL_ENABLE. */
75+
respectively equal to 7, 8, 16 or 32. This field is written in normal,
76+
representation e.g., for a polynomial of degree 7, X^7 + X^6 + X^5 + X^2 + 1
77+
is written 0x65. No need to specify it if DefaultPolynomialUse is set to
78+
DEFAULT_POLYNOMIAL_ENABLE. */
7679

7780
uint32_t CRCLength; /*!< This parameter is a value of @ref CRC_Polynomial_Sizes and indicates CRC length.
7881
Value can be either one of
@@ -87,14 +90,18 @@ typedef struct
8790
uint32_t InputDataInversionMode; /*!< This parameter is a value of @ref CRCEx_Input_Data_Inversion and specifies input data inversion mode.
8891
Can be either one of the following values
8992
@arg @ref CRC_INPUTDATA_INVERSION_NONE no input data inversion
90-
@arg @ref CRC_INPUTDATA_INVERSION_BYTE byte-wise inversion, 0x1A2B3C4D becomes 0x58D43CB2
91-
@arg @ref CRC_INPUTDATA_INVERSION_HALFWORD halfword-wise inversion, 0x1A2B3C4D becomes 0xD458B23C
92-
@arg @ref CRC_INPUTDATA_INVERSION_WORD word-wise inversion, 0x1A2B3C4D becomes 0xB23CD458 */
93+
@arg @ref CRC_INPUTDATA_INVERSION_BYTE byte-wise inversion, 0x1A2B3C4D
94+
becomes 0x58D43CB2
95+
@arg @ref CRC_INPUTDATA_INVERSION_HALFWORD halfword-wise inversion,
96+
0x1A2B3C4D becomes 0xD458B23C
97+
@arg @ref CRC_INPUTDATA_INVERSION_WORD word-wise inversion, 0x1A2B3C4D
98+
becomes 0xB23CD458 */
9399

94100
uint32_t OutputDataInversionMode; /*!< This parameter is a value of @ref CRCEx_Output_Data_Inversion and specifies output data (i.e. CRC) inversion mode.
95101
Can be either
96102
@arg @ref CRC_OUTPUTDATA_INVERSION_DISABLE no CRC inversion,
97-
@arg @ref CRC_OUTPUTDATA_INVERSION_ENABLE CRC 0x11223344 is converted into 0x22CC4488 */
103+
@arg @ref CRC_OUTPUTDATA_INVERSION_ENABLE CRC 0x11223344 is converted
104+
into 0x22CC4488 */
98105
} CRC_InitTypeDef;
99106

100107
/**
@@ -112,12 +119,16 @@ typedef struct
112119

113120
uint32_t InputDataFormat; /*!< This parameter is a value of @ref CRC_Input_Buffer_Format and specifies input data format.
114121
Can be either
115-
@arg @ref CRC_INPUTDATA_FORMAT_BYTES input data is a stream of bytes (8-bit data)
116-
@arg @ref CRC_INPUTDATA_FORMAT_HALFWORDS input data is a stream of half-words (16-bit data)
117-
@arg @ref CRC_INPUTDATA_FORMAT_WORDS input data is a stream of words (32-bit data)
118-
119-
Note that constant CRC_INPUT_FORMAT_UNDEFINED is defined but an initialization error
120-
must occur if InputBufferFormat is not one of the three values listed above */
122+
@arg @ref CRC_INPUTDATA_FORMAT_BYTES input data is a stream of bytes
123+
(8-bit data)
124+
@arg @ref CRC_INPUTDATA_FORMAT_HALFWORDS input data is a stream of
125+
half-words (16-bit data)
126+
@arg @ref CRC_INPUTDATA_FORMAT_WORDS input data is a stream of words
127+
(32-bit data)
128+
129+
Note that constant CRC_INPUT_FORMAT_UNDEFINED is defined but an initialization
130+
error must occur if InputBufferFormat is not one of the three values listed
131+
above */
121132
} CRC_HandleTypeDef;
122133
/**
123134
* @}
@@ -199,15 +210,6 @@ typedef struct
199210
* @}
200211
*/
201212

202-
/** @defgroup CRC_Aliases CRC API aliases
203-
* @{
204-
*/
205-
#define HAL_CRC_Input_Data_Reverse HAL_CRCEx_Input_Data_Reverse /*!< Aliased to HAL_CRCEx_Input_Data_Reverse for inter STM32 series compatibility */
206-
#define HAL_CRC_Output_Data_Reverse HAL_CRCEx_Output_Data_Reverse /*!< Aliased to HAL_CRCEx_Output_Data_Reverse for inter STM32 series compatibility */
207-
/**
208-
* @}
209-
*/
210-
211213
/**
212214
* @}
213215
*/

‎system/Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal_cryp.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -125,7 +125,7 @@ typedef struct
125125
/** @defgroup CRYP_Data_Type CRYP Data Type
126126
* @{
127127
*/
128-
#define CRYP_DATATYPE_32B ((uint32_t)0x00000000U)
128+
#define CRYP_DATATYPE_32B (0x00000000U)
129129
#define CRYP_DATATYPE_16B AES_CR_DATATYPE_0
130130
#define CRYP_DATATYPE_8B AES_CR_DATATYPE_1
131131
#define CRYP_DATATYPE_1B AES_CR_DATATYPE
@@ -143,7 +143,7 @@ typedef struct
143143
*/
144144
#define CRYP_CR_ALGOMODE_DIRECTION (uint32_t)(AES_CR_MODE|AES_CR_CHMOD)
145145

146-
#define CRYP_CR_ALGOMODE_AES_ECB_ENCRYPT ((uint32_t)0x00000000U)
146+
#define CRYP_CR_ALGOMODE_AES_ECB_ENCRYPT (0x00000000U)
147147
#define CRYP_CR_ALGOMODE_AES_ECB_KEYDERDECRYPT (AES_CR_MODE)
148148
#define CRYP_CR_ALGOMODE_AES_CBC_ENCRYPT (AES_CR_CHMOD_0)
149149
#define CRYP_CR_ALGOMODE_AES_CBC_KEYDERDECRYPT ((uint32_t)(AES_CR_CHMOD_0|AES_CR_MODE))

‎system/Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal_dac.h

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,7 +63,7 @@ typedef enum
6363
#if (USE_HAL_DAC_REGISTER_CALLBACKS == 1)
6464
typedef struct __DAC_HandleTypeDef
6565
#else
66-
typedef struct DAC_HandleTypeDef
66+
typedef struct
6767
#endif
6868
{
6969
DAC_TypeDef *Instance; /*!< Register base address */
@@ -74,7 +74,7 @@ typedef struct DAC_HandleTypeDef
7474

7575
DMA_HandleTypeDef *DMA_Handle1; /*!< Pointer DMA handler for channel 1 */
7676

77-
#if defined (STM32L072xx) || defined (STM32L073xx) || defined (STM32L082xx) || defined (STM32L083xx)
77+
#if defined (DAC_CHANNEL2_SUPPORT)
7878
DMA_HandleTypeDef *DMA_Handle2; /*!< Pointer DMA handler for channel 2 */
7979
#endif
8080

@@ -149,7 +149,7 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
149149
*/
150150
#define HAL_DAC_ERROR_NONE 0x00U /*!< No error */
151151
#define HAL_DAC_ERROR_DMAUNDERRUNCH1 0x01U /*!< DAC channel1 DMA underrun error */
152-
#if defined (STM32L072xx) || defined (STM32L073xx) || defined (STM32L082xx) || defined (STM32L083xx)
152+
#if defined (DAC_CHANNEL2_SUPPORT)
153153
#define HAL_DAC_ERROR_DMAUNDERRUNCH2 0x02U /*!< DAC channel2 DMA underrun error */
154154
#endif
155155
#define HAL_DAC_ERROR_DMA 0x04U /*!< DMA error */
@@ -171,13 +171,13 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
171171
#define DAC_TRIGGER_EXT_IT9 ((uint32_t)(DAC_CR_TSEL1_2 | DAC_CR_TSEL1_1 | DAC_CR_TEN1)) /*!< EXTI Line9 event selected as external conversion trigger for DAC channel */
172172
#define DAC_TRIGGER_SOFTWARE ((uint32_t)(DAC_CR_TSEL1_2 | DAC_CR_TSEL1_1 | DAC_CR_TSEL1_0 | DAC_CR_TEN1)) /*!< Conversion started by software trigger for DAC channel */
173173

174-
#if defined (STM32L072xx) || defined (STM32L073xx) || defined (STM32L082xx) || defined (STM32L083xx)
174+
#if defined (DAC_CHANNEL2_SUPPORT)
175175
#define DAC_TRIGGER_T3_TRGO ((uint32_t)( DAC_CR_TSEL1_0 | DAC_CR_TEN1)) /*!< TIM3 TRGO selected as external conversion trigger for DAC channel */
176176
#define DAC_TRIGGER_T3_CH3 ((uint32_t)( DAC_CR_TSEL1_1 | DAC_CR_TEN1)) /*!< TIM3 CH3 selected as external conversion trigger for DAC channel */
177177
#define DAC_TRIGGER_T7_TRGO ((uint32_t)(DAC_CR_TSEL1_2 | DAC_CR_TSEL1_0 | DAC_CR_TEN1)) /*!< TIM7 TRGO selected as external conversion trigger for DAC channel */
178178
#endif
179179

180-
#if defined (STM32L072xx) || defined (STM32L073xx) || defined (STM32L082xx) || defined (STM32L083xx)
180+
#if defined (DAC_CHANNEL2_SUPPORT)
181181
#define IS_DAC_TRIGGER(TRIGGER) (((TRIGGER) == DAC_TRIGGER_NONE) || \
182182
((TRIGGER) == DAC_TRIGGER_T6_TRGO) || \
183183
((TRIGGER) == DAC_TRIGGER_T3_TRGO) || \
@@ -187,14 +187,14 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
187187
((TRIGGER) == DAC_TRIGGER_T2_TRGO) || \
188188
((TRIGGER) == DAC_TRIGGER_EXT_IT9) || \
189189
((TRIGGER) == DAC_TRIGGER_SOFTWARE))
190-
#else /* STM32L072xx || STM32L073xx || STM32L082xx || STM32L083xx */
190+
#else
191191
#define IS_DAC_TRIGGER(TRIGGER) (((TRIGGER) == DAC_TRIGGER_NONE) || \
192192
((TRIGGER) == DAC_TRIGGER_T6_TRGO) || \
193193
((TRIGGER) == DAC_TRIGGER_T21_TRGO) || \
194194
((TRIGGER) == DAC_TRIGGER_T2_TRGO) || \
195195
((TRIGGER) == DAC_TRIGGER_EXT_IT9) || \
196196
((TRIGGER) == DAC_TRIGGER_SOFTWARE))
197-
#endif /* STM32L072xx || STM32L073xx || STM32L082xx || STM32L083xx */
197+
#endif /* DAC_CHANNEL2_SUPPORT */
198198
/**
199199
* @}
200200
*/
@@ -215,11 +215,11 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
215215
* @{
216216
*/
217217
#define DAC_CHANNEL_1 (0x00000000U)
218-
#if defined (STM32L072xx) || defined (STM32L073xx) || defined (STM32L082xx) || defined (STM32L083xx)
218+
#if defined (DAC_CHANNEL2_SUPPORT)
219219
#define DAC_CHANNEL_2 (0x00000010U)
220220
#endif
221221

222-
#if defined (STM32L072xx) || defined (STM32L073xx) || defined (STM32L082xx) || defined (STM32L083xx)
222+
#if defined (DAC_CHANNEL2_SUPPORT)
223223
#define IS_DAC_CHANNEL(CHANNEL) (((CHANNEL) == DAC_CHANNEL_1) || \
224224
((CHANNEL) == DAC_CHANNEL_2))
225225
#else
@@ -255,7 +255,7 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
255255
* @{
256256
*/
257257
#define DAC_FLAG_DMAUDR1 (DAC_SR_DMAUDR1)
258-
#if defined (STM32L072xx) || defined (STM32L073xx) || defined (STM32L082xx) || defined (STM32L083xx)
258+
#if defined (DAC_CHANNEL2_SUPPORT)
259259
#define DAC_FLAG_DMAUDR2 (DAC_SR_DMAUDR2)
260260
#endif
261261

@@ -267,7 +267,7 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
267267
* @{
268268
*/
269269
#define DAC_IT_DMAUDR1 (DAC_SR_DMAUDR1)
270-
#if defined (STM32L072xx) || defined (STM32L073xx) || defined (STM32L082xx) || defined (STM32L083xx)
270+
#if defined (DAC_CHANNEL2_SUPPORT)
271271
#define DAC_IT_DMAUDR2 (DAC_SR_DMAUDR2)
272272
#endif
273273

‎system/Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal_dac_ex.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -122,7 +122,7 @@
122122
HAL_StatusTypeDef HAL_DACEx_TriangleWaveGenerate(DAC_HandleTypeDef* hdac, uint32_t Channel, uint32_t Amplitude);
123123
HAL_StatusTypeDef HAL_DACEx_NoiseWaveGenerate(DAC_HandleTypeDef* hdac, uint32_t Channel, uint32_t Amplitude);
124124

125-
#if defined (STM32L072xx) || defined (STM32L073xx) || defined (STM32L082xx) || defined (STM32L083xx)
125+
#if defined (DAC_CHANNEL2_SUPPORT)
126126
uint32_t HAL_DACEx_DualGetValue(DAC_HandleTypeDef* hdac);
127127
HAL_StatusTypeDef HAL_DACEx_DualSetValue(DAC_HandleTypeDef* hdac, uint32_t Alignment, uint32_t Data1, uint32_t Data2);
128128
void HAL_DACEx_ConvCpltCallbackCh2(DAC_HandleTypeDef* hdac);

‎system/Drivers/STM32L0xx_HAL_Driver/Inc/stm32l0xx_hal_gpio.h

Lines changed: 35 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -129,29 +129,28 @@ typedef enum
129129

130130
/** @defgroup GPIO_mode_define Mode definition
131131
* @brief GPIO Configuration Mode
132-
* Elements values convention: 0xX0yz00YZ
133-
* - X : GPIO mode or EXTI Mode
134-
* - y : External IT or Event trigger detection
135-
* - z : IO configuration on External IT or Event
136-
* - Y : Output type (Push Pull or Open Drain)
137-
* - Z : IO Direction mode (Input, Output, Alternate or Analog)
132+
* Elements values convention: 0x00WX00YZ
133+
* - W : EXTI trigger detection on 3 bits
134+
* - X : EXTI mode (IT or Event) on 2 bits
135+
* - Y : Output type (Push Pull or Open Drain) on 1 bit
136+
* - Z : GPIO mode (Input, Output, Alternate or Analog) on 2 bits
138137
* @{
139138
*/
140-
#define GPIO_MODE_INPUT (0x00000000U) /*!< Input Floating Mode */
141-
#define GPIO_MODE_OUTPUT_PP (0x00000001U) /*!< Output Push Pull Mode */
142-
#define GPIO_MODE_OUTPUT_OD (0x00000011U) /*!< Output Open Drain Mode */
143-
#define GPIO_MODE_AF_PP (0x00000002U) /*!< Alternate Function Push Pull Mode */
144-
#define GPIO_MODE_AF_OD (0x00000012U) /*!< Alternate Function Open Drain Mode */
139+
#define GPIO_MODE_INPUT MODE_INPUT /*!< Input Floating Mode */
140+
#define GPIO_MODE_OUTPUT_PP (MODE_OUTPUT | OUTPUT_PP) /*!< Output Push Pull Mode */
141+
#define GPIO_MODE_OUTPUT_OD (MODE_OUTPUT | OUTPUT_OD) /*!< Output Open Drain Mode */
142+
#define GPIO_MODE_AF_PP (MODE_AF | OUTPUT_PP) /*!< Alternate Function Push Pull Mode */
143+
#define GPIO_MODE_AF_OD (MODE_AF | OUTPUT_OD) /*!< Alternate Function Open Drain Mode */
145144

146-
#define GPIO_MODE_ANALOG (0x00000003U) /*!< Analog Mode */
145+
#define GPIO_MODE_ANALOG MODE_ANALOG /*!< Analog Mode */
147146

148-
#define GPIO_MODE_IT_RISING (0x10110000U) /*!< External Interrupt Mode with Rising edge trigger detection */
149-
#define GPIO_MODE_IT_FALLING (0x10210000U) /*!< External Interrupt Mode with Falling edge trigger detection */
150-
#define GPIO_MODE_IT_RISING_FALLING (0x10310000U) /*!< External Interrupt Mode with Rising/Falling edge trigger detection */
147+
#define GPIO_MODE_IT_RISING (MODE_INPUT | EXTI_IT | TRIGGER_RISING) /*!< External Interrupt Mode with Rising edge trigger detection */
148+
#define GPIO_MODE_IT_FALLING (MODE_INPUT | EXTI_IT | TRIGGER_FALLING) /*!< External Interrupt Mode with Falling edge trigger detection */
149+
#define GPIO_MODE_IT_RISING_FALLING (MODE_INPUT | EXTI_IT | TRIGGER_RISING | TRIGGER_FALLING) /*!< External Interrupt Mode with Rising/Falling edge trigger detection */
151150

152-
#define GPIO_MODE_EVT_RISING (0x10120000U) /*!< External Event Mode with Rising edge trigger detection */
153-
#define GPIO_MODE_EVT_FALLING (0x10220000U) /*!< External Event Mode with Falling edge trigger detection */
154-
#define GPIO_MODE_EVT_RISING_FALLING (0x10320000U) /*!< External Event Mode with Rising/Falling edge trigger detection */
151+
#define GPIO_MODE_EVT_RISING (MODE_INPUT | EXTI_EVT | TRIGGER_RISING) /*!< External Event Mode with Rising edge trigger detection */
152+
#define GPIO_MODE_EVT_FALLING (MODE_INPUT | EXTI_EVT | TRIGGER_FALLING) /*!< External Event Mode with Falling edge trigger detection */
153+
#define GPIO_MODE_EVT_RISING_FALLING (MODE_INPUT | EXTI_EVT | TRIGGER_RISING | TRIGGER_FALLING) /*!< External Event Mode with Rising/Falling edge trigger detection */
155154

156155
/**
157156
* @}
@@ -302,6 +301,24 @@ void HAL_GPIO_EXTI_Callback(uint16_t GPIO_Pin);
302301
/** @defgroup GPIO_Private GPIO Private
303302
* @{
304303
*/
304+
#define GPIO_MODE_Pos 0U
305+
#define GPIO_MODE (0x3UL << GPIO_MODE_Pos)
306+
#define MODE_INPUT (0x0UL << GPIO_MODE_Pos)
307+
#define MODE_OUTPUT (0x1UL << GPIO_MODE_Pos)
308+
#define MODE_AF (0x2UL << GPIO_MODE_Pos)
309+
#define MODE_ANALOG (0x3UL << GPIO_MODE_Pos)
310+
#define OUTPUT_TYPE_Pos 4U
311+
#define OUTPUT_TYPE (0x1UL << OUTPUT_TYPE_Pos)
312+
#define OUTPUT_PP (0x0UL << OUTPUT_TYPE_Pos)
313+
#define OUTPUT_OD (0x1UL << OUTPUT_TYPE_Pos)
314+
#define EXTI_MODE_Pos 16U
315+
#define EXTI_MODE (0x3UL << EXTI_MODE_Pos)
316+
#define EXTI_IT (0x1UL << EXTI_MODE_Pos)
317+
#define EXTI_EVT (0x2UL << EXTI_MODE_Pos)
318+
#define TRIGGER_MODE_Pos 20U
319+
#define TRIGGER_MODE (0x7UL << TRIGGER_MODE_Pos)
320+
#define TRIGGER_RISING (0x1UL << TRIGGER_MODE_Pos)
321+
#define TRIGGER_FALLING (0x2UL << TRIGGER_MODE_Pos)
305322
/**
306323
* @}
307324
*/

0 commit comments

Comments
 (0)