Skip to content

Commit dce7586

Browse files
committed
Merge remote-tracking branch 'origin/master' into testcase
2 parents e5f4d1b + adc3e2c commit dce7586

File tree

1,602 files changed

+160468
-1040527
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,602 files changed

+160468
-1040527
lines changed

.clang-format

Lines changed: 12 additions & 15 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
@@ -86,7 +86,6 @@ BreakAfterJavaFieldAnnotations: false
8686
BreakArrays: false
8787
BreakBeforeBinaryOperators: NonAssignment
8888
BreakBeforeConceptDeclarations: Always
89-
BreakBeforeBraces: Custom
9089
BreakBeforeInlineASMColon: OnlyMultiline
9190
BreakBeforeTernaryOperators: true
9291
BreakConstructorInitializers: AfterColon
@@ -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: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -253,6 +253,7 @@
253253
"renesas/ra6m4-iot",
254254
"renesas/ra6m3-ek",
255255
"renesas/ra6m3-hmi-board",
256+
"renesas/ra6e2-ek",
256257
"renesas/ra6e2-fpb",
257258
"renesas/ra4e2-eco",
258259
"renesas/ra4m2-eco",
@@ -423,7 +424,9 @@
423424
"hpmicro/hpm5300evk",
424425
"hpmicro/hpm5301evklite",
425426
"hpmicro/hpm6800evk",
426-
"hpmicro/hpm6e00evk"
427+
"hpmicro/hpm6e00evk",
428+
"hpmicro/hpm6p00evk",
429+
"hpmicro/hpm5e00evk"
427430
]
428431
},
429432
{

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