From 8a6a078dc5c845318ef3a44295bdcd46b423656e Mon Sep 17 00:00:00 2001 From: jay_yeh Date: Wed, 20 Nov 2024 09:38:18 +0800 Subject: [PATCH] [rename] rename x2600 adc "channal" to "channel" --- .../drivers-x2600/include/x2600_hal_sadc.h | 6 ++--- drivers/drivers-x2600/src/x2600_hal_sadc.c | 26 +++++++++---------- .../Examples/adc/adc_ContConversion/main.c | 10 +++---- .../adc/adc_ContConversion_Dma/main.c | 8 +++--- .../adc/adc_ExtTrigger_Watchdog/main.c | 14 +++++----- .../Examples/adc/adc_ScanConversion_it/main.c | 10 +++---- .../adc/adc_ScanConversion_polling/main.c | 10 +++---- 7 files changed, 42 insertions(+), 42 deletions(-) diff --git a/drivers/drivers-x2600/include/x2600_hal_sadc.h b/drivers/drivers-x2600/include/x2600_hal_sadc.h index a372a6ec..1e8abd12 100644 --- a/drivers/drivers-x2600/include/x2600_hal_sadc.h +++ b/drivers/drivers-x2600/include/x2600_hal_sadc.h @@ -111,7 +111,7 @@ enum EXT_CH_GPIO_SEL { /*!< 指定GIPO事件具体的触发方 */ typedef struct { enum AWD awd; /*!< watchdog监测的上限或者下限 */ - unsigned int channal; /*!< watchdog监测的通道 */ + unsigned int channel; /*!< watchdog监测的通道 */ unsigned int high; /*!< watchdog监测的上限 */ unsigned int low; /*!< watchdog监测的下限 */ } ADC_WdtConfTypeDef; @@ -134,8 +134,8 @@ typedef struct { FunctionalState Is_Cont; /*!< 是否使用连续扫描 */ FunctionalState Is_wdt; /*!< 是否使用wdt监测功能 */ FunctionalState Is_ext; /*!< 是否使用外部触发功能 */ - unsigned int channal0; /*!< 序列采集的编号 */ - unsigned int channal1; /*!< 序列采集的编号 */ + unsigned int channel0; /*!< 序列采集的编号 */ + unsigned int channel1; /*!< 序列采集的编号 */ unsigned int len; /*!< 序列采集长度 */ unsigned int cont_interval; /*!< 序列持续转换间隔时间 单位ms */ ADC_WdtConfTypeDef WdtHandle[2];/*!< wdt监测功能配置 */ diff --git a/drivers/drivers-x2600/src/x2600_hal_sadc.c b/drivers/drivers-x2600/src/x2600_hal_sadc.c index 28b79a63..9c7551fe 100644 --- a/drivers/drivers-x2600/src/x2600_hal_sadc.c +++ b/drivers/drivers-x2600/src/x2600_hal_sadc.c @@ -447,7 +447,7 @@ HAL_StatusTypeDef HAL_ADC_ConfigSeq(ADC_HandleTypeDef *hadc, ADC_ChannelConfType /* 序列 0 1 2 的配置: 序列的长度、序列的编号、序列是否使用连续转换 */ if (sConfig->Seq == SEQ0) { - __HAL_ADC_SEQ0_CNR0(hadc, sConfig->channal0); + __HAL_ADC_SEQ0_CNR0(hadc, sConfig->channel0); __HAL_ADC_SEQ0_CHNUM_EN(hadc); __HAL_ADC_SEQ0_LEN(hadc, sConfig->len); @@ -460,9 +460,9 @@ HAL_StatusTypeDef HAL_ADC_ConfigSeq(ADC_HandleTypeDef *hadc, ADC_ChannelConfType } else if (sConfig->Seq == SEQ1) { __HAL_ADC_SEQ1_LEN(hadc, sConfig->len); __HAL_ADC_SEQ1_CH_NUM_EN(hadc); - __HAL_ADC_SEQ1_CNR0(hadc, sConfig->channal0); + __HAL_ADC_SEQ1_CNR0(hadc, sConfig->channel0); if (sConfig->len > 7) { - __HAL_ADC_SEQ1_CNR1(hadc, sConfig->channal1); + __HAL_ADC_SEQ1_CNR1(hadc, sConfig->channel1); } if (sConfig->Is_Cont) { @@ -483,7 +483,7 @@ HAL_StatusTypeDef HAL_ADC_ConfigSeq(ADC_HandleTypeDef *hadc, ADC_ChannelConfType } else if (sConfig->Seq == SEQ2) { __HAL_ADC_SEQ2_LEN(hadc, sConfig->len); __HAL_ADC_SEQ2_CH_NUM_EN(hadc); - __HAL_ADC_SEQ2_CNR0(hadc, sConfig->channal0); + __HAL_ADC_SEQ2_CNR0(hadc, sConfig->channel0); /* 使用中断模式或轮询模式 */ if (sConfig->Is_intc) { @@ -595,13 +595,13 @@ void HAL_ADC_IRQHandler(int irq, void *data) pos = __ffs(below_threshold); if (below_threshold) { __HAL_ADC_CLEAN_AWD_IT_FLAG(hadc, (1 << pos)); - prom_printk("channal : %d below threshold.\n", pos); + prom_printk("channel : %d below threshold.\n", pos); below_threshold &= ~(1 << (pos)); } pos = __ffs(above_threshold); if (above_threshold) { __HAL_ADC_CLEAN_AWD_IT_FLAG(hadc, (1 << (pos + 15))); - prom_printk("channal : %d above threshold.\n", pos); + prom_printk("channel : %d above threshold.\n", pos); above_threshold &= ~(1 << (pos)); } } @@ -784,9 +784,9 @@ int HAL_ADC_GetChanValue_InRawBuf(ADC_HandleTypeDef *hadc, uint8_t chan, uint32_ for (i = 0; i < (sConfig->len + 1); i++) { step %= 32; if (i < 8) { - seq_channel = ((sConfig->channal0 >> step) & 0xf); + seq_channel = ((sConfig->channel0 >> step) & 0xf); } else { - seq_channel = ((sConfig->channal1 >> step) & 0xf); + seq_channel = ((sConfig->channel1 >> step) & 0xf); } if (seq_channel == chan) { @@ -925,19 +925,19 @@ void HAL_ADC_Wdt_Monit(ADC_HandleTypeDef *hadc, ADC_WdtConfTypeDef *hwdt) /* There is an issue with the pow function, and it is mandatory to replace it with the bit function here. */ #define pow bit - i = pow(hwdt->channal); + i = pow(hwdt->channel); #undef pow __HAL_Lock(&hadc->Lock); if (hwdt->awd == HIGH) { - __HAL_ADC_AWD_CRn_HTR_EN(hadc, hwdt->channal); + __HAL_ADC_AWD_CRn_HTR_EN(hadc, hwdt->channel); hwdt->high = hwdt->high * 4096 / 1800; - __HAL_ADC_AWD_CRn_HTR(hadc, hwdt->channal, hwdt->high); + __HAL_ADC_AWD_CRn_HTR(hadc, hwdt->channel, hwdt->high); __HAL_ADC_AWD_IT_CH_HTR_EN(hadc, i); } else { - __HAL_ADC_AWD_CRn_LTR_EN(hadc, hwdt->channal); + __HAL_ADC_AWD_CRn_LTR_EN(hadc, hwdt->channel); hwdt->low = hwdt->low * 4096 / 1800; - __HAL_ADC_AWD_CRn_LTR(hadc, hwdt->channal, hwdt->low); + __HAL_ADC_AWD_CRn_LTR(hadc, hwdt->channel, hwdt->low); __HAL_ADC_AWD_IT_CH_LTR_EN(hadc, i); } __HAL_UnLock(&hadc->Lock); diff --git a/projects/x2660-halley/Examples/adc/adc_ContConversion/main.c b/projects/x2660-halley/Examples/adc/adc_ContConversion/main.c index 9f31ca28..7419c874 100644 --- a/projects/x2660-halley/Examples/adc/adc_ContConversion/main.c +++ b/projects/x2660-halley/Examples/adc/adc_ContConversion/main.c @@ -38,7 +38,7 @@ int main(void) { ADC_ChannelConfTypeDef sConfig = { 0 }; unsigned int i = 0; - unsigned int channal; + unsigned int channel; unsigned int data; prom_printk("adc projects test!\n"); @@ -68,8 +68,8 @@ int main(void) sConfig.Is_Cont = ENABLE; /* 配置ADC 连续转换的间隔时间 单位 ms */ sConfig.cont_interval = 5000; - sConfig.channal0 = 0x76543210; - sConfig.channal1 = 0xfedcba98; + sConfig.channel0 = 0x76543210; + sConfig.channel1 = 0xfedcba98; sConfig.len = 15; if (HAL_ADC_ConfigSeq(&AdcHandle, &sConfig) != HAL_OK) { Error_Handler(); @@ -89,10 +89,10 @@ int main(void) while (DataReadyFlag != DATAREADY); HAL_ADC_LOCK(&AdcHandle); for (i = 0; i <= sConfig.len; i++) { - channal = (seq1[i] & (0xf << 12)) >> 12; + channel = (seq1[i] & (0xf << 12)) >> 12; data = seq1[i] & (0xfff); data = 1800 * data / 4096; - prom_printk("channal= %d data=%d mv\n", channal, data); + prom_printk("channel= %d data=%d mv\n", channel, data); } HAL_ADC_UNLOCK(&AdcHandle); diff --git a/projects/x2660-halley/Examples/adc/adc_ContConversion_Dma/main.c b/projects/x2660-halley/Examples/adc/adc_ContConversion_Dma/main.c index 5c918719..d98c93e4 100644 --- a/projects/x2660-halley/Examples/adc/adc_ContConversion_Dma/main.c +++ b/projects/x2660-halley/Examples/adc/adc_ContConversion_Dma/main.c @@ -119,11 +119,11 @@ int main(void) { ADC_ChannelConfTypeDef sConfig = {0}; unsigned int i = 0; - unsigned int channal; + unsigned int channel; unsigned int data; int ch = 0; HAL_Delay(1000); - channal = 0; + channel = 0; i = 0; prom_printk("adc projects test!\n"); @@ -161,8 +161,8 @@ int main(void) sConfig.Is_intc = DISABLE; sConfig.Is_Cont = ENABLE; sConfig.cont_interval = 0; - sConfig.channal0 = 0x76543210; - sConfig.channal1 = 0xfedcba98; + sConfig.channel0 = 0x76543210; + sConfig.channel1 = 0xfedcba98; sConfig.len = 15; if (HAL_ADC_ConfigSeq(&AdcHandle, &sConfig) != HAL_OK) { Error_Handler(); diff --git a/projects/x2660-halley/Examples/adc/adc_ExtTrigger_Watchdog/main.c b/projects/x2660-halley/Examples/adc/adc_ExtTrigger_Watchdog/main.c index caee6473..f4aea096 100644 --- a/projects/x2660-halley/Examples/adc/adc_ExtTrigger_Watchdog/main.c +++ b/projects/x2660-halley/Examples/adc/adc_ExtTrigger_Watchdog/main.c @@ -40,7 +40,7 @@ int main(void) { ADC_ChannelConfTypeDef sConfig = { 0 }; unsigned int i = 0; - unsigned int channal; + unsigned int channel; unsigned int data; prom_printk("adc projects test!\n"); @@ -73,14 +73,14 @@ int main(void) sConfig.Is_Cont = DISABLE; sConfig.Is_wdt = ENABLE; sConfig.Is_ext = ENABLE; - sConfig.channal0 = 0x76543210; - sConfig.channal1 = 0xfedcba98; + sConfig.channel0 = 0x76543210; + sConfig.channel1 = 0xfedcba98; sConfig.len = 15; /* 配置ADC watchdog 监测功能 */ - sConfig.WdtHandle[LOW].channal = 0; + sConfig.WdtHandle[LOW].channel = 0; sConfig.WdtHandle[LOW].low = 300; - sConfig.WdtHandle[HIGH].channal = 2; + sConfig.WdtHandle[HIGH].channel = 2; sConfig.WdtHandle[HIGH].high = 500; /* 配置ADC 外部触发事件 */ @@ -101,10 +101,10 @@ int main(void) while (DataReadyFlag != DATAREADY); HAL_ADC_LOCK(&AdcHandle); for (i = 0; i <= sConfig.len; i++) { - channal = (seq1[i] & (0xf << 12)) >> 12; + channel = (seq1[i] & (0xf << 12)) >> 12; data = seq1[i] & (0xfff); data = 1800 * data / 4096; - prom_printk("channal= %d data=%d mv\n", channal, data); + prom_printk("channel= %d data=%d mv\n", channel, data); } HAL_ADC_UNLOCK(&AdcHandle); diff --git a/projects/x2660-halley/Examples/adc/adc_ScanConversion_it/main.c b/projects/x2660-halley/Examples/adc/adc_ScanConversion_it/main.c index 47127f17..be57eede 100644 --- a/projects/x2660-halley/Examples/adc/adc_ScanConversion_it/main.c +++ b/projects/x2660-halley/Examples/adc/adc_ScanConversion_it/main.c @@ -36,7 +36,7 @@ int main(void) { ADC_ChannelConfTypeDef sConfig = { 0 }; unsigned int i = 0; - unsigned int channal; + unsigned int channel; unsigned int data; prom_printk("adc projects test!\n"); @@ -64,8 +64,8 @@ int main(void) sConfig.Seq = SEQ1; sConfig.Is_intc = ENABLE; sConfig.Is_Cont = DISABLE; - sConfig.channal0 = 0x76543210; - sConfig.channal1 = 0xfedcba98; + sConfig.channel0 = 0x76543210; + sConfig.channel1 = 0xfedcba98; sConfig.len = 15; if (HAL_ADC_ConfigSeq(&AdcHandle, &sConfig) != HAL_OK) { Error_Handler(); @@ -85,10 +85,10 @@ int main(void) while (DataReadyFlag != DATAREADY); HAL_ADC_LOCK(&AdcHandle); for (i = 0; i <= sConfig.len; i++) { - channal = (seq1[i] & (0xf << 12)) >> 12; + channel = (seq1[i] & (0xf << 12)) >> 12; data = seq1[i] & (0xfff); data = 1800 * data / 4096; - prom_printk("channal= %d data=%d mv\n", channal, data); + prom_printk("channel= %d data=%d mv\n", channel, data); } HAL_ADC_UNLOCK(&AdcHandle); diff --git a/projects/x2660-halley/Examples/adc/adc_ScanConversion_polling/main.c b/projects/x2660-halley/Examples/adc/adc_ScanConversion_polling/main.c index 44dc46bd..24af247b 100644 --- a/projects/x2660-halley/Examples/adc/adc_ScanConversion_polling/main.c +++ b/projects/x2660-halley/Examples/adc/adc_ScanConversion_polling/main.c @@ -34,7 +34,7 @@ int main(void) { ADC_ChannelConfTypeDef sConfig = { 0 }; unsigned int i = 0; - unsigned int channal; + unsigned int channel; unsigned int data; prom_printk("adc projects test!\n"); @@ -59,8 +59,8 @@ int main(void) sConfig.Seq = SEQ1; sConfig.Is_intc = DISABLE; sConfig.Is_Cont = DISABLE; - sConfig.channal0 = 0x76543210; - sConfig.channal1 = 0xfedcba98; + sConfig.channel0 = 0x76543210; + sConfig.channel1 = 0xfedcba98; sConfig.len = 15; if (HAL_ADC_ConfigSeq(&AdcHandle, &sConfig) != HAL_OK) { Error_Handler(); @@ -78,10 +78,10 @@ int main(void) /* 获取模数转换后数据 */ while (HAL_ADC_PollReady(&AdcHandle) != HAL_OK); for (i = 0; i <= sConfig.len; i++) { - channal = (seq1[i] & (0xf << 12)) >> 12; + channel = (seq1[i] & (0xf << 12)) >> 12; data = seq1[i] & (0xfff); data = 1800 * data / 4096; - prom_printk("channal= %d data=%d mv\n", channal, data); + prom_printk("channel= %d data=%d mv\n", channel, data); } } -- Gitee