Conversation
…文件格式,修改n32h7xxx/n32/n32hxxx/n32h760zil7-stb/applications/main.c文件,区别处理Nano下头文件包含
# Conflicts: # bsp/n32/libraries/n32_drivers/drv_hwtimer.c # bsp/n32/libraries/n32_drivers/drv_hwtimer.h # bsp/n32/n32g457qel-stb/project.uvprojx # bsp/n32/n32g45xcl-stb/project.uvprojx # bsp/n32/n32g45xml-stb/project.uvprojx # bsp/n32/n32g45xrl-stb/project.uvprojx # bsp/n32/n32g45xvl-stb/project.uvprojx # bsp/n32/n32g4frml-stb/project.uvprojx # bsp/n32/n32gxx_lxx/libraries/n32_drivers/drv_hwtimer.c # bsp/n32/n32gxx_lxx/libraries/n32_drivers/drv_hwtimer.h # bsp/n32/n32gxx_lxx/libraries/n32_drivers/drv_timer.c # bsp/n32/n32gxx_lxx/libraries/n32_drivers/drv_timer.h # bsp/n32/n32gxx_lxx/n32g43xcl-stb/project.ewp # bsp/n32/n32gxx_lxx/n32g457qel-stb/project.ewp # bsp/n32/n32gxx_lxx/n32g45xcl-stb/project.ewp # bsp/n32/n32gxx_lxx/n32g45xml-stb/project.ewp # bsp/n32/n32gxx_lxx/n32g45xrl-stb/project.ewp # bsp/n32/n32gxx_lxx/n32g45xvl-stb/project.ewp # bsp/n32/n32gxx_lxx/n32g4frml-stb/project.ewp # bsp/n32/n32gxx_lxx/n32l40xcl-stb/project.ewp # bsp/n32/n32gxx_lxx/n32l436-evb/project.ewp # bsp/n32/n32gxx_lxx/n32l43xml-stb/project.ewp # bsp/n32/n32gxx_lxx/n32l43xrl-stb/project.ewp # bsp/n32/n32gxx_lxx/n32l43xrl-stb/project.uvprojx # bsp/n32/n32gxx_lxx/n32wb45xl-evb/project.ewp # bsp/n32/n32l40xcl-stb/project.uvprojx # bsp/n32/n32l436-evb/project.uvprojx # bsp/n32/n32l43xml-stb/project.uvprojx # bsp/n32/n32wb45xl-evb/project.uvprojx
|
👋 感谢您对 RT-Thread 的贡献!Thank you for your contribution to RT-Thread! 为确保代码符合 RT-Thread 的编码规范,请在你的仓库中执行以下步骤运行代码格式化工作流(如果格式化CI运行失败)。 🛠 操作步骤 | Steps
完成后,提交将自动更新至 如有问题欢迎联系我们,再次感谢您的贡献!💐 |
|
@OnlyoutzZ commit需要压缩成一个提交 |
|
请教哈,如何压缩成一个commit?
…---- 回复的原邮件 ----
| 发件人 | ***@***.***> |
| 发送日期 | 2026年02月04日 22:09 |
| 收件人 | RT-Thread/rt-thread ***@***.***> |
| 抄送人 | Onlyou_tzZ ***@***.***>,
Mention ***@***.***> |
| 主题 | Re: [RT-Thread/rt-thread] 更新BSP中README.md中N32相关描述 (PR #11173) |
Rbb666 left a comment (RT-Thread/rt-thread#11173)
@OnlyoutzZ commit需要压缩成一个提交
—
Reply to this email directly, view it on GitHub, or unsubscribe.
You are receiving this because you were mentioned.Message ID: ***@***.***>
|
先拉取github-master上游,然后rebase此commit到最新基点提交 |
commit cadd095 Merge: 5ad4edc 68da106 Author: Onlyou_tzZ <97173915+OnlyoutzZ@users.noreply.github.com> Date: Wed Feb 4 22:50:54 2026 +0800 Merge branch 'RT-Thread:master' into master commit 68da106 Author: CYFS <2805686936@qq.com> Date: Wed Feb 4 16:45:30 2026 +0800 [components][drivers]:fix wlan err commit 5ad4edc Author: Onlyou_tzZ <17393117531@163.com> Date: Wed Feb 4 20:22:40 2026 +0800 更新BSP下README.md中N32相关的描述
您好!已经变基到上有仓库的最新commit并发起RP,有时间时候帮忙审核哈,谢谢 |


拉取/合并请求描述:(PR description)
[
为什么提交这份PR (why to submit this PR)
更新BSP中README.md中N32相关描述
你的解决方案是什么 (what is your solution)
更新BSP中README.md中N32相关描述
]
当前拉取/合并请求的状态 Intent for your PR
必须选择一项 Choose one (Mandatory):
代码质量 Code Quality:
我在这个拉取/合并请求中已经考虑了 As part of this pull request, I've considered the following:
#if 0代码,不包含已经被注释了的代码 All redundant code is removed and cleaned up