update version to v2.1.4

This commit is contained in:
Artery-MCU
2024-05-13 13:48:59 +08:00
parent 0a93017e07
commit 95481a671d
13 changed files with 21 additions and 126 deletions

View File

@@ -78,6 +78,9 @@ typedef enum
CMP_SPEED_SLOW = 0x01, /*!< comparator selected slow speed */
} cmp_speed_type;
#define CMP_OUTPUT_TMR1CXORAW_OFF CMP_OUTPUT_TMR1CHCLR
#define CMP_OUTPUT_TMR2CXORAW_OFF CMP_OUTPUT_TMR2CHCLR
#define CMP_OUTPUT_TMR3CXORAW_OFF CMP_OUTPUT_TMR3CHCLR
/**
* @brief cmp output type
*/

View File

@@ -687,10 +687,10 @@ uint16_t adc_ordinary_conversion_data_get(adc_type *adc_x)
* ADC1.
* @param adc_preempt_channel: select the preempt channel.
* this parameter can be one of the following values:
* - ADC_PREEMPTED_CHANNEL_1
* - ADC_PREEMPTED_CHANNEL_2
* - ADC_PREEMPTED_CHANNEL_3
* - ADC_PREEMPTED_CHANNEL_4
* - ADC_PREEMPT_CHANNEL_1
* - ADC_PREEMPT_CHANNEL_2
* - ADC_PREEMPT_CHANNEL_3
* - ADC_PREEMPT_CHANNEL_4
* @retval the conversion data for selection preempt channel.
*/
uint16_t adc_preempt_conversion_data_get(adc_type *adc_x, adc_preempt_channel_type adc_preempt_channel)