Skip to content

bsp: k230: add support for PWM driver #10536

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

Closed
DannyRay019 wants to merge 1 commit into from
Closed

bsp: k230: add support for PWM driver #10536

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
23 changes: 20 additions & 3 deletions bsp/k230/.config
View file
Open in desktop
Copy link
Contributor

@unicornx unicornx Jul 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

你这里 .config 的变化有点多啊。我基于 d23006e， 应该也是你提的 pr 所基于的 master 吧，执行一下命令：

cd bsp/k230
scons -c
scons --menuconfig # 什么也不做，只是保存后退出

得到的 .config 和原先的 .config 的 diff 见附件：
diff_config.txt

你是不是把你本地的一些配置修改全部提交上来了？请清理一下。原则上应该只有我这里看到的这些 diff（这主要是 master 升级后其它 kconfig 修改导致的 default 值的变化）加上你这次 pwm 相关的配置变化才对。

Original file line number Diff line number Diff line change
Expand Up @@ -204,6 +204,9 @@ CONFIG_ARCH_MM_MMU=y
CONFIG_KERNEL_VADDR_START=0xffffffc000000000
CONFIG_ARCH_RISCV=y
CONFIG_ARCH_RISCV_FPU=y
CONFIG_ARCH_RISCV_VECTOR=y
CONFIG_ARCH_VECTOR_VLEN_128=y
# CONFIG_ARCH_VECTOR_VLEN_256 is not set
CONFIG_ARCH_RISCV_FPU_D=y
CONFIG_ARCH_RISCV64=y
CONFIG_ARCH_USING_NEW_CTX_SWITCH=y
Expand Down Expand Up @@ -706,6 +709,7 @@ CONFIG_RT_USING_VDSO=y
# CONFIG_PKG_USING_LHC_MODBUS is not set
# CONFIG_PKG_USING_QMODBUS is not set
# CONFIG_PKG_USING_PNET is not set
# CONFIG_PKG_USING_OPENER is not set
# end of IoT - internet of things

#
Expand Down Expand Up @@ -839,6 +843,7 @@ CONFIG_RT_USING_VDSO=y
# CONFIG_PKG_USING_VOFA_PLUS is not set
# CONFIG_PKG_USING_ZDEBUG is not set
# CONFIG_PKG_USING_RVBACKTRACE is not set
# CONFIG_PKG_USING_HPATCHLITE is not set
# end of tools packages

#
Expand Down Expand Up @@ -867,7 +872,6 @@ CONFIG_RT_USING_VDSO=y
#
# CONFIG_PKG_USING_CMSIS_5 is not set
# CONFIG_PKG_USING_CMSIS_CORE is not set
# CONFIG_PKG_USING_CMSIS_DSP is not set
# CONFIG_PKG_USING_CMSIS_NN is not set
# CONFIG_PKG_USING_CMSIS_RTOS1 is not set
# CONFIG_PKG_USING_CMSIS_RTOS2 is not set
Expand Down Expand Up @@ -919,7 +923,6 @@ CONFIG_RT_USING_VDSO=y
# CONFIG_PKG_USING_ARM_2D is not set
# CONFIG_PKG_USING_MCUBOOT is not set
# CONFIG_PKG_USING_TINYUSB is not set
# CONFIG_PKG_USING_CHERRYUSB is not set
# CONFIG_PKG_USING_KMULTI_RTIMER is not set
# CONFIG_PKG_USING_TFDB is not set
# CONFIG_PKG_USING_QPC is not set
Expand All @@ -931,6 +934,7 @@ CONFIG_RT_USING_VDSO=y
# CONFIG_PKG_USING_SFDB is not set
# CONFIG_PKG_USING_RTP is not set
# CONFIG_PKG_USING_REB is not set
# CONFIG_PKG_USING_RMP is not set
# CONFIG_PKG_USING_R_RHEALSTONE is not set
# CONFIG_PKG_USING_HEARTBEAT is not set
# end of system packages
Expand Down Expand Up @@ -1021,12 +1025,14 @@ CONFIG_RT_USING_VDSO=y
# CONFIG_PKG_USING_BMI088 is not set
# CONFIG_PKG_USING_HMC5883 is not set
# CONFIG_PKG_USING_MAX6675 is not set
# CONFIG_PKG_USING_MAX31855 is not set
# CONFIG_PKG_USING_TMP1075 is not set
# CONFIG_PKG_USING_SR04 is not set
# CONFIG_PKG_USING_CCS811 is not set
# CONFIG_PKG_USING_PMSXX is not set
# CONFIG_PKG_USING_RT3020 is not set
# CONFIG_PKG_USING_MLX90632 is not set
# CONFIG_PKG_USING_MLX90382 is not set
# CONFIG_PKG_USING_MLX90393 is not set
# CONFIG_PKG_USING_MLX90392 is not set
# CONFIG_PKG_USING_MLX90394 is not set
Expand Down Expand Up @@ -1055,6 +1061,8 @@ CONFIG_RT_USING_VDSO=y
# CONFIG_PKG_USING_ICM20608 is not set
# CONFIG_PKG_USING_PAJ7620 is not set
# CONFIG_PKG_USING_STHS34PF80 is not set
# CONFIG_PKG_USING_P3T1755 is not set
# CONFIG_PKG_USING_QMI8658 is not set
# end of sensors drivers

