1
0
mirror of https://github.com/gnss-sdr/gnss-sdr synced 2025-01-23 15:36:58 +00:00

Transition to clang-format 19

This commit is contained in:
Carles Fernandez 2024-12-26 11:18:41 +01:00
parent e805a08ff5
commit 700d4403d5
No known key found for this signature in database
GPG Key ID: 4C583C52B0C3877D
66 changed files with 628 additions and 458 deletions

View File

@ -1,100 +1,289 @@
# SPDX-License-Identifier: GPL-3.0-or-later # SPDX-License-Identifier: GPL-3.0-or-later
# SPDX-FileCopyrightText: 2018-2020 Carles Fernandez-Prades <carles.fernandez@cttc.es> # SPDX-FileCopyrightText: 2018-2024 Carles Fernandez-Prades <carles.fernandez@cttc.es>
--- ---
Language: Cpp Language: Cpp
# BasedOnStyle: Google # BasedOnStyle: Google
# More info: https://clang.llvm.org/docs/ClangFormatStyleOptions.html # More info: https://clang.llvm.org/docs/ClangFormatStyleOptions.html
AccessModifierOffset: -4 AccessModifierOffset: -4
AlignAfterOpenBracket: DontAlign AlignAfterOpenBracket: DontAlign
AlignConsecutiveAssignments: false AlignArrayOfStructures: None
AlignConsecutiveDeclarations: false AlignConsecutiveAssignments:
AlignEscapedNewlinesLeft: true Enabled: false
AlignOperands: true AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
AlignFunctionPointers: false
PadOperators: true
AlignConsecutiveBitFields:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
AlignFunctionPointers: false
PadOperators: false
AlignConsecutiveDeclarations:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
AlignFunctionPointers: false
PadOperators: true
AlignConsecutiveMacros:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
AlignFunctionPointers: false
PadOperators: false
AlignConsecutiveShortCaseStatements:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCaseArrows: false
AlignCaseColons: false
AlignConsecutiveTableGenBreakingDAGArgColons:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
AlignFunctionPointers: false
PadOperators: false
AlignConsecutiveTableGenCondOperatorColons:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
AlignFunctionPointers: false
PadOperators: false
AlignConsecutiveTableGenDefinitionColons:
Enabled: false
AcrossEmptyLines: false
AcrossComments: false
AlignCompound: false
AlignFunctionPointers: false
PadOperators: false
AlignEscapedNewlines: Left
AlignOperands: Align
AlignTrailingComments: AlignTrailingComments:
Kind: Always Kind: Always
OverEmptyLines: 0
AllowAllArgumentsOnNextLine: true
AllowAllParametersOfDeclarationOnNextLine: true AllowAllParametersOfDeclarationOnNextLine: true
AllowShortBlocksOnASingleLine: false AllowBreakBeforeNoexceptSpecifier: Never
AllowShortBlocksOnASingleLine: Never
AllowShortCaseExpressionOnASingleLine: true
AllowShortCaseLabelsOnASingleLine: false AllowShortCaseLabelsOnASingleLine: false
AllowShortCompoundRequirementOnASingleLine: true
AllowShortEnumsOnASingleLine: true
AllowShortFunctionsOnASingleLine: All AllowShortFunctionsOnASingleLine: All
AllowShortIfStatementsOnASingleLine: true AllowShortIfStatementsOnASingleLine: WithoutElse
AllowShortLambdasOnASingleLine: All
AllowShortLoopsOnASingleLine: true AllowShortLoopsOnASingleLine: true
AlwaysBreakAfterDefinitionReturnType: None AlwaysBreakAfterDefinitionReturnType: None
AlwaysBreakAfterReturnType: None
AlwaysBreakBeforeMultilineStrings: true AlwaysBreakBeforeMultilineStrings: true
AlwaysBreakTemplateDeclarations: false AttributeMacros:
- __capability
BinPackArguments: true BinPackArguments: true
BinPackParameters: true BinPackParameters: true
BitFieldColonSpacing: Both
BraceWrapping: BraceWrapping:
AfterClass: false AfterCaseLabel: true
AfterControlStatement: false AfterClass: true
AfterEnum: false AfterControlStatement: Always
AfterFunction: false AfterEnum: true
AfterNamespace: false AfterExternBlock: true
AfterObjCDeclaration: false AfterFunction: true
AfterStruct: false AfterNamespace: true
AfterUnion: false AfterObjCDeclaration: true
BeforeCatch: false AfterStruct: true
BeforeElse: false AfterUnion: true
IndentBraces: false BeforeCatch: true
BeforeElse: true
BeforeLambdaBody: false
BeforeWhile: true
IndentBraces: true
SplitEmptyFunction: true
SplitEmptyRecord: true
SplitEmptyNamespace: true
BreakAdjacentStringLiterals: true
BreakAfterAttributes: Leave
BreakAfterJavaFieldAnnotations: false
BreakAfterReturnType: None
BreakArrays: true
BreakBeforeBinaryOperators: None BreakBeforeBinaryOperators: None
BreakBeforeConceptDeclarations: Always
BreakBeforeBraces: GNU BreakBeforeBraces: GNU
BreakBeforeInlineASMColon: OnlyMultiline
BreakBeforeTernaryOperators: true BreakBeforeTernaryOperators: true
BreakConstructorInitializersBeforeComma: false BreakConstructorInitializers: BeforeColon
BreakFunctionDefinitionParameters: false
BreakInheritanceList: BeforeColon
BreakStringLiterals: true
BreakTemplateDeclarations: MultiLine
ColumnLimit: 0 ColumnLimit: 0
CommentPragmas: '^ IWYU pragma:' CommentPragmas: '^ IWYU pragma:'
ConstructorInitializerAllOnOneLineOrOnePerLine: true CompactNamespaces: false
ConstructorInitializerIndentWidth: 4 ConstructorInitializerIndentWidth: 4
ContinuationIndentWidth: 4 ContinuationIndentWidth: 4
Cpp11BracedListStyle: true Cpp11BracedListStyle: true
DerivePointerAlignment: true DerivePointerAlignment: true
DisableFormat: false DisableFormat: false
EmptyLineAfterAccessModifier: Never
EmptyLineBeforeAccessModifier: LogicalBlock
ExperimentalAutoDetectBinPacking: false ExperimentalAutoDetectBinPacking: false
ForEachMacros: [ foreach, Q_FOREACH, BOOST_FOREACH ] FixNamespaceComments: true
ForEachMacros:
- foreach
- Q_FOREACH
- BOOST_FOREACH
IfMacros:
- KJ_IF_MAYBE
IncludeBlocks: Merge IncludeBlocks: Merge
IncludeCategories: IncludeCategories:
- Regex: '^.*.h"' - Regex: '^.*.h"'
Priority: 1 Priority: 1
SortPriority: 0
CaseSensitive: false
- Regex: '^.*(benchmark|boost|gflags|glog|gnsssdr|gnuradio|gnsstk|gsl|gtest|pmt|uhd|volk)/' - Regex: '^.*(benchmark|boost|gflags|glog|gnsssdr|gnuradio|gnsstk|gsl|gtest|pmt|uhd|volk)/'
Priority: 2 Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '^.*(armadillo|iio|matio|pugixml)' - Regex: '^.*(armadillo|iio|matio|pugixml)'
Priority: 2 Priority: 2
SortPriority: 0
CaseSensitive: false
- Regex: '.*' - Regex: '.*'
Priority: 3 Priority: 3
SortPriority: 0
CaseSensitive: false
- Regex: '^<.*\.h>' - Regex: '^<.*\.h>'
Priority: 4 Priority: 4
SortPriority: 0
CaseSensitive: false
- Regex: '^<.*' - Regex: '^<.*'
Priority: 5 Priority: 5
SortPriority: 0
CaseSensitive: false
IncludeIsMainRegex: '(Test)?$'
IncludeIsMainSourceRegex: ''
IndentAccessModifiers: false
IndentCaseBlocks: false
IndentCaseLabels: false IndentCaseLabels: false
IndentExternBlock: AfterExternBlock
IndentGotoLabels: true
IndentPPDirectives: None
IndentRequiresClause: true
IndentWidth: 4 IndentWidth: 4
IndentWrappedFunctionNames: false IndentWrappedFunctionNames: false
KeepEmptyLinesAtTheStartOfBlocks: false InsertBraces: false
InsertNewlineAtEOF: false
InsertTrailingCommas: None
IntegerLiteralSeparator:
Binary: 0
BinaryMinDigits: 0
Decimal: 0
DecimalMinDigits: 0
Hex: 0
HexMinDigits: 0
JavaScriptQuotes: Leave
JavaScriptWrapImports: true
KeepEmptyLines:
AtEndOfFile: false
AtStartOfBlock: false
AtStartOfFile: true
LambdaBodyIndentation: Signature
LineEnding: DeriveLF
MacroBlockBegin: '' MacroBlockBegin: ''
MacroBlockEnd: '' MacroBlockEnd: ''
MainIncludeChar: Quote
MaxEmptyLinesToKeep: 2 MaxEmptyLinesToKeep: 2
NamespaceIndentation: None NamespaceIndentation: None
ObjCBinPackProtocolList: Auto
ObjCBlockIndentWidth: 2 ObjCBlockIndentWidth: 2
ObjCBreakBeforeNestedBlockParam: true
ObjCSpaceAfterProperty: false ObjCSpaceAfterProperty: false
ObjCSpaceBeforeProtocolList: false ObjCSpaceBeforeProtocolList: false
PackConstructorInitializers: NextLine
PenaltyBreakAssignment: 2
PenaltyBreakBeforeFirstCallParameter: 1 PenaltyBreakBeforeFirstCallParameter: 1
PenaltyBreakComment: 300 PenaltyBreakComment: 300
PenaltyBreakFirstLessLess: 120 PenaltyBreakFirstLessLess: 120
PenaltyBreakOpenParenthesis: 0
PenaltyBreakScopeResolution: 500
PenaltyBreakString: 1000 PenaltyBreakString: 1000
PenaltyBreakTemplateDeclaration: 10
PenaltyExcessCharacter: 1000000 PenaltyExcessCharacter: 1000000
PenaltyIndentedWhitespace: 0
PenaltyReturnTypeOnItsOwnLine: 200 PenaltyReturnTypeOnItsOwnLine: 200
PointerAlignment: Left PointerAlignment: Left
PPIndentWidth: -1
QualifierAlignment: Leave
ReferenceAlignment: Pointer
ReflowComments: true ReflowComments: true
SortIncludes: true RemoveBracesLLVM: false
RemoveParentheses: Leave
RemoveSemicolon: false
RequiresClausePosition: OwnLine
RequiresExpressionIndentation: OuterScope
SeparateDefinitionBlocks: Leave
ShortNamespaceLines: 1
SkipMacroDefinitionBody: false
SortIncludes: CaseSensitive
SortJavaStaticImport: Before
SortUsingDeclarations: LexicographicNumeric
SpaceAfterCStyleCast: false SpaceAfterCStyleCast: false
SpaceAfterLogicalNot: false
SpaceAfterTemplateKeyword: true
SpaceAroundPointerQualifiers: Default
SpaceBeforeAssignmentOperators: true SpaceBeforeAssignmentOperators: true
SpaceBeforeCaseColon: false
SpaceBeforeCpp11BracedList: false
SpaceBeforeCtorInitializerColon: true
SpaceBeforeInheritanceColon: true
SpaceBeforeJsonColon: false
SpaceBeforeParens: ControlStatements SpaceBeforeParens: ControlStatements
SpaceInEmptyParentheses: false SpaceBeforeParensOptions:
AfterControlStatements: true
AfterForeachMacros: true
AfterFunctionDefinitionName: false
AfterFunctionDeclarationName: false
AfterIfMacros: true
AfterOverloadedOperator: false
AfterPlacementOperator: true
AfterRequiresInClause: false
AfterRequiresInExpression: false
BeforeNonEmptyParentheses: false
SpaceBeforeRangeBasedForLoopColon: true
SpaceBeforeSquareBrackets: false
SpaceInEmptyBlock: false
SpacesBeforeTrailingComments: 2 SpacesBeforeTrailingComments: 2
SpacesInAngles: false SpacesInAngles: Never
SpacesInContainerLiterals: true SpacesInContainerLiterals: true
SpacesInCStyleCastParentheses: false SpacesInLineCommentPrefix:
SpacesInParentheses: false Minimum: 1
Maximum: -1
SpacesInParens: Never
SpacesInParensOptions:
ExceptDoubleParentheses: false
InCStyleCasts: false
InConditionalStatements: false
InEmptyParentheses: false
Other: false
SpacesInSquareBrackets: false SpacesInSquareBrackets: false
Standard: Auto Standard: Auto
StatementAttributeLikeMacros:
- Q_EMIT
StatementMacros:
- Q_UNUSED
- QT_REQUIRE_VERSION
TableGenBreakInsideDAGArg: DontBreak
TabWidth: 8 TabWidth: 8
UseTab: Never UseTab: Never
VerilogBreakBetweenInstancePorts: true
WhitespaceSensitiveMacros:
- BOOST_PP_STRINGIZE
- CF_SWIFT_NAME
- NS_SWIFT_NAME
- PP_STRINGIZE
- STRINGIZE
... ...

