[bsp][Infineon]修复psoc6-evaluationkit-062S2调用rt_adc_disable()时报错的问题

yans6666 · Rbb666 · commit dcf637dd30de · 2025-05-29T13:04:49.000+08:00
diff --git a/bsp/Infineon/libraries/HAL_Drivers/config/cy8c62/adc_config.h b/bsp/Infineon/libraries/HAL_Drivers/config/cy8c62/adc_config.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2006-2025, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author    Notes
+ * 2025-05-28     RTT       the first version
+ */
+#ifndef __ADC_CONFIG_H__
+#define __ADC_CONFIG_H__
+
+#include <rtthread.h>
+#include <rtdevice.h>
+#include "drv_common.h"
+#include "cyhal.h"
+#include "cybsp.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if defined(BSP_USING_ADC1) || defined(BSP_USING_ADC2)
+
+cyhal_adc_t adc_obj;
+cyhal_adc_channel_t adc_chan_obj;
+
+const cyhal_adc_config_t adc_config = {
+        .continuous_scanning = false,   // Continuous Scanning is disabled
+        .average_count = 1,             // Average count disabled
+        .vref = CYHAL_ADC_REF_VDDA,     // VREF for Single ended channel set to VDDA
+        .vneg = CYHAL_ADC_VNEG_VSSA,    // VNEG for Single ended channel set to VSSA
+        .resolution = 12u,              // 12-bit resolution
+        .ext_vref = NC,                 // No connection
+        .bypass_pin = NC                // No connection
+};
+
+struct ifx_adc
+{
+    struct rt_adc_device ifx_adc_device;
+    cyhal_adc_channel_t *adc_ch;
+    char *name;
+};
+
+const cyhal_gpio_t adc_gpio[6] = {P10_0, P10_1, P10_2, P10_3, P10_4, P10_5};
+
+#ifndef ADC1_CONFIG
+#define ADC1_CONFIG                 \
+    {                               \
+        .adc_ch = &adc_chan_obj,    \
+        .name = "adc1",             \
+    }
+#endif
+
+#endif /* defined(BSP_USING_ADC1) || defined(BSP_USING_ADC2) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ADC_CONFIG_H__ */
diff --git a/bsp/Infineon/libraries/HAL_Drivers/config/drv_config.h b/bsp/Infineon/libraries/HAL_Drivers/config/drv_config.h
@@ -0,0 +1,49 @@
+/*
+ * Copyright (c) 2006-2025, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author    Notes
+ * 2025-05-28     RTT       the first version
+ */
+#ifndef __DRV_CONFIG_H__
+#define __DRV_CONFIG_H__
+
+#include "board.h"
+#include <rtthread.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if defined(SOC_CY8C624ALQI_S2D42) || defined(SOC_CY8C6347BZI_BLD53) || defined(SOC_CY8C6247BZI_D54) || defined(SOC_CY8C6244LQI_S4D92)
+
+#ifdef BSP_USING_ADC
+#include "cy8c62/adc_config.h"
+#endif
+
+#endif /* SOC_CY8C624ALQI_S2D42 */
+
+#if defined(SOC_XMC7100D_F144K4160AA)
+
+#ifdef BSP_USING_ADC
+#include "xmc7100/adc_config.h"
+#endif
+
+#endif /* SOC_XMC7100D_F144K4160AA */
+
+#if defined(SOC_XMC7200D_E272K8384AA)
+
+#ifdef BSP_USING_ADC
+#include "xmc7200/adc_config.h"
+#endif
+
+#endif /* SOC_XMC7200D_E272K8384AA */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __DRV_CONFIG_H__ */
diff --git a/bsp/Infineon/libraries/HAL_Drivers/config/xmc7100/adc_config.h b/bsp/Infineon/libraries/HAL_Drivers/config/xmc7100/adc_config.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2006-2025, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author    Notes
+ * 2025-05-28     RTT       the first version
+ */
+#ifndef __ADC_CONFIG_H__
+#define __ADC_CONFIG_H__
+
+#include <rtthread.h>
+#include <rtdevice.h>
+#include "drv_common.h"
+#include "cyhal.h"
+#include "cybsp.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if defined(BSP_USING_ADC1) || defined(BSP_USING_ADC2)
+
+cyhal_adc_t adc_obj;
+cyhal_adc_channel_t adc_chan_obj;
+
+const cyhal_adc_config_t adc_config = {
+        .continuous_scanning = false,   // Continuous Scanning is disabled
+        .average_count = 1,             // Average count disabled
+        .vref = CYHAL_ADC_REF_VDDA,     // VREF for Single ended channel set to VDDA
+        .vneg = CYHAL_ADC_VNEG_VSSA,    // VNEG for Single ended channel set to VSSA
+        .resolution = 12u,              // 12-bit resolution
+        .ext_vref = NC,                 // No connection
+        .bypass_pin = NC                // No connection
+};
+
+struct ifx_adc
+{
+    struct rt_adc_device ifx_adc_device;
+    cyhal_adc_channel_t *adc_ch;
+    char *name;
+};
+
+const cyhal_gpio_t adc_gpio[8] = {P6_0, P11_0, P11_1, P11_2, P12_4, P13_7, P14_2, P14_3};
+
+#ifndef ADC1_CONFIG
+#define ADC1_CONFIG                 \
+    {                               \
+        .adc_ch = &adc_chan_obj,    \
+        .name = "adc1",             \
+    }
+#endif
+
+#endif /* defined(BSP_USING_ADC1) || defined(BSP_USING_ADC2) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ADC_CONFIG_H__ */
diff --git a/bsp/Infineon/libraries/HAL_Drivers/config/xmc7200/adc_config.h b/bsp/Infineon/libraries/HAL_Drivers/config/xmc7200/adc_config.h
@@ -0,0 +1,62 @@
+/*
+ * Copyright (c) 2006-2025, RT-Thread Development Team
+ *
+ * SPDX-License-Identifier: Apache-2.0
+ *
+ * Change Logs:
+ * Date           Author    Notes
+ * 2025-05-28     RTT       the first version
+ */
+#ifndef __ADC_CONFIG_H__
+#define __ADC_CONFIG_H__
+
+#include <rtthread.h>
+#include <rtdevice.h>
+#include "drv_common.h"
+#include "cyhal.h"
+#include "cybsp.h"
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+#if defined(BSP_USING_ADC1) || defined(BSP_USING_ADC2)
+
+cyhal_adc_t adc_obj;
+cyhal_adc_channel_t adc_chan_obj;
+
+const cyhal_adc_config_t adc_config = {
+        .continuous_scanning = false,   // Continuous Scanning is disabled
+        .average_count = 1,             // Average count disabled
+        .vref = CYHAL_ADC_REF_VDDA,     // VREF for Single ended channel set to VDDA
+        .vneg = CYHAL_ADC_VNEG_VSSA,    // VNEG for Single ended channel set to VSSA
+        .resolution = 12u,              // 12-bit resolution
+        .ext_vref = NC,                 // No connection
+        .bypass_pin = NC                // No connection
+};
+
+struct ifx_adc
+{
+    struct rt_adc_device ifx_adc_device;
+    cyhal_adc_channel_t *adc_ch;
+    char *name;
+};
+
+const cyhal_gpio_t adc_gpio[8] = {P14_0, P14_1, P14_2, P14_3, P14_4, P14_5, P14_6, P14_7};
+
+#ifndef ADC1_CONFIG
+#define ADC1_CONFIG                 \
+    {                               \
+        .adc_ch = &adc_chan_obj,    \
+        .name = "adc1",             \
+    }
+#endif
+
+#endif /* defined(BSP_USING_ADC1) || defined(BSP_USING_ADC2) */
+
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* __ADC_CONFIG_H__ */
diff --git a/bsp/Infineon/libraries/HAL_Drivers/drv_adc.c b/bsp/Infineon/libraries/HAL_Drivers/drv_adc.c
@@ -7,27 +7,14 @@
  * Date           Author       Notes
  * 2022-07-04     Rbb666       first version
  */
