@@ -64,7 +64,7 @@ typedef enum
64
64
typedef struct __DAC_HandleTypeDef
65
65
#else
66
66
typedef struct
67
- #endif
67
+ #endif /* USE_HAL_DAC_REGISTER_CALLBACKS */
68
68
{
69
69
DAC_TypeDef * Instance ; /*!< Register base address */
70
70
@@ -79,22 +79,23 @@ typedef struct
79
79
__IO uint32_t ErrorCode ; /*!< DAC Error code */
80
80
81
81
#if (USE_HAL_DAC_REGISTER_CALLBACKS == 1 )
82
- void (* ConvCpltCallbackCh1 )(struct __DAC_HandleTypeDef * hdac );
83
- void (* ConvHalfCpltCallbackCh1 )(struct __DAC_HandleTypeDef * hdac );
84
- void (* ErrorCallbackCh1 )(struct __DAC_HandleTypeDef * hdac );
85
- void (* DMAUnderrunCallbackCh1 )(struct __DAC_HandleTypeDef * hdac );
86
- void (* ConvCpltCallbackCh2 )(struct __DAC_HandleTypeDef * hdac );
87
- void (* ConvHalfCpltCallbackCh2 )(struct __DAC_HandleTypeDef * hdac );
88
- void (* ErrorCallbackCh2 )(struct __DAC_HandleTypeDef * hdac );
89
- void (* DMAUnderrunCallbackCh2 )(struct __DAC_HandleTypeDef * hdac );
90
-
91
- void (* MspInitCallback )(struct __DAC_HandleTypeDef * hdac );
92
- void (* MspDeInitCallback )(struct __DAC_HandleTypeDef * hdac );
82
+ void (* ConvCpltCallbackCh1 ) (struct __DAC_HandleTypeDef * hdac );
83
+ void (* ConvHalfCpltCallbackCh1 ) (struct __DAC_HandleTypeDef * hdac );
84
+ void (* ErrorCallbackCh1 ) (struct __DAC_HandleTypeDef * hdac );
85
+ void (* DMAUnderrunCallbackCh1 ) (struct __DAC_HandleTypeDef * hdac );
86
+
87
+ void (* ConvCpltCallbackCh2 ) (struct __DAC_HandleTypeDef * hdac );
88
+ void (* ConvHalfCpltCallbackCh2 ) (struct __DAC_HandleTypeDef * hdac );
89
+ void (* ErrorCallbackCh2 ) (struct __DAC_HandleTypeDef * hdac );
90
+ void (* DMAUnderrunCallbackCh2 ) (struct __DAC_HandleTypeDef * hdac );
91
+
92
+
93
+ void (* MspInitCallback ) (struct __DAC_HandleTypeDef * hdac );
94
+ void (* MspDeInitCallback ) (struct __DAC_HandleTypeDef * hdac );
93
95
#endif /* USE_HAL_DAC_REGISTER_CALLBACKS */
94
96
95
97
} DAC_HandleTypeDef ;
96
98
97
-
98
99
/**
99
100
* @brief DAC Configuration regular Channel structure definition
100
101
*/
@@ -118,10 +119,12 @@ typedef enum
118
119
HAL_DAC_CH1_HALF_COMPLETE_CB_ID = 0x01U , /*!< DAC CH1 half Complete Callback ID */
119
120
HAL_DAC_CH1_ERROR_ID = 0x02U , /*!< DAC CH1 error Callback ID */
120
121
HAL_DAC_CH1_UNDERRUN_CB_ID = 0x03U , /*!< DAC CH1 underrun Callback ID */
122
+
121
123
HAL_DAC_CH2_COMPLETE_CB_ID = 0x04U , /*!< DAC CH2 Complete Callback ID */
122
124
HAL_DAC_CH2_HALF_COMPLETE_CB_ID = 0x05U , /*!< DAC CH2 half Complete Callback ID */
123
125
HAL_DAC_CH2_ERROR_ID = 0x06U , /*!< DAC CH2 error Callback ID */
124
126
HAL_DAC_CH2_UNDERRUN_CB_ID = 0x07U , /*!< DAC CH2 underrun Callback ID */
127
+
125
128
HAL_DAC_MSPINIT_CB_ID = 0x08U , /*!< DAC MspInit Callback ID */
126
129
HAL_DAC_MSPDEINIT_CB_ID = 0x09U , /*!< DAC MspDeInit Callback ID */
127
130
HAL_DAC_ALL_CB_ID = 0x0AU /*!< DAC All ID */
@@ -162,7 +165,7 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
162
165
/** @defgroup DAC_trigger_selection DAC trigger selection
163
166
* @{
164
167
*/
165
- #define DAC_TRIGGER_NONE 0x00000000U /*!< Conversion is automatic once the DAC1_DHRxxxx register has been loaded, and not by external trigger */
168
+ #define DAC_TRIGGER_NONE 0x00000000UL /*!< Conversion is automatic once the DAC1_DHRxxxx register has been loaded, and not by external trigger */
166
169
#define DAC_TRIGGER_T6_TRGO (DAC_CR_TEN1) /*!< Conversion started by software trigger for DAC channel */
167
170
#define DAC_TRIGGER_T7_TRGO ( DAC_CR_TSEL1_1 | DAC_CR_TEN1) /*!< TIM7 TRGO selected as external conversion trigger for DAC channel */
168
171
#define DAC_TRIGGER_T9_TRGO ( DAC_CR_TSEL1_1 | DAC_CR_TSEL1_0 | DAC_CR_TEN1) /*!< TIM9 TRGO selected as external conversion trigger for DAC channel */
@@ -189,7 +192,9 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
189
192
* @{
190
193
*/
191
194
#define DAC_CHANNEL_1 0x00000000U
195
+
192
196
#define DAC_CHANNEL_2 0x00000010U
197
+
193
198
/**
194
199
* @}
195
200
*/
@@ -209,8 +214,10 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
209
214
* @{
210
215
*/
211
216
#define DAC_FLAG_DMAUDR1 (DAC_SR_DMAUDR1)
217
+
212
218
#define DAC_FLAG_DMAUDR2 (DAC_SR_DMAUDR2)
213
219
220
+
214
221
/**
215
222
* @}
216
223
*/
@@ -219,8 +226,10 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
219
226
* @{
220
227
*/
221
228
#define DAC_IT_DMAUDR1 (DAC_SR_DMAUDR1)
229
+
222
230
#define DAC_IT_DMAUDR2 (DAC_SR_DMAUDR2)
223
231
232
+
224
233
/**
225
234
* @}
226
235
*/
@@ -242,8 +251,8 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
242
251
#if (USE_HAL_DAC_REGISTER_CALLBACKS == 1 )
243
252
#define __HAL_DAC_RESET_HANDLE_STATE (__HANDLE__ ) do { \
244
253
(__HANDLE__)->State = HAL_DAC_STATE_RESET; \
245
- (__HANDLE__)->MspInitCallback = NULL; \
246
- (__HANDLE__)->MspDeInitCallback = NULL; \
254
+ (__HANDLE__)->MspInitCallback = NULL; \
255
+ (__HANDLE__)->MspDeInitCallback = NULL; \
247
256
} while(0)
248
257
#else
249
258
#define __HAL_DAC_RESET_HANDLE_STATE (__HANDLE__ ) ((__HANDLE__)->State = HAL_DAC_STATE_RESET)
@@ -269,26 +278,28 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
269
278
* @param __ALIGNMENT__ specifies the DAC alignment
270
279
* @retval None
271
280
*/
272
- #define DAC_DHR12R1_ALIGNMENT (__ALIGNMENT__ ) (0x00000008U + (__ALIGNMENT__))
281
+ #define DAC_DHR12R1_ALIGNMENT (__ALIGNMENT__ ) (0x00000008UL + (__ALIGNMENT__))
282
+
273
283
274
284
/** @brief Set DHR12R2 alignment.
275
285
* @param __ALIGNMENT__ specifies the DAC alignment
276
286
* @retval None
277
287
*/
278
- #define DAC_DHR12R2_ALIGNMENT (__ALIGNMENT__ ) (0x00000014U + (__ALIGNMENT__))
288
+ #define DAC_DHR12R2_ALIGNMENT (__ALIGNMENT__ ) (0x00000014UL + (__ALIGNMENT__))
289
+
279
290
280
291
/** @brief Set DHR12RD alignment.
281
292
* @param __ALIGNMENT__ specifies the DAC alignment
282
293
* @retval None
283
294
*/
284
- #define DAC_DHR12RD_ALIGNMENT (__ALIGNMENT__ ) (0x00000020U + (__ALIGNMENT__))
295
+ #define DAC_DHR12RD_ALIGNMENT (__ALIGNMENT__ ) (0x00000020UL + (__ALIGNMENT__))
285
296
286
297
/** @brief Enable the DAC interrupt.
287
298
* @param __HANDLE__ specifies the DAC handle
288
299
* @param __INTERRUPT__ specifies the DAC interrupt.
289
300
* This parameter can be any combination of the following values:
290
- * @arg DAC_IT_DMAUDR1: DAC channel 1 DMA underrun interrupt
291
- * @arg DAC_IT_DMAUDR2: DAC channel 2 DMA underrun interrupt
301
+ * @arg DAC_IT_DMAUDR1 DAC channel 1 DMA underrun interrupt
302
+ * @arg DAC_IT_DMAUDR2 DAC channel 2 DMA underrun interrupt
292
303
* @retval None
293
304
*/
294
305
#define __HAL_DAC_ENABLE_IT (__HANDLE__ , __INTERRUPT__ ) (((__HANDLE__)->Instance->CR) |= (__INTERRUPT__))
@@ -297,8 +308,8 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
297
308
* @param __HANDLE__ specifies the DAC handle
298
309
* @param __INTERRUPT__ specifies the DAC interrupt.
299
310
* This parameter can be any combination of the following values:
300
- * @arg DAC_IT_DMAUDR1: DAC channel 1 DMA underrun interrupt
301
- * @arg DAC_IT_DMAUDR2: DAC channel 2 DMA underrun interrupt
311
+ * @arg DAC_IT_DMAUDR1 DAC channel 1 DMA underrun interrupt
312
+ * @arg DAC_IT_DMAUDR2 DAC channel 2 DMA underrun interrupt
302
313
* @retval None
303
314
*/
304
315
#define __HAL_DAC_DISABLE_IT (__HANDLE__ , __INTERRUPT__ ) (((__HANDLE__)->Instance->CR) &= ~(__INTERRUPT__))
@@ -307,18 +318,19 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
307
318
* @param __HANDLE__ DAC handle
308
319
* @param __INTERRUPT__ DAC interrupt source to check
309
320
* This parameter can be any combination of the following values:
310
- * @arg DAC_IT_DMAUDR1: DAC channel 1 DMA underrun interrupt
311
- * @arg DAC_IT_DMAUDR2: DAC channel 2 DMA underrun interrupt
321
+ * @arg DAC_IT_DMAUDR1 DAC channel 1 DMA underrun interrupt
322
+ * @arg DAC_IT_DMAUDR2 DAC channel 2 DMA underrun interrupt
312
323
* @retval State of interruption (SET or RESET)
313
324
*/
314
- #define __HAL_DAC_GET_IT_SOURCE (__HANDLE__ , __INTERRUPT__ ) (((__HANDLE__)->Instance->CR & (__INTERRUPT__)) == (__INTERRUPT__))
325
+ #define __HAL_DAC_GET_IT_SOURCE (__HANDLE__ , __INTERRUPT__ ) (((__HANDLE__)->Instance->CR\
326
+ & (__INTERRUPT__)) == (__INTERRUPT__))
315
327
316
328
/** @brief Get the selected DAC's flag status.
317
329
* @param __HANDLE__ specifies the DAC handle.
318
330
* @param __FLAG__ specifies the DAC flag to get.
319
331
* This parameter can be any combination of the following values:
320
- * @arg DAC_FLAG_DMAUDR1: DAC channel 1 DMA underrun flag
321
- * @arg DAC_FLAG_DMAUDR2: DAC channel 2 DMA underrun flag
332
+ * @arg DAC_FLAG_DMAUDR1 DAC channel 1 DMA underrun flag
333
+ * @arg DAC_FLAG_DMAUDR2 DAC channel 2 DMA underrun flag
322
334
* @retval None
323
335
*/
324
336
#define __HAL_DAC_GET_FLAG (__HANDLE__ , __FLAG__ ) ((((__HANDLE__)->Instance->SR) & (__FLAG__)) == (__FLAG__))
@@ -327,8 +339,8 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
327
339
* @param __HANDLE__ specifies the DAC handle.
328
340
* @param __FLAG__ specifies the DAC flag to clear.
329
341
* This parameter can be any combination of the following values:
330
- * @arg DAC_FLAG_DMAUDR1: DAC channel 1 DMA underrun flag
331
- * @arg DAC_FLAG_DMAUDR2: DAC channel 2 DMA underrun flag
342
+ * @arg DAC_FLAG_DMAUDR1 DAC channel 1 DMA underrun flag
343
+ * @arg DAC_FLAG_DMAUDR2 DAC channel 2 DMA underrun flag
332
344
* @retval None
333
345
*/
334
346
#define __HAL_DAC_CLEAR_FLAG (__HANDLE__ , __FLAG__ ) (((__HANDLE__)->Instance->SR) = (__FLAG__))
@@ -352,7 +364,7 @@ typedef void (*pDAC_CallbackTypeDef)(DAC_HandleTypeDef *hdac);
352
364
((ALIGN) == DAC_ALIGN_12B_L) || \
353
365
((ALIGN) == DAC_ALIGN_8B_R))
354
366
355
- #define IS_DAC_DATA (DATA ) ((DATA) <= 0xFFF0U )
367
+ #define IS_DAC_DATA (DATA ) ((DATA) <= 0xFFF0UL )
356
368
357
369
/**
358
370
* @}
@@ -389,9 +401,7 @@ HAL_StatusTypeDef HAL_DAC_Stop(DAC_HandleTypeDef *hdac, uint32_t Channel);
389
401
HAL_StatusTypeDef HAL_DAC_Start_DMA (DAC_HandleTypeDef * hdac , uint32_t Channel , uint32_t * pData , uint32_t Length ,
390
402
uint32_t Alignment );
391
403
HAL_StatusTypeDef HAL_DAC_Stop_DMA (DAC_HandleTypeDef * hdac , uint32_t Channel );
392
-
393
404
void HAL_DAC_IRQHandler (DAC_HandleTypeDef * hdac );
394
-
395
405
HAL_StatusTypeDef HAL_DAC_SetValue (DAC_HandleTypeDef * hdac , uint32_t Channel , uint32_t Alignment , uint32_t Data );
396
406
397
407
void HAL_DAC_ConvCpltCallbackCh1 (DAC_HandleTypeDef * hdac );
@@ -415,7 +425,6 @@ HAL_StatusTypeDef HAL_DAC_UnRegisterCallback(DAC_HandleTypeDef *hdac, HAL_DA
415
425
*/
416
426
/* Peripheral Control functions ***********************************************/
417
427
uint32_t HAL_DAC_GetValue (DAC_HandleTypeDef * hdac , uint32_t Channel );
418
-
419
428
HAL_StatusTypeDef HAL_DAC_ConfigChannel (DAC_HandleTypeDef * hdac , DAC_ChannelConfTypeDef * sConfig , uint32_t Channel );
420
429
/**
421
430
* @}
@@ -461,7 +470,6 @@ void DAC_DMAHalfConvCpltCh1(DMA_HandleTypeDef *hdma);
461
470
#endif
462
471
463
472
464
- #endif /*STM32L1xx_HAL_DAC_H */
473
+ #endif /* STM32L1xx_HAL_DAC_H */
465
474
466
475
/************************ (C) COPYRIGHT STMicroelectronics *****END OF FILE****/
467
-
0 commit comments