Skip to content

Commit ab8f84c

Browse files
authored
Merge branch 'RT-Thread:master' into master
2 parents d21375b + ec2182e commit ab8f84c

File tree

7,539 files changed

+1463804
-1303219
lines changed

Some content is hidden

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

7,539 files changed

+1463804
-1303219
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: 31 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@
7373
"asm9260t",
7474
"allwinner_tina",
7575
"ft32/ft32f072xb-starter",
76+
"ft32/ft32f407xe-starter",
7677
"mini2440",
7778
"at91/at91sam9g45",
7879
"at91/at91sam9260",
@@ -160,6 +161,7 @@
160161
"stm32/stm32f407-atk-explorer",
161162
"stm32/stm32f407-robomaster-c",
162163
"stm32/stm32f407-st-discovery",
164+
"stm32/stm32f407-micu",
163165
"stm32/stm32f410-st-nucleo",
164166
"stm32/stm32f411-st-nucleo",
165167
"stm32/stm32f411-atk-nano",
@@ -195,6 +197,7 @@
195197
"stm32/stm32h563-st-nucleo",
196198
"stm32/stm32h503-st-nucleo",
197199
"stm32/stm32h723-st-nucleo",
200+
"stm32/stm32h723-lxb-disco",
198201
"stm32/stm32h730-esphosted-evb",
199202
"stm32/stm32h743-armfly-v7",
200203
"stm32/stm32h743-atk-apollo",
@@ -246,20 +249,24 @@
246249
"nxp/mcx/mcxc/frdm-mcxc444",
247250
"nxp/mcx/mcxa/frdm-mcxa153",
248251
"nxp/mcx/mcxa/frdm-mcxa156",
249-
"nxp/mcx/mcxa/frdm-mcxa346",
252+
"nxp/mcx/mcxa/frdm-mcxa346",
253+
"nxp/mcx/mcxa/frdm-mcxa366",
250254
"nxp/mcx/mcxe/frdm-mcxe247",
251255
"renesas/ebf_qi_min_6m5",
252256
"renesas/ra6m4-cpk",
253257
"renesas/ra6m4-iot",
254258
"renesas/ra6m3-ek",
255259
"renesas/ra6m3-hmi-board",
260+
"renesas/ra6e2-ek",
256261
"renesas/ra6e2-fpb",
257262
"renesas/ra4e2-eco",
263+
"renesas/ra4m1-ek",
258264
"renesas/ra4m2-eco",
259265
"renesas/ra2l1-cpk",
260266
"renesas/ra8m1-ek",
261267
"renesas/ra8d1-ek",
262268
"renesas/ra8d1-vision-board",
269+
"renesas/ra8p1-titan-board",
263270
"renesas/rzt2m_rsk",
264271
"renesas/rzn2l_rsk",
265272
"renesas/rzn2l_etherkit",
@@ -301,6 +308,7 @@
301308
"gd32/arm/gd32303c-start",
302309
"gd32/arm/gd32305r-start",
303310
"gd32/arm/gd32307e-start",
311+
"gd32/arm/gd32405rg",
304312
"gd32/arm/gd32407v-start",
305313
"gd32/arm/gd32407v-lckfb",
306314
"gd32/arm/gd32450z-eval",
@@ -310,18 +318,19 @@
310318
"gd32/arm/gd32e503v-eval",
311319
"gd32/arm/gd32527I-eval",
312320
"gd32/arm/gd32e230-lckfb",
313-
"n32/n32g43xcl-stb",
314-
"n32/n32g45xcl-stb",
315-
"n32/n32g45xml-stb",
316-
"n32/n32g45xrl-stb",
317-
"n32/n32g45xvl-stb",
318-
"n32/n32g457qel-stb",
319-
"n32/n32g4frml-stb",
320-
"n32/n32l40xcl-stb",
321-
"n32/n32l43xml-stb",
322-
"n32/n32l43xrl-stb",
323-
"n32/n32l436-evb",
324-
"n32/n32wb45xl-evb",
321+
"n32/n32gxx_lxx/n32g43xcl-stb",
322+
"n32/n32gxx_lxx/n32g45xcl-stb",
323+
"n32/n32gxx_lxx/n32g45xml-stb",
324+
"n32/n32gxx_lxx/n32g45xrl-stb",
325+
"n32/n32gxx_lxx/n32g45xvl-stb",
326+
"n32/n32gxx_lxx/n32g457qel-stb",
327+
"n32/n32gxx_lxx/n32g4frml-stb",
328+
"n32/n32gxx_lxx/n32l40xcl-stb",
329+
"n32/n32gxx_lxx/n32l43xml-stb",
330+
"n32/n32gxx_lxx/n32l43xrl-stb",
331+
"n32/n32gxx_lxx/n32l436-evb",
332+
"n32/n32gxx_lxx/n32wb45xl-evb",
333+
"n32/n32hxxx/n32h760zil7-stb",
325334
"apm32/apm32f103xe-minibroard",
326335
"apm32/apm32f407ig-minibroard",
327336
"apm32/apm32f407zg-evalboard",
@@ -382,7 +391,8 @@
382391
"SUB_RTT_BSP": [
383392
"qemu-virt64-aarch64",
384393
"raspberry-pi/raspi3-64",
385-
"raspberry-pi/raspi4-64"
394+
"raspberry-pi/raspi4-64",
395+
"nxp/imx/imx91"
386396
]
387397
},
388398
{
@@ -392,7 +402,8 @@
392402
"k210",
393403
"wch/risc-v/ch32v208w-r0",
394404
"wch/risc-v/ch32v307v-r1",
395-
"wch/risc-v/yd-ch32v307vct6"
405+
"wch/risc-v/yd-ch32v307vct6",
406+
"gd32/risc-v/gd32vw553h-eval"
396407
]
397408
},
398409
{
@@ -423,7 +434,9 @@
423434
"hpmicro/hpm5300evk",
424435
"hpmicro/hpm5301evklite",
425436
"hpmicro/hpm6800evk",
426-
"hpmicro/hpm6e00evk"
437+
"hpmicro/hpm6e00evk",
438+
"hpmicro/hpm6p00evk",
439+
"hpmicro/hpm5e00evk"
427440
]
428441
},
429442
{
@@ -478,12 +491,14 @@
478491
"RTT_BSP": "xuantie",
479492
"RTT_TOOL_CHAIN": "sourcery-Xuantie-900-gcc-elf-newlib",
480493
"SUB_RTT_BSP": [
494+
"xuantie/smartl/e901",
481495
"xuantie/smartl/e902",
482496
"xuantie/smartl/e906",
483497
"xuantie/smartl/e907",
484498
"xuantie/xiaohui/c906",
485499
"xuantie/xiaohui/c907",
486500
"xuantie/xiaohui/c908",
501+
"xuantie/xiaohui/c908x",
487502
"xuantie/xiaohui/c910",
488503
"xuantie/xiaohui/r908",
489504
"xuantie/xiaohui/r910",

.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)