View File

@ -62,6 +62,7 @@ All notable changes to GNSS-SDR will be documented in this file.
- Updated GSL implementation to v0.42.0. See the - Updated GSL implementation to v0.42.0. See the
[gsl-lite release](https://github.com/gsl-lite/gsl-lite/releases/tag/v0.42.0). [gsl-lite release](https://github.com/gsl-lite/gsl-lite/releases/tag/v0.42.0).
- Code formatting now based on clang-format 19.
### Improvements in Portability: ### Improvements in Portability:

View File

@ -137,9 +137,9 @@ public:
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_state(int state __attribute__((unused))) override{}; void set_state(int state __attribute__((unused))) override {};
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:

View File

@ -179,7 +179,7 @@ public:
/*! /*!
* \brief Set resampler latency * \brief Set resampler latency
*/ */
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
static const uint32_t downsampling_factor_default = 4; static const uint32_t downsampling_factor_default = 4;

View File

@ -140,7 +140,7 @@ public:
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
float calculate_threshold(float pfa); float calculate_threshold(float pfa);

View File

@ -143,7 +143,7 @@ public:
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
float calculate_threshold(float pfa) const; float calculate_threshold(float pfa) const;

View File

@ -143,7 +143,7 @@ public:
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
float calculate_threshold(float pfa) const; float calculate_threshold(float pfa) const;

View File

@ -145,7 +145,7 @@ public:
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
float calculate_threshold(float pfa) const; float calculate_threshold(float pfa) const;

View File

@ -186,7 +186,7 @@ public:
/*! /*!
* \brief Set resampler latency * \brief Set resampler latency
*/ */
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
static const uint32_t downsampling_factor_default = 1; static const uint32_t downsampling_factor_default = 1;

View File

@ -185,7 +185,7 @@ public:
/*! /*!
* \brief Set resampler latency * \brief Set resampler latency
*/ */
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
static const uint32_t downsampling_factor_default = 1; static const uint32_t downsampling_factor_default = 1;

View File

@ -147,7 +147,7 @@ public:
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
pcps_acquisition_sptr acquisition_; pcps_acquisition_sptr acquisition_;

View File

@ -146,7 +146,7 @@ public:
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
pcps_acquisition_sptr acquisition_; pcps_acquisition_sptr acquisition_;

View File

@ -142,7 +142,7 @@ public:
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
pcps_acquisition_fine_doppler_cc_sptr acquisition_cc_; pcps_acquisition_fine_doppler_cc_sptr acquisition_cc_;

View File

@ -182,7 +182,7 @@ public:
/*! /*!
* \brief Set Resampler Latency * \brief Set Resampler Latency
*/ */
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
static const uint32_t NUM_PRNs = 32; static const uint32_t NUM_PRNs = 32;

View File

@ -130,14 +130,14 @@ public:
* \brief Restart acquisition algorithm * \brief Restart acquisition algorithm
*/ */
void reset() override; void reset() override;
void set_state(int state __attribute__((unused))) override{}; void set_state(int state __attribute__((unused))) override {};
/*! /*!
* \brief Stop running acquisition * \brief Stop running acquisition
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
pcps_assisted_acquisition_cc_sptr acquisition_cc_; pcps_assisted_acquisition_cc_sptr acquisition_cc_;

View File

@ -131,14 +131,14 @@ public:
* \brief Restart acquisition algorithm * \brief Restart acquisition algorithm
*/ */
void reset() override; void reset() override;
void set_state(int state __attribute__((unused))) override{}; void set_state(int state __attribute__((unused))) override {};
/*! /*!
* \brief Stop running acquisition * \brief Stop running acquisition
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
inline bool opencl_ready() const inline bool opencl_ready() const
{ {

View File

@ -145,7 +145,7 @@ public:
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
float calculate_threshold(float pfa) const; float calculate_threshold(float pfa) const;

View File

@ -143,7 +143,7 @@ public:
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
float calculate_threshold(float pfa) const; float calculate_threshold(float pfa) const;

View File

@ -147,7 +147,7 @@ public:
*/ */
void stop_acquisition() override; void stop_acquisition() override;
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
static const uint32_t downsampling_factor_default = 1; static const uint32_t downsampling_factor_default = 1;

View File

@ -182,7 +182,7 @@ public:
/*! /*!
* \brief Set resampler latency * \brief Set resampler latency
*/ */
void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override{}; void set_resampler_latency(uint32_t latency_samples __attribute__((unused))) override {};
private: private:
static const uint32_t NUM_PRNs = 32; static const uint32_t NUM_PRNs = 32;

View File

@ -1738,23 +1738,23 @@ int res_ppp(int iter __attribute__((unused)), const obsd_t *obs, int n, const do
} }
nv++; nv++;
} }
} }
for (i = 0; i < nv; i++) for (i = 0; i < nv; i++)
{ {
for (j = 0; j < nv; j++) for (j = 0; j < nv; j++)
{ {
R[i + j * nv] = i == j ? var[i] : 0.0; R[i + j * nv] = i == j ? var[i] : 0.0;
} }
} }
trace(5, "x=\n"); trace(5, "x=\n");
tracemat(5, x, 1, nx, 8, 3); tracemat(5, x, 1, nx, 8, 3);
trace(5, "v=\n"); trace(5, "v=\n");
tracemat(5, v, 1, nv, 8, 3); tracemat(5, v, 1, nv, 8, 3);
trace(5, "H=\n"); trace(5, "H=\n");
tracemat(5, H, nx, nv, 8, 3); tracemat(5, H, nx, nv, 8, 3);
trace(5, "R=\n"); trace(5, "R=\n");
tracemat(5, R, nv, nv, 8, 5); tracemat(5, R, nv, nv, 8, 5);
return nv; return nv;
} }