-#include "drv_common.h"
-#include "drv_adc.h"
-
-#include "cyhal.h"
-#include "cybsp.h"
+#include "drv_config.h"
 
 #if defined(BSP_USING_ADC1) || defined(BSP_USING_ADC2)
 
 /*#define DRV_DEBUG*/
 #define LOG_TAG             "drv.adc"
 #include <drv_log.h>
 
-#define VPLUS_CHANNEL_0     (P10_0)
-
-struct ifx_adc
-{
-    struct rt_adc_device ifx_adc_device;
-    cyhal_adc_channel_t *adc_ch;
-    char *name;
-};
-
 static struct ifx_adc ifx_adc_obj[] =
 {
     #ifdef BSP_USING_ADC1
@@ -52,17 +39,15 @@ static rt_err_t ifx_adc_enabled(struct rt_adc_device *device, rt_uint32_t channe
 
     if (enabled)
     {
-        /* Initialize ADC. The ADC block which can connect to pin 10[0] is selected */
-        result = cyhal_adc_init(&adc_obj, VPLUS_CHANNEL_0, NULL);
+        result = cyhal_adc_init(&adc_obj, adc_gpio[channel], NULL);
 
         if (result != RT_EOK)
         {
             LOG_E("ADC initialization failed. Error: %u\n", result);
             return -RT_ENOSYS;
         }
 
-        /* Initialize a channel 0 and configure it to scan P10_0 in single ended mode. */
-        result  = cyhal_adc_channel_init_diff(adc_ch, &adc_obj, VPLUS_CHANNEL_0,
+        result  = cyhal_adc_channel_init_diff(adc_ch, &adc_obj, adc_gpio[channel],
                                               CYHAL_ADC_VNEG, &channel_config);
 
         if (result != RT_EOK)
@@ -76,14 +61,14 @@ static rt_err_t ifx_adc_enabled(struct rt_adc_device *device, rt_uint32_t channe
 
         if (result != RT_EOK)
         {
-            printf("ADC configuration update failed. Error: %u\n", result);
+            rt_kprintf("ADC configuration update failed. Error: %u\n", result);
             return -RT_ENOSYS;
         }
     }
     else
     {
-        cyhal_adc_free(&adc_obj);
         cyhal_adc_channel_free(adc_ch);
+        cyhal_adc_free(&adc_obj);
     }
 
     return RT_EOK;
@@ -119,7 +104,7 @@ static int rt_hw_adc_init(void)
         /* register ADC device */
         if (rt_hw_adc_register(&ifx_adc_obj[i].ifx_adc_device, ifx_adc_obj[i].name, &at_adc_ops, ifx_adc_obj[i].adc_ch) == RT_EOK)
         {
-            LOG_D("%s register success", at32_adc_obj[i].name);
+            LOG_D("%s register success", ifx_adc_obj[i].name);
         }
         else
         {

Original file line number	Diff line number	Diff line change
`@@ -7,27 +7,14 @@`
`7`	`7`	`* Date Author Notes`
`8`	`8`	`* 2022-07-04 Rbb666 first version`
`9`	`9`	`*/`
`10`		`-#include "drv_common.h"`
`11`		`-#include "drv_adc.h"`
`12`		`-`
`13`		`-#include "cyhal.h"`
`14`		`-#include "cybsp.h"`
	`10`	`+#include "drv_config.h"`
`15`	`11`
`16`	`12`	`#if defined(BSP_USING_ADC1) \|\| defined(BSP_USING_ADC2)`
`17`	`13`
`18`	`14`	`/#define DRV_DEBUG/`
`19`	`15`	`#define LOG_TAG "drv.adc"`
`20`	`16`	`#include <drv_log.h>`
`21`	`17`
`22`		`-#define VPLUS_CHANNEL_0 (P10_0)`
`23`		`-`
`24`		`-struct ifx_adc`
`25`		`-{`
`26`		`- struct rt_adc_device ifx_adc_device;`
`27`		`- cyhal_adc_channel_t *adc_ch;`
`28`		`- char *name;`
`29`		`-};`
`30`		`-`
`31`	`18`	`static struct ifx_adc ifx_adc_obj[] =`
`32`	`19`	`{`
`33`	`20`	`#ifdef BSP_USING_ADC1`
`@@ -52,17 +39,15 @@ static rt_err_t ifx_adc_enabled(struct rt_adc_device *device, rt_uint32_t channe`
`52`	`39`
`53`	`40`	`if (enabled)`
`54`	`41`	`{`
`55`		`- /* Initialize ADC. The ADC block which can connect to pin 10[0] is selected */`
`56`		`- result = cyhal_adc_init(&adc_obj, VPLUS_CHANNEL_0, NULL);`
	`42`	`+ result = cyhal_adc_init(&adc_obj, adc_gpio[channel], NULL);`
`57`	`43`
`58`	`44`	`if (result != RT_EOK)`
`59`	`45`	`{`
`60`	`46`	`LOG_E("ADC initialization failed. Error: %u\n", result);`
`61`	`47`	`return -RT_ENOSYS;`
`62`	`48`	`}`
`63`	`49`
`64`		`- /* Initialize a channel 0 and configure it to scan P10_0 in single ended mode. */`
`65`		`- result = cyhal_adc_channel_init_diff(adc_ch, &adc_obj, VPLUS_CHANNEL_0,`
	`50`	`+ result = cyhal_adc_channel_init_diff(adc_ch, &adc_obj, adc_gpio[channel],`
`66`	`51`	`CYHAL_ADC_VNEG, &channel_config);`
`67`	`52`
`68`	`53`	`if (result != RT_EOK)`
`@@ -76,14 +61,14 @@ static rt_err_t ifx_adc_enabled(struct rt_adc_device *device, rt_uint32_t channe`
`76`	`61`
`77`	`62`	`if (result != RT_EOK)`
`78`	`63`	`{`
`79`		`- printf("ADC configuration update failed. Error: %u\n", result);`
	`64`	`+ rt_kprintf("ADC configuration update failed. Error: %u\n", result);`
`80`	`65`	`return -RT_ENOSYS;`
`81`	`66`	`}`
`82`	`67`	`}`
`83`	`68`	`else`
`84`	`69`	`{`
`85`		`- cyhal_adc_free(&adc_obj);`
`86`	`70`	`cyhal_adc_channel_free(adc_ch);`
	`71`	`+ cyhal_adc_free(&adc_obj);`
`87`	`72`	`}`
`88`	`73`
`89`	`74`	`return RT_EOK;`
`@@ -119,7 +104,7 @@ static int rt_hw_adc_init(void)`
`119`	`104`	`/* register ADC device */`
`120`	`105`	`if (rt_hw_adc_register(&ifx_adc_obj[i].ifx_adc_device, ifx_adc_obj[i].name, &at_adc_ops, ifx_adc_obj[i].adc_ch) == RT_EOK)`
`121`	`106`	`{`
`122`		`- LOG_D("%s register success", at32_adc_obj[i].name);`
	`107`	`+ LOG_D("%s register success", ifx_adc_obj[i].name);`
`123`	`108`	`}`
`124`	`109`	`else`
`125`	`110`	`{`