Skip to content

Commit 16106ca

Browse files
ingibirkaingibirka
committed
Merge remote-tracking branch 'origin/master' into f/583-camera_node_launch
2 parents 0b030d3 + 7c6ce53 commit 16106ca

File tree

235 files changed

+6434
-850
lines changed

Some content is hidden

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

235 files changed

+6434
-850
lines changed

‎.clang-format‎

Lines changed: 191 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,191 @@
1+
---
2+
Language: Cpp
3+
# BasedOnStyle: LLVM
4+
AccessModifierOffset: -4
5+
AlignAfterOpenBracket: Align
6+
AlignArrayOfStructures: None
7+
AlignConsecutiveMacros: None
8+
AlignConsecutiveAssignments: None
9+
AlignConsecutiveBitFields: None
10+
AlignConsecutiveDeclarations: None
11+
AlignEscapedNewlines: Right
12+
AlignOperands: Align
13+
AlignTrailingComments: true
14+
AllowAllArgumentsOnNextLine: true
15+
AllowAllParametersOfDeclarationOnNextLine: true
16+
AllowShortEnumsOnASingleLine: true
17+
AllowShortCompoundRequirementOnASingleLine: true
18+
AllowShortBlocksOnASingleLine: Empty
19+
AllowShortCaseLabelsOnASingleLine: false
20+
AllowShortFunctionsOnASingleLine: All
21+
AllowShortLambdasOnASingleLine: All
22+
AllowShortIfStatementsOnASingleLine: Never
23+
AllowShortLoopsOnASingleLine: false
24+
AlwaysBreakAfterDefinitionReturnType: None
25+
AlwaysBreakAfterReturnType: None
26+
AlwaysBreakBeforeMultilineStrings: false
27+
AlwaysBreakTemplateDeclarations: Yes
28+
AttributeMacros:
29+
- __capability
30+
BinPackArguments: true
31+
BinPackParameters: true
32+
BraceWrapping:
33+
AfterCaseLabel: false
34+
AfterClass: false
35+
AfterControlStatement: Never
36+
AfterEnum: false
37+
AfterFunction: false
38+
AfterNamespace: false
39+
AfterObjCDeclaration: false
40+
AfterStruct: false
41+
AfterUnion: false
42+
AfterExternBlock: false
43+
BeforeCatch: false
44+
BeforeElse: false
45+
BeforeLambdaBody: false
46+
BeforeWhile: false
47+
IndentBraces: false
48+
SplitEmptyFunction: true
49+
SplitEmptyRecord: true
50+
SplitEmptyNamespace: true
51+
BreakBeforeBinaryOperators: None
52+
BreakBeforeConceptDeclarations: true
53+
BreakBeforeBraces: Allman
54+
BreakBeforeInheritanceComma: false
55+
BreakInheritanceList: BeforeColon
56+
BreakBeforeTernaryOperators: true
57+
BreakConstructorInitializersBeforeComma: false
58+
BreakConstructorInitializers: BeforeColon
59+
BreakAfterJavaFieldAnnotations: false
60+
BreakStringLiterals: true
61+
ColumnLimit: 130
62+
CommentPragmas: '^ IWYU pragma:'
63+
QualifierAlignment: Leave
64+
CompactNamespaces: false
65+
ConstructorInitializerIndentWidth: 4
66+
ContinuationIndentWidth: 4
67+
Cpp11BracedListStyle: true
68+
DeriveLineEnding: true
69+
DerivePointerAlignment: false
70+
DisableFormat: false
71+
EmptyLineAfterAccessModifier: Never
72+
EmptyLineBeforeAccessModifier: LogicalBlock
73+
ExperimentalAutoDetectBinPacking: false
74+
PackConstructorInitializers: BinPack
75+
BasedOnStyle: ''
76+
ConstructorInitializerAllOnOneLineOrOnePerLine: true
77+
AllowAllConstructorInitializersOnNextLine: true
78+
FixNamespaceComments: true
79+
ForEachMacros:
80+
- foreach
81+
- Q_FOREACH
82+
- BOOST_FOREACH
83+
IfMacros:
84+
- KJ_IF_MAYBE
85+
IncludeBlocks: Preserve
86+
IncludeCategories:
87+
- Regex: '^"(llvm|llvm-c|clang|clang-c)/'
88+
Priority: 2
89+
SortPriority: 0
90+
CaseSensitive: false
91+
- Regex: '^(<|"(gtest|gmock|isl|json)/)'
92+
Priority: 3
93+
SortPriority: 0
94+
CaseSensitive: false
95+
- Regex: '.*'
96+
Priority: 1
97+
SortPriority: 0
98+
CaseSensitive: false
99+
IncludeIsMainRegex: '(Test)?$'
100+
IncludeIsMainSourceRegex: ''
101+
IndentAccessModifiers: false
102+
IndentCaseLabels: false
103+
IndentCaseBlocks: false
104+
IndentGotoLabels: true
105+
IndentPPDirectives: None
106+
IndentExternBlock: AfterExternBlock
107+
IndentRequires: false
108+
IndentWidth: 4
109+
IndentWrappedFunctionNames: false
110+
InsertTrailingCommas: None
111+
JavaScriptQuotes: Leave
112+
JavaScriptWrapImports: true
113+
KeepEmptyLinesAtTheStartOfBlocks: true
114+
LambdaBodyIndentation: Signature
115+
MacroBlockBegin: ''
116+
MacroBlockEnd: ''
117+
MaxEmptyLinesToKeep: 1
118+
NamespaceIndentation: None
119+
ObjCBinPackProtocolList: Auto
120+
ObjCBlockIndentWidth: 2
121+
ObjCBreakBeforeNestedBlockParam: true
122+
ObjCSpaceAfterProperty: false
123+
ObjCSpaceBeforeProtocolList: true
124+
PenaltyBreakAssignment: 2
125+
PenaltyBreakBeforeFirstCallParameter: 19
126+
PenaltyBreakComment: 300
127+
PenaltyBreakFirstLessLess: 120
128+
PenaltyBreakOpenParenthesis: 0
129+
PenaltyBreakString: 1000
130+
PenaltyBreakTemplateDeclaration: 10
131+
PenaltyExcessCharacter: 1000000
132+
PenaltyReturnTypeOnItsOwnLine: 60
133+
PenaltyIndentedWhitespace: 0
134+
PointerAlignment: Right
135+
PPIndentWidth: -1
136+
ReferenceAlignment: Pointer
137+
ReflowComments: true
138+
RemoveBracesLLVM: false
139+
SeparateDefinitionBlocks: Leave
140+
ShortNamespaceLines: 1
141+
SortIncludes: CaseSensitive
142+
SortJavaStaticImport: Before
143+
SortUsingDeclarations: true
144+
SpaceAfterCStyleCast: false
145+
SpaceAfterLogicalNot: false
146+
SpaceAfterTemplateKeyword: true
147+
SpaceBeforeAssignmentOperators: true
148+
SpaceBeforeCaseColon: false
149+
SpaceBeforeCpp11BracedList: false
150+
SpaceBeforeCtorInitializerColon: true
151+
SpaceBeforeInheritanceColon: true
152+
SpaceBeforeParens: ControlStatements
153+
SpaceBeforeParensOptions:
154+
AfterControlStatements: true
155+
AfterForeachMacros: true
156+
AfterFunctionDefinitionName: false
157+
AfterFunctionDeclarationName: false
158+
AfterIfMacros: true
159+
AfterOverloadedOperator: false
160+
BeforeNonEmptyParentheses: false
161+
SpaceAroundPointerQualifiers: Default
162+
SpaceBeforeRangeBasedForLoopColon: true
163+
SpaceInEmptyBlock: false
164+
SpaceInEmptyParentheses: false
165+
SpacesBeforeTrailingComments: 1
166+
SpacesInAngles: Never
167+
SpacesInConditionalStatement: false
168+
SpacesInContainerLiterals: true
169+
SpacesInCStyleCastParentheses: false
170+
SpacesInLineCommentPrefix:
171+
Minimum: 1
172+
Maximum: -1
173+
SpacesInParentheses: false
174+
SpacesInSquareBrackets: false
175+
SpaceBeforeSquareBrackets: false
176+
BitFieldColonSpacing: Both
177+
Standard: Latest
178+
StatementAttributeLikeMacros:
179+
- Q_EMIT
180+
StatementMacros:
181+
- Q_UNUSED
182+
- QT_REQUIRE_VERSION
183+
TabWidth: 8
184+
UseCRLF: false
185+
UseTab: Never
186+
WhitespaceSensitiveMacros:
187+
- STRINGIZE
188+
- PP_STRINGIZE
189+
- BOOST_PP_STRINGIZE
190+
- NS_SWIFT_NAME
191+
- CF_SWIFT_NAME