View File

@ -1777,9 +1777,7 @@ gtime_t timeget()
{ {
gtime_t time; gtime_t time;
double ep[6] = {}; double ep[6] = {};
struct timeval tv struct timeval tv{};
{
};
struct tm *tt; struct tm *tt;
if (!gettimeofday(&tv, nullptr) && (tt = gmtime(&tv.tv_sec))) if (!gettimeofday(&tv, nullptr) && (tt = gmtime(&tv.tv_sec)))

View File

@ -87,9 +87,7 @@ serial_t *openserial(const char *path, int mode, char *msg)
const speed_t bs[] = { const speed_t bs[] = {
B300, B600, B1200, B2400, B4800, B9600, B19200, B38400, B57600, B115200, B230400}; B300, B600, B1200, B2400, B4800, B9600, B19200, B38400, B57600, B115200, B230400};
struct termios ios struct termios ios{};
{
};
int rw = 0; int rw = 0;
tracet(3, "openserial: path=%s mode=%d\n", path, mode); tracet(3, "openserial: path=%s mode=%d\n", path, mode);
@ -1104,9 +1102,7 @@ void updatetcpsvr(tcpsvr_t *tcpsvr, char *msg)
/* accept client connection --------------------------------------------------*/ /* accept client connection --------------------------------------------------*/
int accsock(tcpsvr_t *tcpsvr, char *msg) int accsock(tcpsvr_t *tcpsvr, char *msg)
{ {
struct sockaddr_in addr struct sockaddr_in addr{};
{
};
socket_t sock; socket_t sock;
socklen_t len = sizeof(addr); socklen_t len = sizeof(addr);
int i; int i;

View File

@ -70,7 +70,7 @@ private:
public: public:
// ctor // ctor
volk_gnsssdr_test_params_t(float tol, lv_32fc_t scalar, unsigned int vlen, unsigned int iter, volk_gnsssdr_test_params_t(float tol, lv_32fc_t scalar, unsigned int vlen, unsigned int iter,
bool benchmark_mode, std::string kernel_regex) : _tol(tol), _scalar(scalar), _vlen(vlen), _iter(iter), _benchmark_mode(benchmark_mode), _kernel_regex(std::move(kernel_regex)){}; bool benchmark_mode, std::string kernel_regex) : _tol(tol), _scalar(scalar), _vlen(vlen), _iter(iter), _benchmark_mode(benchmark_mode), _kernel_regex(std::move(kernel_regex)) {};
// setters // setters
void set_tol(float tol) { _tol = tol; }; void set_tol(float tol) { _tol = tol; };
void set_scalar(lv_32fc_t scalar) { _scalar = scalar; }; void set_scalar(lv_32fc_t scalar) { _scalar = scalar; };
@ -104,10 +104,10 @@ public:
volk_gnsssdr_test_params_t test_parameters() { return _test_parameters; }; volk_gnsssdr_test_params_t test_parameters() { return _test_parameters; };
// normal ctor // normal ctor
volk_gnsssdr_test_case_t(volk_gnsssdr_func_desc_t desc, void (*kernel_ptr)(), std::string name, volk_gnsssdr_test_case_t(volk_gnsssdr_func_desc_t desc, void (*kernel_ptr)(), std::string name,
volk_gnsssdr_test_params_t test_parameters) : _desc(desc), _kernel_ptr(kernel_ptr), _name(std::move(name)), _test_parameters(std::move(test_parameters)), _puppet_master_name("NULL"){}; volk_gnsssdr_test_params_t test_parameters) : _desc(desc), _kernel_ptr(kernel_ptr), _name(std::move(name)), _test_parameters(std::move(test_parameters)), _puppet_master_name("NULL") {};
// ctor for puppets // ctor for puppets
volk_gnsssdr_test_case_t(volk_gnsssdr_func_desc_t desc, void (*kernel_ptr)(), std::string name, volk_gnsssdr_test_case_t(volk_gnsssdr_func_desc_t desc, void (*kernel_ptr)(), std::string name,
std::string puppet_master_name, volk_gnsssdr_test_params_t test_parameters) : _desc(desc), _kernel_ptr(kernel_ptr), _name(std::move(name)), _test_parameters(std::move(test_parameters)), _puppet_master_name(std::move(puppet_master_name)){}; std::string puppet_master_name, volk_gnsssdr_test_params_t test_parameters) : _desc(desc), _kernel_ptr(kernel_ptr), _name(std::move(name)), _test_parameters(std::move(test_parameters)), _puppet_master_name(std::move(puppet_master_name)) {};
}; };
/************************************************ /************************************************

View File

@ -84,9 +84,7 @@ private:
boost::thread *d_pcap_thread; boost::thread *d_pcap_thread;
// boost::mutex d_mutex; // boost::mutex d_mutex;
struct sockaddr_in si_me struct sockaddr_in si_me{};
{
};
std::string d_src_device; std::string d_src_device;
std::string d_origin_address; std::string d_origin_address;
pcap_t *descr; // ethernet pcap device descriptor pcap_t *descr; // ethernet pcap device descriptor

View File

@ -62,7 +62,7 @@ public:
~glonass_l1_ca_telemetry_decoder_gs() override; //!< Class destructor ~glonass_l1_ca_telemetry_decoder_gs() override; //!< Class destructor
void set_satellite(const Gnss_Satellite &satellite); //!< Set satellite PRN void set_satellite(const Gnss_Satellite &satellite); //!< Set satellite PRN
void set_channel(int32_t channel); //!< Set receiver's channel void set_channel(int32_t channel); //!< Set receiver's channel
inline void reset(){}; inline void reset() {};
/*! /*!
* \brief This is where all signal processing takes place * \brief This is where all signal processing takes place

View File

@ -60,7 +60,7 @@ public:
~glonass_l2_ca_telemetry_decoder_gs() override; //!< Class destructor ~glonass_l2_ca_telemetry_decoder_gs() override; //!< Class destructor
void set_satellite(const Gnss_Satellite &satellite); //!< Set satellite PRN void set_satellite(const Gnss_Satellite &satellite); //!< Set satellite PRN
void set_channel(int32_t channel); //!< Set receiver's channel void set_channel(int32_t channel); //!< Set receiver's channel
inline void reset(){}; inline void reset() {};
/*! /*!
* \brief This is where all signal processing takes place * \brief This is where all signal processing takes place

View File

@ -57,7 +57,7 @@ public:
~sbas_l1_telemetry_decoder_gs() override; ~sbas_l1_telemetry_decoder_gs() override;
void set_satellite(const Gnss_Satellite &satellite); //!< Set satellite PRN void set_satellite(const Gnss_Satellite &satellite); //!< Set satellite PRN
void set_channel(int32_t channel); //!< Set receiver's channel void set_channel(int32_t channel); //!< Set receiver's channel
inline void reset(){}; inline void reset() {};
/*! /*!
* \brief This is where all signal processing takes place * \brief This is where all signal processing takes place

View File

@ -46,7 +46,7 @@ struct GPU_Complex
{ {
float r; float r;
float i; float i;
CUDA_CALLABLE_MEMBER_DEVICE GPU_Complex(){}; CUDA_CALLABLE_MEMBER_DEVICE GPU_Complex() {};
CUDA_CALLABLE_MEMBER_DEVICE GPU_Complex(float a, float b) : r(a), i(b) {} CUDA_CALLABLE_MEMBER_DEVICE GPU_Complex(float a, float b) : r(a), i(b) {}
CUDA_CALLABLE_MEMBER_DEVICE float magnitude2(void) { return r * r + i * i; } CUDA_CALLABLE_MEMBER_DEVICE float magnitude2(void) { return r * r + i * i; }
CUDA_CALLABLE_MEMBER_DEVICE GPU_Complex operator*(const GPU_Complex& a) CUDA_CALLABLE_MEMBER_DEVICE GPU_Complex operator*(const GPU_Complex& a)

View File

@ -46,7 +46,7 @@
class ModelFunction class ModelFunction
{ {
public: public:
ModelFunction(){}; ModelFunction() {};
virtual arma::vec operator()(const arma::vec& input) = 0; virtual arma::vec operator()(const arma::vec& input) = 0;
virtual ~ModelFunction() = default; virtual ~ModelFunction() = default;
}; };

View File

@ -98,7 +98,7 @@ public:
/*! /*!
* \brief Start the flow of samples if needed. * \brief Start the flow of samples if needed.
*/ */
virtual void start(){}; virtual void start() {};
}; };

