Skip to content

Commit 00c4519

Browse files
authored
Merge branch 'RT-Thread:master' into upstream
2 parents 66c6eee + 99a2545 commit 00c4519

File tree

4,857 files changed

+1100321
-1117072
lines changed

Some content is hidden

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

4,857 files changed

+1100321
-1117072
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: 16 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -160,6 +160,7 @@
160160
"stm32/stm32f407-atk-explorer",
161161
"stm32/stm32f407-robomaster-c",
162162
"stm32/stm32f407-st-discovery",
163+
"stm32/stm32f407-micu",
163164
"stm32/stm32f410-st-nucleo",
164165
"stm32/stm32f411-st-nucleo",
165166
"stm32/stm32f411-atk-nano",
@@ -195,6 +196,7 @@
195196
"stm32/stm32h563-st-nucleo",
196197
"stm32/stm32h503-st-nucleo",
197198
"stm32/stm32h723-st-nucleo",
199+
"stm32/stm32h723-lxb-disco",
198200
"stm32/stm32h730-esphosted-evb",
199201
"stm32/stm32h743-armfly-v7",
200202
"stm32/stm32h743-atk-apollo",
@@ -246,24 +248,28 @@
246248
"nxp/mcx/mcxc/frdm-mcxc444",
247249
"nxp/mcx/mcxa/frdm-mcxa153",
248250
"nxp/mcx/mcxa/frdm-mcxa156",
249-
"nxp/mcx/mcxa/frdm-mcxa346",
251+
"nxp/mcx/mcxa/frdm-mcxa346",
250252
"nxp/mcx/mcxe/frdm-mcxe247",
251253
"renesas/ebf_qi_min_6m5",
252254
"renesas/ra6m4-cpk",
253255
"renesas/ra6m4-iot",
254256
"renesas/ra6m3-ek",
255257
"renesas/ra6m3-hmi-board",
258+
"renesas/ra6e2-ek",
256259
"renesas/ra6e2-fpb",
257260
"renesas/ra4e2-eco",
261+
"renesas/ra4m1-ek",
258262
"renesas/ra4m2-eco",
259263
"renesas/ra2l1-cpk",
260264
"renesas/ra8m1-ek",
261265
"renesas/ra8d1-ek",
262266
"renesas/ra8d1-vision-board",
267+
"renesas/ra8p1-titan-board",
263268
"renesas/rzt2m_rsk",
264269
"renesas/rzn2l_rsk",
265270
"renesas/rzn2l_etherkit",
266271
"renesas/ra2a1-ek",
272+
"renesas/ra2e2-ek",
267273
"frdm-k64f",
268274
"xplorer4330/M4"
269275
]
@@ -381,7 +387,8 @@
381387
"SUB_RTT_BSP": [
382388
"qemu-virt64-aarch64",
383389
"raspberry-pi/raspi3-64",
384-
"raspberry-pi/raspi4-64"
390+
"raspberry-pi/raspi4-64",
391+
"nxp/imx/imx91"
385392
]
386393
},
387394
{
@@ -391,7 +398,8 @@
391398
"k210",
392399
"wch/risc-v/ch32v208w-r0",
393400
"wch/risc-v/ch32v307v-r1",
394-
"wch/risc-v/yd-ch32v307vct6"
401+
"wch/risc-v/yd-ch32v307vct6",
402+
"gd32/risc-v/gd32vw553h-eval"
395403
]
396404
},
397405
{
@@ -422,7 +430,9 @@
422430
"hpmicro/hpm5300evk",
423431
"hpmicro/hpm5301evklite",
424432
"hpmicro/hpm6800evk",
425-
"hpmicro/hpm6e00evk"
433+
"hpmicro/hpm6e00evk",
434+
"hpmicro/hpm6p00evk",
435+
"hpmicro/hpm5e00evk"
426436
]
427437
},
428438
{
@@ -477,6 +487,7 @@
477487
"RTT_BSP": "xuantie",
478488
"RTT_TOOL_CHAIN": "sourcery-Xuantie-900-gcc-elf-newlib",
479489
"SUB_RTT_BSP": [
490+
"xuantie/smartl/e901",
480491
"xuantie/smartl/e902",
481492
"xuantie/smartl/e906",
482493
"xuantie/smartl/e907",
@@ -504,4 +515,4 @@
504515
]
505516
}
506517
]
507-
}
518+
}

.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

0 commit comments

Comments
 (0)