Skip to content

Commit e5b3f4f

Browse files
demos: improve code quality (#302)
Signed-off-by: Daniel Edwards <Daniel.Edwards@vector.com>
1 parent 96a729f commit e5b3f4f

5 files changed

Lines changed: 19 additions & 12 deletions

File tree

Demos/communication/Flexray/FlexrayDemoCommon.hpp

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@
22
//
33
// SPDX-License-Identifier: MIT
44

5+
#pragma once
56

67
#include "silkit/services/flexray/all.hpp"
78
#include "silkit/services/flexray/string_utils.hpp"
@@ -91,7 +92,7 @@ class FlexrayNode
9192

9293
private:
9394
IFlexrayController* _flexrayController{nullptr};
94-
FlexrayControllerConfig _controllerConfig;
95+
FlexrayControllerConfig _controllerConfig{};
9596
FlexrayPocStatusEvent _lastPocStatus{};
9697
int _msgId = 0;
9798
bool _configured{false};
@@ -217,9 +218,9 @@ class FlexrayNode
217218
}
218219
};
219220

220-
auto MakeControllerConfig() -> FlexrayControllerConfig
221+
inline auto MakeControllerConfig() -> FlexrayControllerConfig
221222
{
222-
FlexrayClusterParameters clusterParams;
223+
FlexrayClusterParameters clusterParams{};
223224
clusterParams.gColdstartAttempts = 8;
224225
clusterParams.gCycleCountMax = 63;
225226
clusterParams.gdActionPointOffset = 2;
@@ -241,7 +242,7 @@ auto MakeControllerConfig() -> FlexrayControllerConfig
241242
clusterParams.gPayloadLengthStatic = 13;
242243
clusterParams.gSyncFrameIDCountMax = 15;
243244

244-
FlexrayNodeParameters nodeParams;
245+
FlexrayNodeParameters nodeParams{};
245246
nodeParams.pAllowHaltDueToClock = 1;
246247
nodeParams.pAllowPassiveToActive = 0;
247248
nodeParams.pChannels = FlexrayChannel::AB;
@@ -265,7 +266,7 @@ auto MakeControllerConfig() -> FlexrayControllerConfig
265266
nodeParams.pdMicrotick = FlexrayClockPeriod::T25NS;
266267
nodeParams.pSamplesPerMicrotick = 2;
267268

268-
FlexrayControllerConfig config;
269+
FlexrayControllerConfig config{};
269270
config.clusterParams = clusterParams;
270271
config.nodeParams = nodeParams;
271272

Demos/communication/Flexray/FlexrayNode0Demo.cpp

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -37,7 +37,7 @@ class FlexrayNode0 : public ApplicationBase
3737

3838
// The specific buffer configs for this node
3939
std::vector<FlexrayTxBufferConfig> bufferConfigs;
40-
FlexrayTxBufferConfig baseBufferCfg;
40+
FlexrayTxBufferConfig baseBufferCfg{};
4141
baseBufferCfg.offset = 0;
4242
baseBufferCfg.repetition = 1;
4343
baseBufferCfg.hasPayloadPreambleIndicator = false;
@@ -88,8 +88,9 @@ class FlexrayNode0 : public ApplicationBase
8888

8989
int main(int argc, char** argv)
9090
{
91-
Arguments args;
91+
Arguments args{};
9292
args.participantName = "Node0";
93+
9394
FlexrayNode0 app{args};
9495
app.SetupCommandLineArgs(argc, argv, "SIL Kit Demo - Flexray: Node0 of a two-node Flexray system",
9596
{ApplicationBase::DefaultArg::Async});

Demos/communication/Flexray/FlexrayNode1Demo.cpp

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@
77

88
using namespace SilKit::Services::Flexray;
99

10-
class FlexrayNode0 : public ApplicationBase
10+
class FlexrayNode1 : public ApplicationBase
1111
{
1212
public:
1313
// Inherit constructors
@@ -37,7 +37,7 @@ class FlexrayNode0 : public ApplicationBase
3737

3838
// The specific buffer configs for this node
3939
std::vector<FlexrayTxBufferConfig> bufferConfigs;
40-
FlexrayTxBufferConfig baseBufferCfg;
40+
FlexrayTxBufferConfig baseBufferCfg{};
4141
baseBufferCfg.offset = 0;
4242
baseBufferCfg.repetition = 1;
4343
baseBufferCfg.hasPayloadPreambleIndicator = false;
@@ -88,9 +88,10 @@ class FlexrayNode0 : public ApplicationBase
8888

8989
int main(int argc, char** argv)
9090
{
91-
Arguments args;
91+
Arguments args{};
9292
args.participantName = "Node1";
93-
FlexrayNode0 app{args};
93+
94+
FlexrayNode1 app{args};
9495
app.SetupCommandLineArgs(argc, argv, "SIL Kit Demo - Flexray: Node1 of a two-node Flexray system",
9596
{ApplicationBase::DefaultArg::Async});
9697

Demos/communication/include/ApplicationBase.hpp

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -55,6 +55,8 @@ class ApplicationBase
5555
_commandLineParser = std::make_shared<CommandlineParser>();
5656
}
5757

58+
virtual ~ApplicationBase() = default;
59+
5860
protected:
5961
// Must be implemented by the actual application
6062

docs/changelog/versions/latest.md

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,5 @@
11
# [5.0.4] - UNRELEASED
22

3-
> This changelog entry is still empty.
3+
## Fixed
4+
5+
- `demos`: improved code quality

0 commit comments

Comments
 (0)