View File

@ -19,7 +19,7 @@ extern "C"
{ {
#endif #endif
// clang-format off // clang-format off
/* Environment version might be used to avoid running with the old library */ /* Environment version might be used to avoid running with the old library */
#define ASN1C_ENVIRONMENT_VERSION 922 /* Compile-time version */ #define ASN1C_ENVIRONMENT_VERSION 922 /* Compile-time version */
int get_asn1c_environment_version(void); /* Run-time version */ int get_asn1c_environment_version(void); /* Run-time version */

View File

@ -29,7 +29,7 @@
/* To avoid linking with ws2_32.lib, here's the definition of ntohl() */ /* To avoid linking with ws2_32.lib, here's the definition of ntohl() */
#define sys_ntohl(l) \ #define sys_ntohl(l) \
((((l) << 24) & 0xff000000) | (((l) << 16) & 0xff0000) | \ ((((l) << 24) & 0xff000000) | (((l) << 16) & 0xff0000) | \
(((l) << 8) & 0xff00) | ((l)&0xff)) (((l) << 8) & 0xff00) | ((l) & 0xff))
#ifdef _MSC_VER /* MSVS.Net */ #ifdef _MSC_VER /* MSVS.Net */
#ifndef __cplusplus #ifndef __cplusplus

View File

@ -22,7 +22,7 @@ extern "C"
/* /*
* Tag class is encoded together with tag value for optimization purposes. * Tag class is encoded together with tag value for optimization purposes.
*/ */
#define BER_TAG_CLASS(tag) ((tag)&0x3) #define BER_TAG_CLASS(tag) ((tag) & 0x3)
#define BER_TAG_VALUE(tag) ((tag) >> 2) #define BER_TAG_VALUE(tag) ((tag) >> 2)
#define BER_TLV_CONSTRUCTED(tagptr) \ #define BER_TLV_CONSTRUCTED(tagptr) \
(((*(const uint8_t *)tagptr) & 0x20) ? 1 : 0) (((*(const uint8_t *)tagptr) & 0x20) ? 1 : 0)

View File

@ -244,9 +244,7 @@ void ControlThread::init()
else else
{ {
// fill agnss_ref_time_ // fill agnss_ref_time_
struct tm tm struct tm tm{};
{
};
if (strptime(ref_time_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) != nullptr) if (strptime(ref_time_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) != nullptr)
{ {
agnss_ref_time_.seconds = timegm(&tm); agnss_ref_time_.seconds = timegm(&tm);
@ -1046,9 +1044,7 @@ std::vector<std::pair<int, Gnss_Satellite>> ControlThread::get_visible_sats(time
std::vector<unsigned int> visible_gps; std::vector<unsigned int> visible_gps;
std::vector<unsigned int> visible_gal; std::vector<unsigned int> visible_gal;
const std::shared_ptr<PvtInterface> pvt_ptr = flowgraph_->get_pvt(); const std::shared_ptr<PvtInterface> pvt_ptr = flowgraph_->get_pvt();
struct tm tstruct struct tm tstruct{};
{
};
char buf[80]; char buf[80];
tstruct = *gmtime(&rx_utc_time); tstruct = *gmtime(&rx_utc_time);
strftime(buf, sizeof(buf), "%d/%m/%Y %H:%M:%S ", &tstruct); strftime(buf, sizeof(buf), "%d/%m/%Y %H:%M:%S ", &tstruct);

View File

@ -146,9 +146,7 @@ std::string TcpCmdInterface::status(const std::vector<std::string> &commandLine
&course_over_ground_deg, &course_over_ground_deg,
&UTC_time) == true) &UTC_time) == true)
{ {
struct tm tstruct struct tm tstruct{};
{
};
std::array<char, 80> buf1{}; std::array<char, 80> buf1{};
tstruct = *gmtime(&UTC_time); tstruct = *gmtime(&UTC_time);
strftime(buf1.data(), buf1.size(), "%d/%m/%Y %H:%M:%S", &tstruct); strftime(buf1.data(), buf1.size(), "%d/%m/%Y %H:%M:%S", &tstruct);
@ -179,9 +177,7 @@ std::string TcpCmdInterface::hotstart(const std::vector<std::string> &commandLin
if (commandLine.size() > 5) if (commandLine.size() > 5)
{ {
// Read commandline time parameter // Read commandline time parameter
struct tm tm struct tm tm{};
{
};
const std::string tmp_str = commandLine.at(1) + commandLine.at(2); const std::string tmp_str = commandLine.at(1) + commandLine.at(2);
if (strptime(tmp_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) == nullptr) if (strptime(tmp_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) == nullptr)
{ {
@ -227,9 +223,7 @@ std::string TcpCmdInterface::warmstart(const std::vector<std::string> &commandLi
if (commandLine.size() > 5) if (commandLine.size() > 5)
{ {
// Read commandline time parameter // Read commandline time parameter
struct tm tm struct tm tm{};
{
};
const std::string tmp_str = commandLine.at(1) + commandLine.at(2); const std::string tmp_str = commandLine.at(1) + commandLine.at(2);
if (strptime(tmp_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) == nullptr) if (strptime(tmp_str.c_str(), "%d/%m/%Y %H:%M:%S", &tm) == nullptr)
{ {

View File

@ -89,8 +89,7 @@ constexpr int32_t GLONASS_L1_CA_HISTORY_DEEP = 100;
// NAVIGATION MESSAGE DEMODULATION AND DECODING // NAVIGATION MESSAGE DEMODULATION AND DECODING
#define GLONASS_GNAV_PREAMBLE \ #define GLONASS_GNAV_PREAMBLE \
{ \ { \
1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0 \ 1, 1, 1, 1, 1, 0, 0, 0, 1, 1, 0, 1, 1, 1, 0, 1, 0, 1, 0, 0, 0, 0, 1, 0, 0, 1, 0, 1, 1, 0}
}
constexpr double GLONASS_GNAV_PREAMBLE_DURATION_S = 0.300; constexpr double GLONASS_GNAV_PREAMBLE_DURATION_S = 0.300;
constexpr int32_t GLONASS_GNAV_PREAMBLE_LENGTH_BITS = 30; constexpr int32_t GLONASS_GNAV_PREAMBLE_LENGTH_BITS = 30;
constexpr int32_t GLONASS_GNAV_PREAMBLE_LENGTH_SYMBOLS = 300; constexpr int32_t GLONASS_GNAV_PREAMBLE_LENGTH_SYMBOLS = 300;

View File

@ -173,7 +173,7 @@ public:
const std::vector<std::string>& s2_) : msg(msg_), const std::vector<std::string>& s2_) : msg(msg_),
nt(nt_), nt(nt_),
sequence1(s1_), sequence1(s1_),
sequence2(s2_){}; sequence2(s2_) {};
uint8_t msg{}; uint8_t msg{};
uint8_t nt{}; uint8_t nt{};
std::vector<std::string> sequence1; std::vector<std::string> sequence1;

View File

@ -37,8 +37,7 @@ TEST(FFTSpeedTest, ArmadilloVSGNURadioExecutionTime)
unsigned int fft_sizes[19] = {16, 25, 32, 45, 64, 95, 128, 195, 256, 325, 512, 785, 1024, 1503, 2048, 3127, 4096, 6349, 8192}; unsigned int fft_sizes[19] = {16, 25, 32, 45, 64, 95, 128, 195, 256, 325, 512, 785, 1024, 1503, 2048, 3127, 4096, 6349, 8192};
double d_execution_time; double d_execution_time;
EXPECT_NO_THROW( EXPECT_NO_THROW(
for (unsigned int fft_size for (unsigned int fft_size : fft_sizes) {
: fft_sizes) {
d_fft_size = fft_size; d_fft_size = fft_size;
auto d_gr_fft = gnss_fft_fwd_make_unique(d_fft_size); auto d_gr_fft = gnss_fft_fwd_make_unique(d_fft_size);
arma::arma_rng::set_seed_random(); arma::arma_rng::set_seed_random();

View File

@ -25,7 +25,7 @@
class TransitionModel : public ModelFunction class TransitionModel : public ModelFunction
{ {
public: public:
explicit TransitionModel(const arma::mat& kf_F) : coeff_mat(kf_F){}; explicit TransitionModel(const arma::mat& kf_F) : coeff_mat(kf_F) {};
arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; }; arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; };
private: private:
@ -35,7 +35,7 @@ private:
class MeasurementModel : public ModelFunction class MeasurementModel : public ModelFunction
{ {
public: public:
explicit MeasurementModel(const arma::mat& kf_H) : coeff_mat(kf_H){}; explicit MeasurementModel(const arma::mat& kf_H) : coeff_mat(kf_H) {};
arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; }; arma::vec operator()(const arma::vec& input) override { return coeff_mat * input; };
private: private: