Skip to content

Commit 40e4330

Browse files
committed
Merge branch 'main' into patch-1
2 parents 0798a21 + 8c06ef6 commit 40e4330

4,879 files changed

Lines changed: 700422 additions & 180178 deletions

File tree

Some content is hidden

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

.clang-format

Lines changed: 130 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -1,111 +1,179 @@
11
---
2+
Language: Cpp
23
BasedOnStyle: Google
34
AccessModifierOffset: -1
45
AlignAfterOpenBracket: Align
5-
AlignConsecutiveMacros: false
6-
AlignConsecutiveAssignments: false
7-
AlignConsecutiveDeclarations: false
6+
AlignArrayOfStructures: None
7+
AlignConsecutiveAssignments:
8+
Enabled: false
9+
AcrossEmptyLines: false
10+
AcrossComments: false
11+
AlignCompound: false
12+
PadOperators: true
13+
AlignConsecutiveBitFields:
14+
Enabled: false
15+
AcrossEmptyLines: false
16+
AcrossComments: false
17+
AlignCompound: false
18+
PadOperators: false
19+
AlignConsecutiveDeclarations:
20+
Enabled: false
21+
AcrossEmptyLines: false
22+
AcrossComments: false
23+
AlignCompound: false
24+
PadOperators: false
25+
AlignConsecutiveMacros:
26+
Enabled: false
27+
AcrossEmptyLines: false
28+
AcrossComments: false
29+
AlignCompound: false
30+
PadOperators: false
31+
AlignConsecutiveShortCaseStatements:
32+
Enabled: false
33+
AcrossEmptyLines: false
34+
AcrossComments: false
35+
AlignCaseColons: false
836
AlignEscapedNewlines: Left
9-
AlignOperands: true
10-
AlignTrailingComments: true
37+
AlignOperands: Align
38+
AlignTrailingComments:
39+
Kind: Always
40+
OverEmptyLines: 0
1141
AllowAllArgumentsOnNextLine: true
12-
AllowAllConstructorInitializersOnNextLine: true
1342
AllowAllParametersOfDeclarationOnNextLine: true
1443
AllowShortBlocksOnASingleLine: Never
1544
AllowShortCaseLabelsOnASingleLine: false
45+
AllowShortEnumsOnASingleLine: true
1646
AllowShortFunctionsOnASingleLine: Inline
17-
AllowShortLambdasOnASingleLine: All
1847
AllowShortIfStatementsOnASingleLine: Never
48+
AllowShortLambdasOnASingleLine: All
1949
AllowShortLoopsOnASingleLine: false
2050
AlwaysBreakAfterDefinitionReturnType: None
2151
AlwaysBreakAfterReturnType: None
2252
AlwaysBreakBeforeMultilineStrings: true
2353
AlwaysBreakTemplateDeclarations: Yes
54+
AttributeMacros:
55+
- __capability
2456
BinPackArguments: true
2557
BinPackParameters: true
58+
BitFieldColonSpacing: Both
2659
BraceWrapping:
2760
AfterCaseLabel: false
2861
AfterClass: false
29-
AfterControlStatement: false
62+
AfterControlStatement: Never
3063
AfterEnum: false
64+
AfterExternBlock: false
3165
AfterFunction: false
3266
AfterNamespace: false
3367
AfterObjCDeclaration: false
3468
AfterStruct: false
3569
AfterUnion: false
36-
AfterExternBlock: false
3770
BeforeCatch: false
3871
BeforeElse: false
72+
BeforeLambdaBody: false
73+
BeforeWhile: false
3974
IndentBraces: false
4075
SplitEmptyFunction: true
4176
SplitEmptyRecord: true
4277
SplitEmptyNamespace: true
78+
BreakAfterAttributes: Always
79+
BreakAfterJavaFieldAnnotations: false
80+
BreakArrays: true
4381
BreakBeforeBinaryOperators: None
82+
BreakBeforeConceptDeclarations: Always
4483
BreakBeforeBraces: Attach
45-
BreakBeforeInheritanceComma: false
46-
BreakInheritanceList: BeforeColon
84+
BreakBeforeInlineASMColon: OnlyMultiline
4785
BreakBeforeTernaryOperators: true
48-
BreakConstructorInitializersBeforeComma: false
4986
BreakConstructorInitializers: BeforeColon
50-
BreakAfterJavaFieldAnnotations: false
87+
BreakInheritanceList: BeforeColon
5188
BreakStringLiterals: true
5289
ColumnLimit: 80
5390
CommentPragmas: '^ IWYU pragma:'
5491
CompactNamespaces: false
55-
ConstructorInitializerAllOnOneLineOrOnePerLine: true
5692
ConstructorInitializerIndentWidth: 4
5793
ContinuationIndentWidth: 4
5894
Cpp11BracedListStyle: true
59-
DeriveLineEnding: true
6095
DerivePointerAlignment: false
6196
DisableFormat: false
97+
EmptyLineAfterAccessModifier: Never
98+
EmptyLineBeforeAccessModifier: LogicalBlock
6299
ExperimentalAutoDetectBinPacking: false
63100
FixNamespaceComments: true
64101
ForEachMacros:
65102
- foreach
66103
- Q_FOREACH
67104
- BOOST_FOREACH
105+
IfMacros:
106+
- KJ_IF_MAYBE
68107
IncludeBlocks: Regroup
69108
IncludeCategories:
70109
- Regex: '^<ext/.*\.h>'
71110
Priority: 2
72111
SortPriority: 0
112+
CaseSensitive: false
73113
- Regex: '^<.*\.h>'
74114
Priority: 1
75115
SortPriority: 0
116+
CaseSensitive: false
76117
- Regex: '^<.*'
77118
Priority: 2
78119
SortPriority: 0
120+
CaseSensitive: false
79121
- Regex: '.*'
80122
Priority: 3
81123
SortPriority: 0
124+
CaseSensitive: false
82125
IncludeIsMainRegex: '([-_](test|unittest))?$'
83126
IncludeIsMainSourceRegex: ''
127+
IndentAccessModifiers: false
128+
IndentCaseBlocks: false
84129
IndentCaseLabels: true
130+
IndentExternBlock: AfterExternBlock
85131
IndentGotoLabels: true
86132
IndentPPDirectives: None
133+
IndentRequiresClause: true
87134
IndentWidth: 2
88135
IndentWrappedFunctionNames: false
136+
InsertBraces: false
137+
InsertNewlineAtEOF: false
138+
InsertTrailingCommas: None
139+
IntegerLiteralSeparator:
140+
Binary: 0
141+
BinaryMinDigits: 0
142+
Decimal: 0
143+
DecimalMinDigits: 0
144+
Hex: 0
145+
HexMinDigits: 0
89146
JavaScriptQuotes: Leave
90147
JavaScriptWrapImports: true
91148
KeepEmptyLinesAtTheStartOfBlocks: false
149+
KeepEmptyLinesAtEOF: false
150+
LambdaBodyIndentation: Signature
151+
LineEnding: DeriveLF
92152
MacroBlockBegin: ''
93153
MacroBlockEnd: ''
154+
Macros:
155+
- 'HAL_ENUM(name)=enum name'
94156
MaxEmptyLinesToKeep: 1
95157
NamespaceIndentation: None
96158
ObjCBinPackProtocolList: Never
97159
ObjCBlockIndentWidth: 2
160+
ObjCBreakBeforeNestedBlockParam: true
98161
ObjCSpaceAfterProperty: false
99162
ObjCSpaceBeforeProtocolList: true
163+
PackConstructorInitializers: NextLine
100164
PenaltyBreakAssignment: 2
101165
PenaltyBreakBeforeFirstCallParameter: 1
102166
PenaltyBreakComment: 300
103167
PenaltyBreakFirstLessLess: 120
168+
PenaltyBreakOpenParenthesis: 0
104169
PenaltyBreakString: 1000
105170
PenaltyBreakTemplateDeclaration: 10
106171
PenaltyExcessCharacter: 1000000
172+
PenaltyIndentedWhitespace: 0
107173
PenaltyReturnTypeOnItsOwnLine: 200
108174
PointerAlignment: Left
175+
PPIndentWidth: -1
176+
QualifierAlignment: Leave
109177
RawStringFormats:
110178
- Language: Cpp
111179
Delimiters:
@@ -132,34 +200,72 @@ RawStringFormats:
132200
- PARSE_TEXT_PROTO
133201
- ParseTextOrDie
134202
- ParseTextProtoOrDie
135-
CanonicalDelimiter: ''
203+
- ParseTestProto
204+
- ParsePartialTestProto
205+
CanonicalDelimiter: pb
136206
BasedOnStyle: google
207+
ReferenceAlignment: Pointer
137208
ReflowComments: true
209+
RemoveBracesLLVM: false
210+
RemoveParentheses: Leave
211+
RemoveSemicolon: false
212+
RequiresClausePosition: OwnLine
213+
RequiresExpressionIndentation: OuterScope
214+
SeparateDefinitionBlocks: Leave
215+
ShortNamespaceLines: 1
138216
SortIncludes: false
139-
SortUsingDeclarations: true
217+
SortJavaStaticImport: Before
218+
SortUsingDeclarations: LexicographicNumeric
140219
SpaceAfterCStyleCast: false
141220
SpaceAfterLogicalNot: false
142221
SpaceAfterTemplateKeyword: true
222+
SpaceAroundPointerQualifiers: Default
143223
SpaceBeforeAssignmentOperators: true
224+
SpaceBeforeCaseColon: false
144225
SpaceBeforeCpp11BracedList: false
145226
SpaceBeforeCtorInitializerColon: true
146227
SpaceBeforeInheritanceColon: true
228+
SpaceBeforeJsonColon: false
147229
SpaceBeforeParens: ControlStatements
230+
SpaceBeforeParensOptions:
231+
AfterControlStatements: true
232+
AfterForeachMacros: true
233+
AfterFunctionDefinitionName: false
234+
AfterFunctionDeclarationName: false
235+
AfterIfMacros: true
236+
AfterOverloadedOperator: false
237+
AfterRequiresInClause: false
238+
AfterRequiresInExpression: false
239+
BeforeNonEmptyParentheses: false
148240
SpaceBeforeRangeBasedForLoopColon: true
241+
SpaceBeforeSquareBrackets: false
149242
SpaceInEmptyBlock: false
150-
SpaceInEmptyParentheses: false
151243
SpacesBeforeTrailingComments: 2
152-
SpacesInAngles: false
153-
SpacesInConditionalStatement: false
244+
SpacesInAngles: Never
154245
SpacesInContainerLiterals: true
155-
SpacesInCStyleCastParentheses: false
156-
SpacesInParentheses: false
246+
SpacesInLineCommentPrefix:
247+
Minimum: 1
248+
Maximum: -1
249+
SpacesInParens: Never
250+
SpacesInParensOptions:
251+
InCStyleCasts: false
252+
InConditionalStatements: false
253+
InEmptyParentheses: false
254+
Other: false
157255
SpacesInSquareBrackets: false
158-
SpaceBeforeSquareBrackets: false
159-
Standard: c++17
256+
Standard: c++20
257+
StatementAttributeLikeMacros:
258+
- Q_EMIT
160259
StatementMacros:
161260
- Q_UNUSED
162261
- QT_REQUIRE_VERSION
163262
TabWidth: 8
164263
UseTab: Never
264+
VerilogBreakBetweenInstancePorts: true
265+
WhitespaceSensitiveMacros:
266+
- BOOST_PP_STRINGIZE
267+
- CF_SWIFT_NAME
268+
- NS_SWIFT_NAME
269+
- PP_STRINGIZE
270+
- STRINGIZE
165271
...