‎.gitmodules‎

Lines changed: 11 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,12 @@
1-
[submodule "src/serial"]
2-
path = src/serial
1+
[submodule "src/stingray_core_communication/serial"]
2+
path = src/stingray_core_communication/serial
33
url = https://github.com/jinmenglei/serial.git
4+
[submodule "src/stingray_core_communication/Hydrolib-soft"]
5+
path = src/stingray_core_communication/Hydrolib-soft
6+
url = https://github.com/SeaJackal/Hydrolib-soft.git
7+
[submodule "src/stingray_core_sensors/dvl-a50"]
8+
path = src/stingray_core_sensors/dvl-a50
9+
url = git@github.com:paagutie/dvl-a50.git
10+
[submodule "src/stingray_core_sensors/dvl_msgs"]
11+
path = src/stingray_core_sensors/dvl_msgs
12+
url = git@github.com:paagutie/dvl_msgs.git

‎.vscode/settings.json‎

Lines changed: 10 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
"install/stingray_interfaces/lib/python3.10/site-packages",
1212
],
1313
"files.associations": {
14+
"*.hpp": "cpp",
15+
"*.cpp": "cpp",
1416
"cstddef": "cpp",
1517
"limits": "cpp",
1618
"version": "cpp",
@@ -89,6 +91,13 @@
8991
"typeindex": "cpp",
9092
"typeinfo": "cpp",
9193
"valarray": "cpp",
92-
"variant": "cpp"
94+
"variant": "cpp",
95+
"span": "cpp",
96+
"cassert": "cpp",
97+
"cerrno": "cpp",
98+
"cfloat": "cpp",
99+
"charconv": "cpp",
100+
"climits": "cpp",
101+
"format": "cpp"
93102
}
94103
}

0 commit comments

Comments
 (0)