Skip to content

Conversation

@ljcjames
Copy link
Contributor

@ljcjames ljcjames commented Oct 17, 2025

拉取/合并请求描述:(PR description)

[

为什么提交这份PR (why to submit this PR)

测试rtc发现编译报错:

  1. rtc_alarm_callback在初始化调用前没有声明
  2. 函数类型与infineon底层实现要求的类型不一样,无法使用
  3. 缺少一个#endif

你的解决方案是什么 (what is your solution)

  1. 初始化前增加声明
  2. 修改函数类型使它符合要求
  3. 补充#endif

请提供验证的bsp和config (provide the config and bsp)

  • BSP:bsp\Infineon\psoc6-evaluationkit-062S2
  • .config:CONFIG_RT_USING_RTC=y
    CONFIG_RT_USING_SOFT_RTC=y
  • action:

]

当前拉取/合并请求的状态 Intent for your PR

必须选择一项 Choose one (Mandatory):

  • 本拉取/合并请求是一个草稿版本 This PR is for a code-review and is intended to get feedback
  • 本拉取/合并请求是一个成熟版本 This PR is mature, and ready to be integrated into the repo

代码质量 Code Quality:

我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:

  • 已经仔细查看过代码改动的对比 Already check the difference between PR and old code
  • 代码风格正确,包括缩进空格,命名及其他风格 Style guide is adhered to, including spacing, naming and other styles
  • 没有垃圾代码,代码尽量精简,不包含#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up
  • 所有变更均有原因及合理的,并且不会影响到其他软件组件代码或BSP All modifications are justified and not affect other components or BSP
  • 对难懂代码均提供对应的注释 I've commented appropriately where code is tricky
  • 代码是高质量的 Code in this PR is of high quality
  • 已经使用formatting 等源码格式化工具确保格式符合RT-Thread代码规范 This PR complies with RT-Thread code specification
  • 如果是新增bsp, 已经添加ci检查到.github/ALL_BSP_COMPILE.json 详细请参考链接BSP自查

@CLAassistant
Copy link

CLAassistant commented Oct 17, 2025

CLA assistant check
All committers have signed the CLA.

@github-actions github-actions bot added BSP BSP: Infineon BSP related with Infineon labels Oct 17, 2025
@github-actions
Copy link

👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread!

为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。
To ensure your code complies with RT-Thread's coding style, please run the code formatting workflow by following the steps below (If the formatting of CI fails to run).


🛠 操作步骤 | Steps

  1. 前往 Actions 页面 | Go to the Actions page
    点击进入工作流 → | Click to open workflow →

  2. 点击 Run workflow | Click Run workflow

  • 设置需排除的文件/目录(目录请以"/"结尾)
    Set files/directories to exclude (directories should end with "/")
  • 将目标分支设置为 \ Set the target branch to:rtc
  • 设置PR number为 \ Set the PR number to:10830
  1. 等待工作流完成 | Wait for the workflow to complete
    格式化后的代码将自动推送至你的分支。
    The formatted code will be automatically pushed to your branch.

完成后,提交将自动更新至 rtc 分支,关联的 Pull Request 也会同步更新。
Once completed, commits will be pushed to the rtc branch automatically, and the related Pull Request will be updated.

如有问题欢迎联系我们,再次感谢您的贡献!💐
If you have any questions, feel free to reach out. Thanks again for your contribution!

@ljcjames ljcjames changed the base branch from master to v5.2.2-beta October 17, 2025 04:10
@ljcjames ljcjames changed the base branch from v5.2.2-beta to master October 17, 2025 04:14
}

#ifdef RT_USING_ALARM
void rtc_alarm_callback(void *callback_arg, cyhal_rtc_event_t event);
Copy link
Member

Choose a reason for hiding this comment

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

这块不需要加缩进

Copy link
Contributor Author

Choose a reason for hiding this comment

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

👌,删掉啦

@Rbb666
Copy link
Member

Rbb666 commented Oct 20, 2025

PR标题加上“BSP”/“英飞凌”相关的字样吧

@Rbb666 Rbb666 added this to the v5.2.2 milestone Oct 20, 2025
@ljcjames ljcjames changed the title fix[rsoc]: fix the type of rtc_alarm_callback in drv_rtc [bsp][infineon] fix the type of rtc_alarm_callback in drv_rtc Oct 20, 2025
@Rbb666 Rbb666 merged commit f0659d7 into RT-Thread:master Oct 20, 2025
27 checks passed
@Rbb666 Rbb666 linked an issue Oct 21, 2025 that may be closed by this pull request
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

BSP: Infineon BSP related with Infineon BSP

Projects

None yet

Development

Successfully merging this pull request may close these issues.

[Feature] 5.2.2 版本需合并PR汇总

3 participants