.clang-tidy

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@ Checks:
3535
bugprone-unhandled-self-assignment,
3636
bugprone-unused-raii,
3737
bugprone-virtual-near-miss,
38-
cert-dcl58-cpp,
3938
cert-err52-cpp,
4039
cert-err60-cpp,
4140
cert-mem57-cpp,
@@ -50,7 +49,6 @@ Checks:
5049
google-build-namespaces,
5150
google-explicit-constructor,
5251
google-global-names-in-headers,
53-
google-readability-avoid-underscore-in-googletest-name,
5452
google-readability-casting,
5553
google-runtime-operator,
5654
misc-definitions-in-headers,

.gersemirc

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
color: false
2+
definitions: [cmake/modules]
3+
line_length: 100
4+
list_expansion: favour-inlining
5+
quiet: false
6+
unsafe: false

.gitattributes

Lines changed: 26 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,30 @@
1+
*.adoc text eol=lf
2+
*.c text eol=lf
3+
*.cmake text eol=lf
4+
*.clang-format text eol=lf
5+
*.clang-tidy text eol=lf
6+
*.cpp text eol=lf
17
*.gradle text eol=lf
8+
*.groovy text eol=lf
9+
*.h text eol=lf
10+
*.hpp text eol=lf
11+
*.in text eol=lf
12+
*.inc text eol=lf
213
*.java text eol=lf
14+
*.jinja text eol=lf
15+
*.json text eol=lf
16+
*.m text eol=lf
317
*.md text eol=lf
18+
*.mm text eol=lf
19+
*.patch text eol=lf
20+
*.plist text eol=lf
21+
*.proto text eol=lf
22+
*.py text eol=lf
23+
*.styleguide text eol=lf
24+
*.txt text eol=lf
425
*.xml text eol=lf
26+
*.yaml text eol=lf
27+
*.yml text eol=lf
28+
29+
# Generated files
30+
*/src/generated/** linguist-generated

.github/CODEOWNERS

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,6 @@
2929

3030
/wpilibNewCommands/ @wpilibsuite/commandbased
3131

32-
/wpilibOldCommands/ @wpilibsuite/commandbased
33-
3432
/wpilibcExamples/ @wpilibsuite/wpilib @wpilibsuite/documentation
3533

3634
/wpilibjExamples/ @wpilibsuite/wpilib @wpilibsuite/documentation

.github/ISSUE_TEMPLATE/bug_report.md

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -15,17 +15,17 @@ Steps to reproduce the behavior:
1515
1. ...
1616
2. ...
1717

18+
- Link to code:
19+
1820
**Expected behavior**
1921
A clear and concise description of what you expected to happen.
2022

2123
**Screenshots**
2224
If applicable, add screenshots to help explain your problem.
2325

2426
**Desktop (please complete the following information):**
25-
- WPILib Version: [e.g. 2021.3.1]
2627
- OS: [e.g. Windows 11]
27-
- Java version [e.g. 1.10.2]
28-
- C++ version [e.g. 17]
28+
- Project Information: [In Visual Studio Code, press the WPILib button and choose WPILib: Open Project Information. Press the copy button and paste the data here. If not using VS Code, please include WPILib version, Gradle version, Java version, C++ version (if applicable), and any third party libraries and versions]
2929

3030
**Additional context**
3131
Add any other context about the problem here.

0 commit comments

Comments
 (0)