Skip to content

[bsp/Infineon] Fix PWM macro mismatches left by the CHx_PORTy rename #11802

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
mengxinyuan638 wants to merge 1 commit into
base: master
Choose a base branch
from
+22 −22
Open

[bsp/Infineon] Fix PWM macro mismatches left by the CHx_PORTy rename #11802

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion bsp/Infineon/libraries/HAL_Drivers/drv_pwm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -75,7 +75,7 @@ static struct ifx_pwm ifx_pwm_obj[] =
PWM0_CH7_PORT12_CONFIG,
#endif

#ifdef BSP_USING_PWM0_CH7_PORT13
#ifdef BSP_USING_PWM0_CH3_PORT13
PWM0_CH3_PORT13_CONFIG,
#endif
};
Expand Down
4 changes: 2 additions & 2 deletions bsp/Infineon/libraries/templates/PSOC62/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
bool "Enable PWM0 channel3"
default n
if BSP_USING_PWM0_CH3
config BSP_USING_PWM0_PORT13
bool "Enable PWM0-PORT13 output pwm"
config BSP_USING_PWM0_CH3_PORT13
bool "Enable PWM0-CH3-PORT13 output pwm"
default n
endif
menuconfig BSP_USING_PWM0_CH7
Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/libraries/templates/PSOC62/board/ports/slider_sample.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ void Slider_Init(void)
return;
}

#ifdef BSP_USING_PWM0_PORT13
#ifdef BSP_USING_PWM0_CH3_PORT13
/* Initiate PWM*/
pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);

Expand Down
4 changes: 2 additions & 2 deletions bsp/Infineon/psoc6-cy8ckit-062-BLE/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
bool "Enable PWM0 channel3"
default n
if BSP_USING_PWM0_CH3
config BSP_USING_PWM0_PORT13
bool "Enable PWM0-PORT13 output pwm"
config BSP_USING_PWM0_CH3_PORT13
bool "Enable PWM0-CH3-PORT13 output pwm"
default n
endif
menuconfig BSP_USING_PWM0_CH7
Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/psoc6-cy8ckit-062-BLE/board/ports/slider_sample.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ void Slider_Init(void)
return;
}

#ifdef BSP_USING_PWM0_PORT13
#ifdef BSP_USING_PWM0_CH3_PORT13
/* Initiate PWM*/
pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);

Expand Down
4 changes: 2 additions & 2 deletions bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
bool "Enable PWM0 channel3"
default n
if BSP_USING_PWM0_CH3
config BSP_USING_PWM0_PORT13
bool "Enable PWM0-PORT13 output pwm"
config BSP_USING_PWM0_CH3_PORT13
bool "Enable PWM0-CH3-PORT13 output pwm"
default n
endif
menuconfig BSP_USING_PWM0_CH7
Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/psoc6-cy8ckit-062-WIFI-BT/board/ports/slider_sample.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ void Slider_Init(void)
return;
}

#ifdef BSP_USING_PWM0_PORT13
#ifdef BSP_USING_PWM0_CH3_PORT13
/* Initiate PWM*/
pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);

Expand Down
6 changes: 3 additions & 3 deletions bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
bool "Enable PWM0 channel3"
default n
if BSP_USING_PWM0_CH3
config BSP_USING_PWM0_PORT13
bool "Enable PWM0-PORT13 output pwm"
config BSP_USING_PWM0_CH3_PORT13
bool "Enable PWM0-CH3-PORT13 output pwm"
default n
endif
menuconfig BSP_USING_PWM0_CH7
Expand Down Expand Up @@ -270,7 +270,7 @@ menu "Board extended module Drivers"
select BSP_USING_PWM
select BSP_USING_PWM0
select BSP_USING_PWM0_CH3
select BSP_USING_PWM0_PORT13
select BSP_USING_PWM0_CH3_PORT13
default n
endif

Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/psoc6-cy8ckit-062S2-43012/board/ports/slider_sample.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void Slider_Init(void)
return;
}

#ifdef BSP_USING_PWM0_PORT13
#ifdef BSP_USING_PWM0_CH3_PORT13
/* Initiate PWM*/
pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);

Expand Down
4 changes: 2 additions & 2 deletions bsp/Infineon/psoc6-cy8ckit-062s4/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
bool "Enable PWM0 channel3"
default n
if BSP_USING_PWM0_CH3
config BSP_USING_PWM0_PORT13
bool "Enable PWM0-PORT13 output pwm"
config BSP_USING_PWM0_CH3_PORT13
bool "Enable PWM0-CH3-PORT13 output pwm"
default n
endif
menuconfig BSP_USING_PWM0_CH7
Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/psoc6-cy8ckit-062s4/board/ports/slider_sample.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -127,7 +127,7 @@ void Slider_Init(void)
return;
}

#ifdef BSP_USING_PWM0_PORT13
#ifdef BSP_USING_PWM0_CH3_PORT13
/* Initiate PWM*/
pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);

Expand Down
6 changes: 3 additions & 3 deletions bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,8 +61,8 @@ menu "On-chip Peripheral Drivers"
bool "Enable PWM0 channel3"
default n
if BSP_USING_PWM0_CH3
config BSP_USING_PWM0_PORT13
bool "Enable PWM0-PORT13 output pwm"
config BSP_USING_PWM0_CH3_PORT13
bool "Enable PWM0-CH3-PORT13 output pwm"
default n
endif
menuconfig BSP_USING_PWM0_CH7
Expand Down Expand Up @@ -270,7 +270,7 @@ menu "Board extended module Drivers"
select BSP_USING_PWM
select BSP_USING_PWM0
select BSP_USING_PWM0_CH3
select BSP_USING_PWM0_PORT13
select BSP_USING_PWM0_CH3_PORT13
default n
endif

Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/psoc6-cy8cproto-062S3-4343W/board/ports/slider_sample.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void Slider_Init(void)
return;
}

#ifdef BSP_USING_PWM0_PORT13
#ifdef BSP_USING_PWM0_CH3_PORT13
/* Initiate PWM*/
pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);

Expand Down
2 changes: 1 addition & 1 deletion bsp/Infineon/psoc6-evaluationkit-062S2/board/ports/slider_sample.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -128,7 +128,7 @@ void Slider_Init(void)
return;
}

#ifdef BSP_USING_PWM0_PORT0
#ifdef BSP_USING_PWM0_CH0_PORT0
/* Initiate PWM*/
pwm_dev = (struct rt_device_pwm *)rt_device_find(PWM_DEV_NAME);

Expand Down
Loading