Skip to content

Commit 5586747

Browse files
authored
Merge branch 'RT-Thread:master' into master
2 parents 8ef4025 + d9a6a53 commit 5586747

File tree

1,779 files changed

+174306
-1041463
lines changed

Some content is hidden

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

1,779 files changed

+174306
-1041463
lines changed

.clang-format

Lines changed: 15 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -4,14 +4,13 @@
44
#
55
# clang-format -style=llvm -dump-config > .clang-format
66
#
7-
---
87
Language: Cpp
98
BasedOnStyle: LLVM
109
AccessModifierOffset: -1
1110
AlignAfterOpenBracket: Align
12-
AlignArrayOfStructures: Right
11+
AlignArrayOfStructures: None
1312
AlignConsecutiveAssignments:
14-
Enabled: true
13+
Enabled: false
1514
AcrossEmptyLines: false
1615
AcrossComments: false
1716
AlignCompound: true
@@ -23,7 +22,7 @@ AlignConsecutiveBitFields:
2322
AlignCompound: true
2423
PadOperators: true
2524
AlignConsecutiveDeclarations:
26-
Enabled: true
25+
Enabled: false
2726
AcrossEmptyLines: false
2827
AcrossComments: false
2928
AlignCompound: false
@@ -42,17 +41,17 @@ AlignConsecutiveShortCaseStatements:
4241
AlignEscapedNewlines: Left
4342
AlignOperands: Align
4443
AlignTrailingComments:
45-
Kind: Always
44+
Kind: Leave
4645
OverEmptyLines: 1
4746
AllowAllArgumentsOnNextLine: false
4847
AllowAllParametersOfDeclarationOnNextLine: false
49-
AllowShortBlocksOnASingleLine: Always
48+
AllowShortBlocksOnASingleLine: false
5049
AllowShortCaseLabelsOnASingleLine: false
5150
AllowShortEnumsOnASingleLine: false
52-
AllowShortFunctionsOnASingleLine: None
53-
AllowShortIfStatementsOnASingleLine: WithoutElse
51+
AllowShortFunctionsOnASingleLine: Inline
52+
AllowShortIfStatementsOnASingleLine: false
5453
AllowShortLambdasOnASingleLine: All
55-
AllowShortLoopsOnASingleLine: true
54+
AllowShortLoopsOnASingleLine: false
5655
AlwaysBreakAfterDefinitionReturnType: None
5756
AlwaysBreakAfterReturnType: None
5857
AlwaysBreakBeforeMultilineStrings: false
@@ -62,8 +61,9 @@ AttributeMacros:
6261
BinPackArguments: true
6362
BinPackParameters: true
6463
BitFieldColonSpacing: Both
64+
BreakBeforeBraces: Custom
6565
BraceWrapping:
66-
AfterCaseLabel: false
66+
AfterCaseLabel: true
6767
AfterClass: true
6868
AfterControlStatement: Always
6969
AfterEnum: true
@@ -72,7 +72,7 @@ BraceWrapping:
7272
AfterNamespace: true
7373
AfterObjCDeclaration: true
7474
AfterStruct: true
75-
AfterUnion: false
75+
AfterUnion: true
7676
BeforeCatch: true
7777
BeforeElse: true
7878
BeforeLambdaBody: false
@@ -84,9 +84,8 @@ BraceWrapping:
8484
BreakAfterAttributes: Never
8585
BreakAfterJavaFieldAnnotations: false
8686
BreakArrays: false
87-
BreakBeforeBinaryOperators: NonAssignment
87+
BreakBeforeBinaryOperators: None
8888
BreakBeforeConceptDeclarations: Always
89-
BreakBeforeBraces: Custom
9089
BreakBeforeInlineASMColon: OnlyMultiline
9190
BreakBeforeTernaryOperators: true
9291
BreakConstructorInitializers: AfterColon
@@ -97,7 +96,7 @@ CommentPragmas: "^ IWYU pragma:"
9796
CompactNamespaces: false
9897
ConstructorInitializerIndentWidth: 4
9998
ContinuationIndentWidth: 4
100-
Cpp11BracedListStyle: true
99+
Cpp11BracedListStyle: false
101100
DerivePointerAlignment: false
102101
DisableFormat: false
103102
EmptyLineAfterAccessModifier: Never
@@ -154,7 +153,7 @@ LineEnding: DeriveLF
154153
MacroBlockBegin: ""
155154
MacroBlockEnd: ""
156155
MaxEmptyLinesToKeep: 2
157-
NamespaceIndentation: None
156+
NamespaceIndentation: All
158157
ObjCBinPackProtocolList: Auto
159158
ObjCBlockIndentWidth: 2
160159
ObjCBreakBeforeNestedBlockParam: true
@@ -237,6 +236,4 @@ WhitespaceSensitiveMacros:
237236
- CF_SWIFT_NAME
238237
- NS_SWIFT_NAME
239238
- PP_STRINGIZE
240-
- STRINGIZE
241-
---
242-
239+
- STRINGIZE

.github/ALL_BSP_COMPILE.json

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -424,7 +424,9 @@
424424
"hpmicro/hpm5300evk",
425425
"hpmicro/hpm5301evklite",
426426
"hpmicro/hpm6800evk",
427-
"hpmicro/hpm6e00evk"
427+
"hpmicro/hpm6e00evk",
428+
"hpmicro/hpm6p00evk",
429+
"hpmicro/hpm5e00evk"
428430
]
429431
},
430432
{

.github/CODEOWNERS

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22

33
# https://help.github.com/en/articles/about-code-owners#codeowners-syntax
44

5-
/.github @supperthomas
5+
/.github @supperthomas @kurisaW
66
/.gitee @supperthomas
77
/.hooks @supperthomas
88
/.devcontainer @supperthomas
@@ -19,7 +19,8 @@
1919
/bsp/stm32/stm32h750-artpi/ @Rbb666
2020
/bsp/maxim @supperthomas
2121
/bsp/nxp @Rbb666
22-
/bsp/renesas @Rbb666
22+
/bsp/renesas @Rbb666 @kurisaW
23+
/bsp/gd32/arm @kurisaW
2324

2425
*arduino* @mysterywolf
2526
*.attach @mysterywolf

.github/utest/default.cfg

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

.github/utest/kernel/object.cfg

Lines changed: 0 additions & 5 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.

0 commit comments

Comments
 (0)