From be8b381ac6edcf827a7fa6bccb8d1d009c9a7a8f Mon Sep 17 00:00:00 2001 From: Frankx <117894913+frankx2023@users.noreply.github.com> Date: Sun, 2 Apr 2023 00:07:10 +0800 Subject: [PATCH] [bsp] Fix many abnormal symbols in annotations. (#7148) --- .../libraries/Device/ACM32F4.h | 4 +- .../libraries/Device/System_ACM32F4.c | 10 +-- .../libraries/HAL_Driver/Inc/HAL_AES.h | 2 +- .../libraries/HAL_Driver/Inc/HAL_FAU.h | 16 ++--- .../libraries/HAL_Driver/Inc/HAL_RTC.h | 38 ++++++----- .../libraries/HAL_Driver/Inc/HAL_UART.h | 2 +- .../libraries/HAL_Driver/Src/HAL_DAC.c | 40 ++++++------ .../libraries/HAL_Driver/Src/HAL_FSUSB.c | 2 +- .../libraries/HAL_Driver/Src/HAL_GPIO.c | 64 ++++++++++--------- 9 files changed, 89 insertions(+), 89 deletions(-) diff --git a/bsp/acm32/acm32f4xx-nucleo/libraries/Device/ACM32F4.h b/bsp/acm32/acm32f4xx-nucleo/libraries/Device/ACM32F4.h index 2cb6a50436..e5eabe8011 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/Device/ACM32F4.h +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/Device/ACM32F4.h @@ -6,7 +6,7 @@ * This file contains: * - Data structures and the address mapping for all peripherals * - Peripheral's registers declarations and bits definition - * - Macros to access peripheral¡¯s registers hardware + * - Macros to access peripheral's registers hardware * ****************************************************************************** */ @@ -197,7 +197,7 @@ typedef struct }TIM_TypeDef; -///*------------------- RTC¡¢PMU Registers ----------------------*/ +///*------------------- RTCå’ŒPMU Registers ----------------------*/ typedef struct { __IO uint32_t WP; diff --git a/bsp/acm32/acm32f4xx-nucleo/libraries/Device/System_ACM32F4.c b/bsp/acm32/acm32f4xx-nucleo/libraries/Device/System_ACM32F4.c index 6382903de9..987938e2e7 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/Device/System_ACM32F4.c +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/Device/System_ACM32F4.c @@ -578,7 +578,7 @@ void System_Enter_Standby_Mode(void) * Description : clear all stop setting and status * Input : none * Output : none -* Author : CWT Date : 2021?¨º +* Author : CWT Date : 2021å¹´4月 **********************************************************************************/ void System_Clear_Stop_Wakeup(void) { @@ -658,7 +658,7 @@ void System_Enter_Sleep_Mode(uint8_t SleepEntry) * Description : Get System Last Reset Reason * Input : none * Output : RESET_REASON -* Author : CWT Date : 2021?¨º +* Author : CWT Date : 2021å¹´4月 **********************************************************************************/ RESET_REASON System_Return_Last_Reset_Reason(void) { @@ -688,14 +688,14 @@ RESET_REASON System_Return_Last_Reset_Reason(void) return RESET_REASON_INVALID; // this should not happen } - /********************************************************************************* +/********************************************************************************* * Function : System_Set_Buzzer_Divider * Description : set buzzer divide factor * Input : div: div factor, if div = 80 then output buzzer freq=HCLK/80 enable: FUNC_DISABLE and FUNC_ENABLE * Output : none -* Author : xwl Date : 2021?¡§o +* Author : xwl Date : 2021å¹´4月 **********************************************************************************/ void System_Set_Buzzer_Divider(uint32_t div, FUNC_DISABLE_ENABLE enable) { @@ -715,7 +715,7 @@ void System_Set_Buzzer_Divider(uint32_t div, FUNC_DISABLE_ENABLE enable) * Description : Configure USB PHY, such as clock select, pll... * Input : none * Output : 0: fail, 1:success -* Author : xwl Date : 2021?¨º +* Author : xwl Date : 2021å¹´4月 **********************************************************************************/ uint32_t System_USB_PHY_Config(void) { diff --git a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_AES.h b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_AES.h index 97a7ce4135..9eb079e683 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_AES.h +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_AES.h @@ -63,7 +63,7 @@ Input: operation -- AES_ENCRYPTION,AES_DECRYPTION mode -- AES_ECB_MODE, AES_CBC_MODE, iv -- initial vector for CBC mode - security_mode -- AES_NORMAL_MODE, AES_SECURITY_MDOE£¬ + security_mode -- AES_NORMAL_MODE, AES_SECURITY_MODE Return: None *******************************************************************************/ diff --git a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_FAU.h b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_FAU.h index 617035702c..458b9fdc18 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_FAU.h +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_FAU.h @@ -8,7 +8,7 @@ /************************************************************************** * Function Name : HAL_CORDIC_CosSin( precision 1 ) * Description : calculate the sin & cos value of the input angle -* Input : - angle_para : input angle data in radians, divided by ¦Ð[range[-1,1],Q31 format]; +* Input : - angle_para : input angle data in radians, divided by Ï€[range[-1,1],Q31 format]; * Output : - * cos_data : the cos value of the input angle[range[-1,1],Q31 format] - * sin_data : the sin value of the input angle[range[-1,1],Q31 format] * Return : None @@ -17,7 +17,7 @@ void HAL_CORDIC_CosSin_1(int angle_para, int* cos_data, int* sin_data); /************************************************************************** * Function Name : HAL_CORDIC_CosSin( precision 2 ) * Description : calculate the sin & cos value of the input angle -* Input : - angle_para : input angle data in radians, divided by ¦Ð[range[-1,1],Q31 format]; +* Input : - angle_para : input angle data in radians, divided by Ï€[range[-1,1],Q31 format]; * Output : - * cos_data : the cos value of the input angle[range[-1,1],Q31 format] - * sin_data : the sin value of the input angle[range[-1,1],Q31 format] * Return : None @@ -26,7 +26,7 @@ void HAL_CORDIC_CosSin_2(int angle_para, int* cos_data, int* sin_data); /************************************************************************** * Function Name : HAL_CORDIC_CosSin( precision 3 ) * Description : calculate the sin & cos value of the input angle -* Input : - angle_para : input angle data in radians, divided by ¦Ð[range[-1,1],Q31 format]; +* Input : - angle_para : input angle data in radians, divided by Ï€[range[-1,1],Q31 format]; * Output : - * cos_data : the cos value of the input angle[range[-1,1],Q31 format] - * sin_data : the sin value of the input angle[range[-1,1],Q31 format] * Return : None @@ -35,7 +35,7 @@ void HAL_CORDIC_CosSin_3(int angle_para, int* cos_data, int* sin_data); /************************************************************************** * Function Name : HAL_CORDIC_CosSin( precision 4 ) * Description : calculate the sin & cos value of the input angle -* Input : - angle_para : input angle data in radians, divided by ¦Ð[range[-1,1],Q31 format]; +* Input : - angle_para : input angle data in radians, divided by Ï€[range[-1,1],Q31 format]; * Output : - * cos_data : the cos value of the input angle[range[-1,1],Q31 format] - * sin_data : the sin value of the input angle[range[-1,1],Q31 format] * Return : None @@ -44,7 +44,7 @@ void HAL_CORDIC_CosSin_4(int angle_para, int* cos_data, int* sin_data); /************************************************************************** * Function Name : HAL_CORDIC_CosSin( precision 5 ) * Description : calculate the sin & cos value of the input angle -* Input : - angle_para : input angle data in radians, divided by ¦Ð[range[-1,1],Q31 format]; +* Input : - angle_para : input angle data in radians, divided by Ï€[range[-1,1],Q31 format]; * Output : - * cos_data : the cos value of the input angle[range[-1,1],Q31 format] - * sin_data : the sin value of the input angle[range[-1,1],Q31 format] * Return : None @@ -53,7 +53,7 @@ void HAL_CORDIC_CosSin_5(int angle_para, int* cos_data, int* sin_data); /************************************************************************** * Function Name : HAL_CORDIC_CosSin( precision 6 ) * Description : calculate the sin & cos value of the input angle -* Input : - angle_para : input angle data in radians, divided by ¦Ð[range[-1,1],Q31 format]; +* Input : - angle_para : input angle data in radians, divided by Ï€[range[-1,1],Q31 format]; * Output : - * cos_data : the cos value of the input angle[range[-1,1],Q31 format] - * sin_data : the sin value of the input angle[range[-1,1],Q31 format] * Return : None @@ -62,7 +62,7 @@ void HAL_CORDIC_CosSin_6(int angle_para, int* cos_data, int* sin_data); /************************************************************************** * Function Name : HAL_CORDIC_CosSin( precision 7 ) * Description : calculate the sin & cos value of the input angle -* Input : - angle_para : input angle data in radians, divided by ¦Ð[range[-1,1],Q31 format]; +* Input : - angle_para : input angle data in radians, divided by Ï€[range[-1,1],Q31 format]; * Output : - * cos_data : the cos value of the input angle[range[-1,1],Q31 format] - * sin_data : the sin value of the input angle[range[-1,1],Q31 format] * Return : None @@ -71,7 +71,7 @@ void HAL_CORDIC_CosSin_7(int angle_para, int* cos_data, int* sin_data); /************************************************************************** * Function Name : HAL_CORDIC_CosSin( precision 8 ) * Description : calculate the sin & cos value of the input angle -* Input : - angle_para : input angle data in radians, divided by ¦Ð[range[-1,1],Q31 format]; +* Input : - angle_para : input angle data in radians, divided by Ï€[range[-1,1],Q31 format]; * Output : - * cos_data : the cos value of the input angle[range[-1,1],Q31 format] - * sin_data : the sin value of the input angle[range[-1,1],Q31 format] * Return : None diff --git a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_RTC.h b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_RTC.h index 8cc7f50a2b..6a0441573c 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_RTC.h +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_RTC.h @@ -383,7 +383,7 @@ typedef struct uint8_t u8_WeekDay; /*!< Specifies the RTC Date WeekDay. This parameter can be a value of @ref RTC_WeekDay_Definitions */ }RTC_DateTypeDef; -/* Attention: Year¡¢Month¡¢Date¡¢Week use BCD code */ +/* Attention: Yearã€Monthã€Dateã€Week use BCD code */ /** @@ -400,8 +400,7 @@ typedef struct uint8_t u8_Seconds; /*!< Specifies the RTC Time Seconds. This parameter must be a number between Min_Data = 0x00 and Max_Data = 0x59 */ }RTC_TimeTypeDef; -/* Attention: Hour¡¢Minute¡¢Second use BCD code */ - +/* Attention: Hourã€Minuteã€Second use BCD code */ /** * @brief RTC Time structure definition @@ -461,41 +460,40 @@ typedef struct /** @brief PC13 function select * @param __FUNC__: PC13 function select. - * This parameter can be 0: GPIO£¬1£ºRTC Fout£¬2£ºRTC tamper 3£ºPC13 Value + * This parameter can be 0: GPIO0/1/RTC Fout/2/RTC tamper/3/PC13 Value */ #define __HAL_RTC_PC13_SEL(__FUNC__) (PMU->IOSEL |= (PMU->IOSEL & ~(0x3)) | (__FUNC__)) /** @brief PC14 function select * @param __FUNC__: PC14 function select. - * This parameter can be 0: GPIO£¬1£ºPC14 Value - */ + * This parameter can be 0: GPIO_1_PC14 Value */ #define __HAL_RTC_PC14_SEL(__FUNC__) (PMU->IOSEL |= (PMU->IOSEL & ~(0x3 << 3)) | (__FUNC__ << 3)) /** @brief PC15 function select * @param __FUNC__: PC15 function select. - * This parameter can be 0: GPIO£¬1£ºPC15 Value + * This parameter can be 0: GPIO_1_PC15 Value */ #define __HAL_RTC_PC15_SEL(__FUNC__) (PMU->IOSEL |= (PMU->IOSEL & ~(0x3 << 5)) | (__FUNC__ << 5)) /** @brief PC13 Value set * @param __FUNC__: PC13 Value set. - * This parameter can be 0: set£¬1£ºclaer + * This parameter can be 0: set to 1 to clear */ #define __HAL_RTC_PC13_VALUE(__VALUE__) (PMU->IOSEL |= (PMU->IOSEL & ~(1 << 8)) | (__VALUE__ << 8)) /** @brief PC14 Value set * @param __FUNC__: PC14 Value set. - * This parameter can be 0: set£¬1£ºclaer +* This parameter can be 0: set to 1 to clear */ #define __HAL_RTC_PC14_VALUE(__VALUE__) (PMU->IOSEL |= (PMU->IOSEL & ~(1 << 9)) | (__VALUE__ << 9)) /** @brief PC15 Value set * @param __FUNC__: PC15 Value set. - * This parameter can be 0: set£¬1£ºclaer + * This parameter can be 0: set to 1 to clear */ #define __HAL_RTC_PC15_VALUE(__VALUE__) (PMU->IOSEL |= (PMU->IOSEL & ~(1 << 10)) | (__VALUE__ << 10)) -/* @brief PC13¡¢PC14¡¢PC15 pull up or pull down */ +/* @brief PC13ã€PC14ã€PC15 pull up or pull down */ #define __HAL_RTC_PC13_PULL_UP_ENABLE() (PMU->IOCR |= BIT0) #define __HAL_RTC_PC13_PULL_UP_DISABLE() (PMU->IOCR &= ~BIT0) #define __HAL_RTC_PC13_PULL_DOWN_ENABLE() (PMU->IOCR |= BIT1) @@ -511,7 +509,7 @@ typedef struct #define __HAL_RTC_PC15_PULL_DOWN_ENABLE() (PMU->IOCR |= BIT17) #define __HAL_RTC_PC15_PULL_DOWN_DISABLE() (PMU->IOCR &= ~BIT17) -/* @brief PC13¡¢PC14¡¢PC15 digit or analog */ +/* @brief PC13ã€PC14ã€PC15 digit or analog */ #define __HAL_RTC_PC13_ANALOG() (PMU->IOCR |= BIT6) #define __HAL_RTC_PC13_DIGIT() (PMU->IOCR &= ~BIT6) @@ -607,35 +605,35 @@ typedef struct * @} */ -/* RTC stamp1 interrupt enable¡¢disable */ +/* RTC stamp1 interrupt enable/disable */ #define __HAL_RTC_ENABLE_STAMP1_IT (RTC->IE |= (RTC_IE_STP1RIE | RTC_IE_STP1FIE)) #define __HAL_RTC_DISABLE_STAMP1_IT (RTC->IE &= ~(RTC_IE_STP1RIE | RTC_IE_STP1FIE)) -/* RTC stamp2 interrupt enable¡¢disable */ +/* RTC stamp2 interrupt enable/disable */ #define __HAL_RTC_ENABLE_STAMP2_IT (RTC->IE |= (RTC_IE_STP2RIE | RTC_IE_STP2FIE)) #define __HAL_RTC_DISABLE_STAMP2_IT (RTC->IE &= ~(RTC_IE_STP2RIE | RTC_IE_STP2FIE)) -/* RTC 32S interrupt enable¡¢disable */ +/* RTC 32S interrupt enable/disable */ #define __HAL_RTC_ENABLE_32S_IT (RTC->IE |= RTC_IE_ADJ32) #define __HAL_RTC_DISABLE_32S_IT (RTC->IE &= ~RTC_IE_ADJ32) -/* RTC alarm interrupt enable¡¢disable */ +/* RTC alarm interrupt enable/disable */ #define __HAL_RTC_ENABLE_ALM_IT (RTC->IE |= RTC_IE_ALM) #define __HAL_RTC_DISABLE_ALM_IT (RTC->IE &= RTC_IE_ALM) -/* RTC sec interrupt enable¡¢disable */ +/* RTC sec interrupt enable/disable */ #define __HAL_RTC_ENABLE_SEC_IT (RTC->IE |= RTC_IE_SEC) #define __HAL_RTC_DISABLE_SEC_IT (RTC->IE &= ~RTC_IE_SEC) -/* RTC Minutes interrupt enable¡¢disable */ +/* RTC Minutes interrupt enable/disable */ #define __HAL_RTC_ENABLE_MIN_IT (RTC->IE |= RTC_IE_MIN) #define __HAL_RTC_DISABLE_MIN_IT (RTC->IE &= ~RTC_IE_MIN) -/* RTC Hour interrupt enable¡¢disable */ +/* RTC Hour interrupt enable/disable */ #define __HAL_RTC_ENABLE_HOUR_IT (RTC->IE |= RTC_IE_HOUR) #define __HAL_RTC_DISABLE_HOUR_IT (RTC->IE &= ~RTC_IE_HOUR) -/* RTC Date interrupt enable¡¢disable */ +/* RTC Date interrupt enable/disable */ #define __HAL_RTC_ENABLE_DATE_IT (RTC->IE |= RTC_IE_DATE) #define __HAL_RTC_DISABLE_DATE_IT (RTC->IE &= ~RTC_IE_DATE) diff --git a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_UART.h b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_UART.h index 0c662da6d9..ced92980d9 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_UART.h +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Inc/HAL_UART.h @@ -127,7 +127,7 @@ #define UART_MODE_RX (0x00000200) /*!< RX mode */ #define UART_MODE_TX (0x00000100) /*!< TX mode */ #define UART_MODE_TX_RX (0x00000300) /*!< RX and TX mode */ -#define UART_MODE_TX_RX_DEBUG (0x10000300) /*!< RX¡¢TX mode and Debug use this uart */ +#define UART_MODE_TX_RX_DEBUG (0x10000300) /*!< RX/TX mode and Debug use this uart */ #define UART_MODE_HALF_DUPLEX (0x20000300) /*!< Single half duplex */ /** * @} diff --git a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_DAC.c b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_DAC.c index 694b2624bc..35de99cb92 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_DAC.c +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_DAC.c @@ -13,13 +13,13 @@ */ #include "ACM32Fxx_HAL.h" - /********************************************************************************* + /********************************************************************************* * Function : HAL_DAC_IRQHandler * Description : This function uses the interruption of DMA underrun. * Input : hdac : pointer to a DAC_HandleTypeDef structure that contains * the configuration information for DAC module * Output : -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ void HAL_DAC_IRQHandler(DAC_HandleTypeDef *hdac) { @@ -35,7 +35,7 @@ void HAL_DAC_IRQHandler(DAC_HandleTypeDef *hdac) * Input : hdac : pointer to a DAC_HandleTypeDef structure that contains * the configuration information for DAC module * Output : -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ __weak void HAL_DAC_MspInit(DAC_HandleTypeDef *hdac) @@ -73,7 +73,7 @@ __weak void HAL_DAC_MspInit(DAC_HandleTypeDef *hdac) * Input : hdac : pointer to a DAC_HandleTypeDef structure that contains * the configuration information for DAC module * Output : -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ void HAL_DAC_MspDeInit(DAC_HandleTypeDef* hdac) { @@ -106,7 +106,7 @@ void HAL_DAC_MspDeInit(DAC_HandleTypeDef* hdac) * Input : hdac : pointer to a DAC_HandleTypeDef structure that contains * the configuration information for DAC module * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DAC_Init(DAC_HandleTypeDef *hdac) { @@ -125,7 +125,7 @@ HAL_StatusTypeDef HAL_DAC_Init(DAC_HandleTypeDef *hdac) * Input : hdac : pointer to a DAC_HandleTypeDef structure that contains * the configuration information for DAC module * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DAC_DeInit(DAC_HandleTypeDef* hdac) { @@ -150,7 +150,7 @@ HAL_StatusTypeDef HAL_DAC_DeInit(DAC_HandleTypeDef* hdac) * sConfig:DAC configuration structure * Channel:This parameter can be one of the following values: @arg DAC_CHANNEL_1 @argDAC_CHANNEL_2 * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DAC_ConfigChannel(DAC_HandleTypeDef* hdac, DAC_ChannelConfTypeDef* sConfig, uint32_t Channel) { @@ -270,7 +270,7 @@ HAL_StatusTypeDef HAL_DAC_ConfigChannel(DAC_HandleTypeDef* hdac, DAC_ChannelConf * the configuration information for the specified DAC. * Channel:This parameter can be one of the following values: @arg DAC_CHANNEL_1 @argDAC_CHANNEL_2 * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DAC_Start(DAC_HandleTypeDef *hdac, uint32_t Channel) { @@ -314,7 +314,7 @@ HAL_StatusTypeDef HAL_DAC_Start(DAC_HandleTypeDef *hdac, uint32_t Channel) * the configuration information for the specified DAC. * Channel:This parameter can be one of the following values: @arg DAC_CHANNEL_1 @argDAC_CHANNEL_2 * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DAC_Stop(DAC_HandleTypeDef* hdac, uint32_t Channel) { @@ -347,7 +347,7 @@ HAL_StatusTypeDef HAL_DAC_Stop(DAC_HandleTypeDef* hdac, uint32_t Channel) * Alignment: Specifies the data alignment for DAC channel.This parameter can be one of the following values: @arg DAC_ALIGN_8B_R @arg DAC_ALIGN_12B_L @arg DAC_ALIGN_12B_R * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DAC_Start_DMA(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t *pData, uint32_t Length, uint32_t Alignment) { @@ -443,7 +443,7 @@ HAL_StatusTypeDef HAL_DAC_Start_DMA(DAC_HandleTypeDef *hdac, uint32_t Channel, u * the configuration information for the specified DAC. * Channel:This parameter can be one of the following values: @arg DAC_CHANNEL_1 @argDAC_CHANNEL_2 @arg DAC_CHANNEL_Dual * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DAC_Stop_DMA(DAC_HandleTypeDef* hdac, uint32_t Channel) { @@ -494,7 +494,7 @@ HAL_StatusTypeDef HAL_DAC_Stop_DMA(DAC_HandleTypeDef* hdac, uint32_t Channel) * @arg DAC_ALIGN_8B_R @arg DAC_ALIGN_12B_L @arg DAC_ALIGN_12B_R * Data:The destination peripheral Buffer address. * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DAC_SetValue(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t Alignment, uint32_t Data) { @@ -537,7 +537,7 @@ HAL_StatusTypeDef HAL_DAC_SetValue(DAC_HandleTypeDef *hdac, uint32_t Channel, ui * @arg DAC_ALIGN_8B_R @arg DAC_ALIGN_12B_L @arg DAC_ALIGN_12B_R * Datax:The destination peripheral Buffer address. * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DACEx_DualSetValue(DAC_HandleTypeDef *hdac, uint32_t Alignment, uint32_t Data1, uint32_t Data2) { @@ -573,7 +573,7 @@ HAL_StatusTypeDef HAL_DACEx_DualSetValue(DAC_HandleTypeDef *hdac, uint32_t Align * the configuration information for the specified DAC. * Channel:This parameter can be one of the following values: @arg DAC_CHANNEL_1 @arg DAC_CHANNEL_2 * Output : The selected DAC channel data output value. -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ uint32_t HAL_DAC_GetValue(DAC_HandleTypeDef* hdac, uint32_t Channel) { @@ -600,7 +600,7 @@ uint32_t HAL_DAC_GetValue(DAC_HandleTypeDef* hdac, uint32_t Channel) * Input : hdac : hdac pointer to a DAC_HandleTypeDef structure that contains * the configuration information for the specified DAC. * Output : The selected DAC channel data output value. -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ uint32_t HAL_DACEx_DualGetValue(DAC_HandleTypeDef *hdac) { @@ -638,7 +638,7 @@ uint32_t HAL_DACEx_DualGetValue(DAC_HandleTypeDef *hdac) * @arg DAC_TRIANGLEAMPLITUDE_1023: Select max triangle amplitude of 1023 * @arg DAC_TRIANGLEAMPLITUDE_2047: Select max triangle amplitude of 2047 * @arg DAC_TRIANGLEAMPLITUDE_4095: Select max triangle amplitude of 4095 -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DACEx_TriangleWaveGenerate(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t Amplitude) @@ -679,7 +679,7 @@ HAL_StatusTypeDef HAL_DACEx_TriangleWaveGenerate(DAC_HandleTypeDef *hdac, uint32 * @arg DAC_LFSRUNMASK_BITS10_0: Unmask DAC channel LFSR bit[10:0] for noise wave generation * @arg DAC_LFSRUNMASK_BITS11_0: Unmask DAC channel LFSR bit[11:0] for noise wave generation * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DACEx_NoiseWaveGenerate(DAC_HandleTypeDef *hdac, uint32_t Channel, uint32_t Amplitude) { @@ -704,7 +704,7 @@ HAL_StatusTypeDef HAL_DACEx_NoiseWaveGenerate(DAC_HandleTypeDef *hdac, uint32_t * @arg DAC_CHANNEL_1: DAC Channel1 selected * @arg DAC_CHANNEL_2: DAC Channel2 selected * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DACEx_SelfCalibrate(DAC_HandleTypeDef *hdac, DAC_ChannelConfTypeDef *sConfig, uint32_t Channel) { @@ -778,7 +778,7 @@ HAL_StatusTypeDef HAL_DACEx_SelfCalibrate(DAC_HandleTypeDef *hdac, DAC_ChannelCo * @arg DAC_CHANNEL_2: DAC Channel2 selected * NewTrimmingValue: DAC new trimming value * Output : HAL status -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ HAL_StatusTypeDef HAL_DACEx_SetUserTrimming(DAC_HandleTypeDef *hdac, DAC_ChannelConfTypeDef *sConfig, uint32_t Channel, uint32_t NewTrimmingValue) { @@ -815,7 +815,7 @@ HAL_StatusTypeDef HAL_DACEx_SetUserTrimming(DAC_HandleTypeDef *hdac, DAC_Channel * @arg DAC_CHANNEL_1: DAC Channel1 selected * @arg DAC_CHANNEL_2: DAC Channel2 selected * Output : Trimming value : range: 0->31 -* Author : CWT Data : 2020Äê +* Author : CWT Data : 2020å¹´ **********************************************************************************/ uint32_t HAL_DACEx_GetTrimOffset(DAC_HandleTypeDef *hdac, uint32_t Channel) { diff --git a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_FSUSB.c b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_FSUSB.c index fbae483272..991d3627fc 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_FSUSB.c +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_FSUSB.c @@ -348,7 +348,7 @@ void HAL_FSUSB_Receive_Data(uint8_t *buffer,uint32_t length,uint8_t ep_index) } -//ep_index±íʾ¶Ëµã±àºÅ +//ep_index表示的是èœå• void HAL_FSUSB_EP0_Send_Empty_Packet(void) { HAL_FSUSB_Start_EP_Transfer(0,USB_EP0); diff --git a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_GPIO.c b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_GPIO.c index 8f8108aef4..f3c0c60737 100644 --- a/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_GPIO.c +++ b/bsp/acm32/acm32f4xx-nucleo/libraries/HAL_Driver/Src/HAL_GPIO.c @@ -17,7 +17,7 @@ * Description : GPIO interrupt Handler * Input : * Outpu : -* Author : Chris_Kyle Data : 2020?¨º +* Author : Chris_Kyle Data: 2020å¹´ **********************************************************************************/ void HAL_GPIO_IRQHandler(enum_GPIOx_t fe_GPIO, uint32_t fu32_GPIO_Pin) { @@ -67,7 +67,7 @@ void HAL_GPIO_IRQHandler(enum_GPIOx_t fe_GPIO, uint32_t fu32_GPIO_Pin) * Input : GPIO_Init: pointer to a GPIO_InitTypeDef structure that contains the configuration information for the specified GPIO peripheral. * Outpu : -* Author : Chris_Kyle Data : 2020?¨º +* Author : Chris_Kyle Data : 2020å¹´ **********************************************************************************/ void HAL_GPIO_Init(enum_GPIOx_t fe_GPIO, GPIO_InitTypeDef *GPIO_Init) { @@ -75,12 +75,14 @@ void HAL_GPIO_Init(enum_GPIOx_t fe_GPIO, GPIO_InitTypeDef *GPIO_Init) uint32_t lu32_Current_Pin; uint32_t lu32_Position_Mask; - volatile uint32_t *lu32_SEL1 = NULL; // ???¨° -> 1¨¹???¡ä¨®???¡ä??¡Â1 - volatile uint32_t *lu32_SEL2 = NULL; // ???¨° -> 1¨¹???¡ä¨®???¡ä??¡Â2 - volatile uint32_t *lu32_PollUP = NULL; // ???¨° -> ¨¦?¨¤-??????¡ä??¡Â - volatile uint32_t *lu32_PollDown = NULL; // ???¨° -> ??¨¤-??????¡ä??¡Â - volatile uint32_t *lu32_ODEnable = NULL; // ???¨° -> ?a??¨º1?¨¹??¡ä??¡Â - volatile uint32_t *lu32_ADS = NULL; // ???¨° -> ¨ºy¡Á??¡é?¡ê?a??????¡ä??¡Â + volatile uint32_t *lu32_SEL1 = NULL; // é¸æ“‡å™¨ -> 1è·¯é¸æ“‡å™¨çš„é¸æ“‡ä½1 + volatile uint32_t *lu32_SEL2 = NULL; // é¸æ“‡å™¨ -> 1è·¯é¸æ“‡å™¨çš„é¸æ“‡ä½2 + volatile uint32_t *lu32_PollUP = NULL; // 拉上阻抗 -> 上拉阻抗的é¸æ“‡ä½ + volatile uint32_t *lu32_PollDown = NULL; // 拉下阻抗 -> 下拉阻抗的é¸æ“‡ä½ + volatile uint32_t *lu32_ODEnable = NULL; // 輸出使能 -> å…許輸出1çš„é¸æ“‡ä½ + volatile uint32_t *lu32_ADS = NULL; // è¼¸å…¥æ¨¡å¼ -> 輸入模å¼çš„å…許輸出é¸æ“‡ä½ + + GPIO_TypeDef *GPIOx; @@ -202,11 +204,11 @@ void HAL_GPIO_Init(enum_GPIOx_t fe_GPIO, GPIO_InitTypeDef *GPIO_Init) { /* Get Position Mask */ if (lu32_Position < 16) - { /* GOIOA?¡éGPIOC?¡éGPIOE */ + { /* GPIOAã€GPIOCã€GPIOE */ lu32_Position_Mask = lu32_Position; } else - { /* GPIOB?¡éGPIOD?¡éGPIOF */ + { /* GPIOBã€GPIODã€GPIOF */ lu32_Position_Mask = lu32_Position - 16; } @@ -228,7 +230,7 @@ void HAL_GPIO_Init(enum_GPIOx_t fe_GPIO, GPIO_InitTypeDef *GPIO_Init) case GPIO_MODE_IT_HIGH_LEVEL: case GPIO_MODE_IT_LOW_LEVEL: { - /* Set direction Input?¡éEnable INT */ + /* Set direction Input, Enable INT*/ GPIOx->DIR &= ~lu32_Current_Pin; GPIOx->IEN |= lu32_Current_Pin; @@ -311,11 +313,11 @@ void HAL_GPIO_Init(enum_GPIOx_t fe_GPIO, GPIO_InitTypeDef *GPIO_Init) { /* Get Position Mask */ if (lu32_Position < 16) - { /* GOIOA?¡éGPIOC?¡éGPIOE */ + { /* GOIOAã€GPIOCã€GPIOE */ lu32_Position_Mask = lu32_Position; } else - { /* GPIOB?¡éGPIOD?¡éGPIOF */ + { /* GPIOBã€GPIODã€GPIOF */ lu32_Position_Mask = lu32_Position - 16; } @@ -344,14 +346,13 @@ void HAL_GPIO_Init(enum_GPIOx_t fe_GPIO, GPIO_InitTypeDef *GPIO_Init) lu32_Position++; } } - /********************************************************************************* * Function : HAL_GPIO_DeInit * Description : De-initializes the GPIOx peripheral registers to their default reset values. -* Input : fe_GPIO¡êoto select the GPIO peripheral. -* Input : fu32_Pin¡êospecifies the port bit to be written. +* Input : GPIOx：to select the GPIO peripheral. +* Input : fu32_Pin：specifies the port bit to be written. This parameter can be one of GPIO_PIN_x where x can be (0..15). -* Outpu : +* Output : * Author : Chris_Kyle Data : 2020 **********************************************************************************/ void HAL_GPIO_DeInit(enum_GPIOx_t fe_GPIO, uint32_t fu32_Pin) @@ -360,12 +361,13 @@ void HAL_GPIO_DeInit(enum_GPIOx_t fe_GPIO, uint32_t fu32_Pin) uint32_t lu32_Current_Pin; uint32_t lu32_Position_Mask; - volatile uint32_t *lu32_SEL1 = NULL; // ???¨° -> 1¨¹???¡ä¨®???¡ä??¡Â1 - volatile uint32_t *lu32_SEL2 = NULL; // ???¨° -> 1¨¹???¡ä¨®???¡ä??¡Â2 - volatile uint32_t *lu32_PollUP = NULL; // ???¨° -> ¨¦?¨¤-??????¡ä??¡Â - volatile uint32_t *lu32_PollDown = NULL; // ???¨° -> ??¨¤-??????¡ä??¡Â - volatile uint32_t *lu32_ODEnable = NULL; // ???¨° -> ?a??¨º1?¨¹??¡ä??¡Â - volatile uint32_t *lu32_ADS = NULL; // ???¨° -> ¨ºy¡Á??¡é?¡ê?a??????¡ä??¡Â + volatile uint32_t *lu32_SEL1 = NULL; // åˆå§‹åŒ–指针 -> 选择器1çš„å†…å­˜åœ°å€ + volatile uint32_t *lu32_SEL2 = NULL; // åˆå§‹åŒ–指针 -> 选择器2çš„å†…å­˜åœ°å€ + volatile uint32_t *lu32_PollUP = NULL; // åˆå§‹åŒ–指针 -> 上拉æ“ä½œçš„å†…å­˜åœ°å€ + volatile uint32_t *lu32_PollDown = NULL; // åˆå§‹åŒ–指针 -> 下拉æ“ä½œçš„å†…å­˜åœ°å€ + volatile uint32_t *lu32_ODEnable = NULL; // åˆå§‹åŒ–指针 -> å¼€å¯è¾“å‡ºè®¾å¤‡çš„å†…å­˜åœ°å€ + volatile uint32_t *lu32_ADS = NULL; // åˆå§‹åŒ–指针 -> 用于存储ADSæ•°ç»„çš„å†…å­˜åœ°å€ + GPIO_TypeDef *GPIOx; @@ -480,11 +482,11 @@ void HAL_GPIO_DeInit(enum_GPIOx_t fe_GPIO, uint32_t fu32_Pin) /* Get Position Mask */ if (lu32_Position < 16) - { /* GOIOA?¡éGPIOC?¡éGPIOE */ + { /* GOIOAã€GPIOCã€GPIOE */ lu32_Position_Mask = lu32_Position; } else - { /* GPIOB?¡éGPIOD?¡éGPIOF */ + { /* GPIOBã€GPIODã€GPIOF */ lu32_Position_Mask = lu32_Position - 16; } @@ -516,18 +518,18 @@ void HAL_GPIO_DeInit(enum_GPIOx_t fe_GPIO, uint32_t fu32_Pin) /********************************************************************************* * Function : HAL_GPIO_AnalogEnable * Description : Quickly Configure to analog function -* Input : fe_GPIO¡êoto select the GPIO peripheral. -* Input : fu32_Pin¡êospecifies the port bit to be written. +* Input : fe_GPIO：to select the GPIO peripheral. +* Input : fu32_Pin：specifies the port bit to be written. This parameter can be one of GPIO_PIN_x where x can be (0..15). * Outpu : -* Author : Chris_Kyle Data : 2020?¨º +* Author : Chris_Kyle Data : 2020å¹´ **********************************************************************************/ void HAL_GPIO_AnalogEnable(enum_GPIOx_t fe_GPIO, uint32_t fu32_Pin) { uint32_t lu32_Position = 0; uint32_t lu32_Current_Pin; - volatile uint32_t *lp32_ADS = NULL; // ???¨° -> ¨ºy¡Á??¡é?¡ê?a??????¡ä??¡Â + volatile uint32_t *lp32_ADS = NULL; // åˆå§‹åŒ–指针以用于存储ADS数组 GPIO_TypeDef *GPIOx; @@ -601,7 +603,7 @@ void HAL_GPIO_AnalogEnable(enum_GPIOx_t fe_GPIO, uint32_t fu32_Pin) * Description : Set or clear the selected data port bit. * Input : * Outpu : -* Author : Chris_Kyle Data : 2020?¨º +* Author : Chris_Kyle Data : 2020å¹´ **********************************************************************************/ void HAL_GPIO_WritePin(enum_GPIOx_t fe_GPIO, uint32_t fu32_GPIO_Pin, enum_PinState_t fe_PinState) { @@ -657,7 +659,7 @@ void HAL_GPIO_WritePin(enum_GPIOx_t fe_GPIO, uint32_t fu32_GPIO_Pin, enum_PinSta * Description : Read the specified input port pin. * Input : * Outpu : -* Author : Chris_Kyle Data : 2020?¨º +* Author : Chris_Kyle Data : 2020å¹´ **********************************************************************************/ enum_PinState_t HAL_GPIO_ReadPin(enum_GPIOx_t fe_GPIO, uint32_t fu32_GPIO_Pin) { -- GitLab