Skip to content

Commit 895f809

Browse files
authored
Merge branch 'RT-Thread:master' into master
2 parents 650f815 + c8f0a26 commit 895f809

File tree

606 files changed

+123783
-7017
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

606 files changed

+123783
-7017
lines changed

.github/ALL_BSP_COMPILE.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -256,6 +256,7 @@
256256
"renesas/ra6e2-ek",
257257
"renesas/ra6e2-fpb",
258258
"renesas/ra4e2-eco",
259+
"renesas/ra4m1-ek",
259260
"renesas/ra4m2-eco",
260261
"renesas/ra2l1-cpk",
261262
"renesas/ra8m1-ek",

.github/copilot-instructions.md

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,16 +18,29 @@ When reviewing code, provide feedback in **both English and Chinese** to ensure
1818

1919
1. **Real-Time Performance / 实时性能**
2020
- Verify interrupt handling efficiency / 验证中断处理效率
21-
2221
2. **Memory Management / 内存管理**
2322
- Detect memory leaks / 检测内存泄漏
2423
- Verify proper memory allocation/deallocation / 验证正确的内存分配/释放
2524
- Check stack usage optimization / 检查栈使用优化
26-
2725
3. **Code Style / 代码风格**
2826
- Follow RT-Thread coding standards / 遵循 RT-Thread 编码标准
2927
- Maintain consistent naming conventions / 保持一致的命名约定
3028
- Ensure proper code comments (not documentation) / 确保适当的代码注释(而非文档)
29+
4. **PR Title Naming Guidelines / PR 标题命名规范**
30+
- **Specify the module or keyword / 明确模块或关键字**
31+
- 标题需明确指出涉及的具体模块、子系统或关键字,例如具体的 BSP(Board Support Package)或芯片厂商名称(如 STM32, ESP32, NXP 等)。
32+
- 示例:[STM32][I2C] Fix Kconfig parsing error 而非 fix:I2C——Kconfig修改。
33+
- **Clearly describe the content being repaired or modified / 清晰描述修复或更改内容**
34+
- 标题需简洁清晰地描述修复的问题、添加的功能或修改的内容,避免模糊或过于简略的描述。
35+
- 示例:[STM32][SPI] Fix buffer overflow in SPI driver 而非 SPI bug fix。
36+
- **Format Recommendations / 格式建议**
37+
- 推荐使用 [模块/厂商][子系统] 具体描述 的格式,确保标题结构化且信息完整。
38+
- 使用英文描述问题(除非项目明确要求使用其他语言),以提高国际化可读性。
39+
- 示例:[NXP][UART] Add timeout handling for UART receive。
40+
- **Issues to Avoid / 避免的问题**
41+
- 不要使用模糊的术语,如“修复问题”或“代码优化”,需具体说明问题或优化的内容。
42+
- 避免使用不规范的符号(如 ——),建议使用标准英文字符(如 - 或 :)。
43+
- 不要省略关键上下文信息,如 BSP 或芯片厂商。
3144

3245
### Review Comment Format / 审查评论格式
3346

@@ -46,7 +59,6 @@ Example/示例:
4659
// Your code example here / 你的代码示例
4760
```
4861
```
49-
5062
### Common Issues to Check / 常见问题检查
5163
5264
1. **Resource Management / 资源管理**
@@ -194,3 +206,4 @@ When suggesting improvements:
194206
- [RT-Thread Coding Style Guide](https://github.com/RT-Thread/rt-thread/blob/master/documentation/coding_style_en.md)
195207
- [RT-Thread 文档中心](https://www.rt-thread.org/document/site/)
196208
- [RT-Thread 编码规范](https://github.com/RT-Thread/rt-thread/blob/master/documentation/coding_style_cn.md)
209+
```

.github/utest/default.cfg

Lines changed: 0 additions & 3 deletions
This file was deleted.

.github/workflows/action_tools.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,10 @@ on:
2929
workflow_dispatch:
3030
repository_dispatch:
3131

32+
concurrency:
33+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
34+
cancel-in-progress: true
35+
3236
permissions:
3337
contents: read # to fetch code (actions/checkout)
3438

@@ -93,4 +97,4 @@ jobs:
9397
scons --pyconfig-silent -C $TEST_BSP_ROOT/dist/project
9498
scons --pyconfig-silent -C $TEST_BSP_ROOT/rt-studio-project
9599
scons -C $TEST_BSP_ROOT/dist/project
96-
scons -C $TEST_BSP_ROOT/rt-studio-project
100+
scons -C $TEST_BSP_ROOT/rt-studio-project

.github/workflows/action_utest.yml

Lines changed: 0 additions & 151 deletions
This file was deleted.

.github/workflows/auto_assign_reviewers.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,10 @@ on:
2020
branches: [ master ]
2121
types: [opened, synchronize, reopened]
2222

23+
concurrency:
24+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
25+
cancel-in-progress: true
26+
2327
jobs:
2428
assign-reviewers:
2529
runs-on: ubuntu-22.04

.github/workflows/auto_labeler.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ name: "Pull Request Labeler"
1515
on:
1616
- pull_request_target
1717

18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
20+
cancel-in-progress: true
21+
1822
jobs:
1923
labeler:
2024
permissions:

.github/workflows/bsp_buildings.yml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -47,6 +47,10 @@ on:
4747
- online-pkgs-static-building-trigger-event
4848
workflow_dispatch:
4949

50+
concurrency:
51+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
52+
cancel-in-progress: true
53+
5054
permissions:
5155
contents: read # to fetch code (actions/checkout)
5256

.github/workflows/compile_bsp_with_drivers.yml

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,6 +15,10 @@ name: BSP compilation with more drivers
1515
on:
1616
workflow_dispatch: #disable
1717

18+
concurrency:
19+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
20+
cancel-in-progress: true
21+
1822
permissions:
1923
contents: read # to fetch code (actions/checkout)
2024

@@ -54,4 +58,4 @@ jobs:
5458
shell: bash
5559
run: |
5660
# source ~/.env/env.sh
57-
# python tools/ci/compile_bsp_with_drivers.py
61+
# python tools/ci/compile_bsp_with_drivers.py

.github/workflows/doxygen.yml

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,10 @@ on:
3131
schedule:
3232
- cron: '0 16 30 * *'
3333
workflow_dispatch:
34+
35+
concurrency:
36+
group: ${{ github.workflow }}-${{ github.event.pull_request.number || github.ref }}
37+
cancel-in-progress: true
3438

3539
permissions:
3640
contents: read
@@ -55,8 +59,8 @@ jobs:
5559
shell: bash
5660
run: |
5761
cd documentation
58-
doxygen Doxyfile
59-
cat Doxyfile
62+
doxygen Doxyfile.1.9.1
63+
cat Doxyfile.1.9.1
6064
6165
- name: Upload static files as artifact
6266
id: deployment
@@ -74,4 +78,4 @@ jobs:
7478
steps:
7579
- name: Deploy to GitHub Pages
7680
id: deployment
77-
uses: actions/deploy-pages@main
81+
uses: actions/deploy-pages@main

0 commit comments

Comments
 (0)