#
Expand Down Expand Up @@ -1146,6 +1154,9 @@ CONFIG_RT_USING_VDSO=y
# CONFIG_PKG_USING_BT_MX02 is not set
# CONFIG_PKG_USING_GC9A01 is not set
# CONFIG_PKG_USING_IK485 is not set
# CONFIG_PKG_USING_SERVO is not set
# CONFIG_PKG_USING_SEAN_WS2812B is not set
# CONFIG_PKG_USING_IC74HC165 is not set
# CONFIG_PKG_USING_SPI_TOOLS is not set
# end of peripheral libraries and drivers

Expand All @@ -1162,6 +1173,7 @@ CONFIG_RT_USING_VDSO=y
# CONFIG_PKG_USING_QUEST is not set
# CONFIG_PKG_USING_NAXOS is not set
# CONFIG_PKG_USING_R_TINYMAIX is not set
# CONFIG_PKG_USING_LLMCHAT is not set
# end of AI packages

#
Expand Down Expand Up @@ -1238,6 +1250,7 @@ CONFIG_PKG_ZLIB_VER="latest"
# CONFIG_PKG_USING_KI is not set
# CONFIG_PKG_USING_ARMv7M_DWT is not set
# CONFIG_PKG_USING_CRCLIB is not set
# CONFIG_PKG_USING_LIBCRC is not set
# CONFIG_PKG_USING_LWGPS is not set
# CONFIG_PKG_USING_STATE_MACHINE is not set
# CONFIG_PKG_USING_DESIGN_PATTERN is not set
Expand All @@ -1248,6 +1261,7 @@ CONFIG_PKG_ZLIB_VER="latest"
# CONFIG_PKG_USING_SOEM is not set
# CONFIG_PKG_USING_QPARAM is not set
# CONFIG_PKG_USING_CorevMCU_CLI is not set
# CONFIG_PKG_USING_DRMP is not set
# end of miscellaneous packages

#
Expand Down Expand Up @@ -1491,6 +1505,7 @@ CONFIG_PKG_ZLIB_VER="latest"
# Drivers Configuration
#
# CONFIG_BSP_USING_ADC is not set
# CONFIG_BSP_USING_PWM is not set
CONFIG_BSP_USING_HARDLOCK=y
CONFIG_BSP_USING_SDIO=y
CONFIG_BSP_USING_SDIO0=y
Expand All @@ -1503,7 +1518,9 @@ CONFIG_BSP_SD_MNT_DEVNAME="sd0p1"
# CONFIG_BSP_UTEST_DRIVERS is not set
# end of Drivers Configuration

CONFIG_BOARD_fpgac908=y
CONFIG_BOARD_C908=y
CONFIG___STACKSIZE__=65536
CONFIG_BSP_ROOTFS_TYPE_ELMFAT=y
# CONFIG_BSP_ROOTFS_TYPE_CROMFS is not set
# CONFIG_BSP_RISCV_FPU_SOFT is not set
CONFIG_BSP_RISCV_FPU_D=y
Copy link
Contributor

@unicornx unicornx Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

你说的 ”我就手动删掉了大部分“ 这种做法不是合法的做法。我建议你参考以下操作步骤：

  • 假设你的开发分支（pr 的分支）是基于 master 的 commit 为 A 拉出来做的。
  • checkout 到 master 的 A，将目前主线上的 bsp/k230/.config 文件先备份出来
  • checkout 到你提交 pr 的分支，假设 commit 对应的是 B，将上一步备份的 .config 文件复制过来替换你的修改
  • 重新 scons --menuconfig，会生成一份新的 .config 和 rtconfig.h。将这个修改 add/commit, 假设生成的 commit 是 C
  • 将 B 和 C 压缩成一个 D，比较 A 和 D 就是你实际应该提交的针对 .config 和 rtconfig.h 的修改。

Copy link
Contributor Author

@DannyRay019 DannyRay019 Jul 28, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

好的，我尝试一下

16 changes: 16 additions & 0 deletions bsp/k230/board/Kconfig
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,22 @@ menu "Drivers Configuration"
select RT_USING_ADC
default n

menuconfig BSP_USING_PWM
bool "Enable PWM"
select RT_USING_PWM
default n

Copy link
Contributor

@unicornx unicornx Jul 25, 2025

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

你好像没有理解我说的配置里面做两个 PWM 的意思，摘录 bsp/k230/board/Kconfig 里 watchdog 的写法你再参考一下，参考改成 PWM 的样子。因为我们有两个 PWM 设备，允许用户通过配置开一个或者关一个。默认可以都关掉。做的好一点可以根据我们支持的 01studio 的板子的支持情况，譬如板子有默认开哪个就开哪个。这个目前我们做得比较粗糙后面可以改进。但至少要支持多个 PWM 的可配置。

    menuconfig BSP_USING_WDT
        bool "Enable Watchdog Timer"
        select RT_USING_WDT
        default n

        if BSP_USING_WDT
            config BSP_USING_WDT0
                bool "Enable WDT0"
                default n

            config BSP_USING_WDT1
                bool "Enable WDT1"
                default n

        endif

if BSP_USING_PWM
config BSP_USING_PWM0
bool "Enable PWM0"
default n

config BSP_USING_PWM1
bool "Enable PWM1"
default n

endif

config BSP_USING_HARDLOCK
bool "Enable Hard-Lock"
default y
Expand Down
11 changes: 11 additions & 0 deletions bsp/k230/drivers/interdrv/pwm/SConscript
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# RT-Thread building script for component

from building import *

cwd = GetCurrentDir()
src = Glob('*.c')
CPPPATH = [cwd]

group = DefineGroup('PWM', src, depend = ['BSP_USING_PWM'], CPPPATH = CPPPATH)

Return('group')
Loading