Skip to content

Commit 28b71e4

Browse files
aentingeraentinger
committed
Unify format of function definition across all files.
1 parent 994fd4d commit 28b71e4

22 files changed

+297
-169
lines changed

‎src/Opta.cpp‎

Lines changed: 24 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ namespace opcua
2424
* CTOR/DTOR
2525
**************************************************************************************/
2626

27-
Opta::Opta(UA_Server * server, UA_NodeId const & node_id)
27+
Opta::Opta(
28+
UA_Server * server,
29+
UA_NodeId const & node_id)
2830
: _server{server}
2931
, _node_id{node_id}
3032
, _analog_input_mgr{nullptr}
@@ -34,14 +36,17 @@ Opta::Opta(UA_Server * server, UA_NodeId const & node_id)
3436
{
3537
_usr_button = opcua::UserButton::create(_server, _node_id);
3638
if (!_usr_button)
37-
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Opta::Ctor: UserButton::create(...) failed.");
39+
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: UserButton::create(...) failed.", __PRETTY_FUNCTION__);
3840
}
3941

4042
/**************************************************************************************
4143
* PUBLIC MEMBER FUNCTIONS
4244
**************************************************************************************/
4345

44-
Opta::SharedPtr Opta::create(UA_Server * server, OptaVariant::Type const opta_type)
46+
Opta::SharedPtr
47+
Opta::create(
48+
UA_Server * server,
49+
OptaVariant::Type const opta_type)
4550
{
4651
UA_StatusCode rc = UA_STATUSCODE_GOOD;
4752

@@ -60,8 +65,7 @@ Opta::SharedPtr Opta::create(UA_Server * server, OptaVariant::Type const opta_ty
6065
if (UA_StatusCode_isBad(rc))
6166
{
6267
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
63-
"Opta::create: UA_Server_addObjectNode(...) failed with %s",
64-
UA_StatusCode_name(rc));
68+
"%s: UA_Server_addObjectNode(...) failed with %s", __PRETTY_FUNCTION__, UA_StatusCode_name(rc));
6569
return nullptr;
6670
}
6771

@@ -81,8 +85,7 @@ Opta::SharedPtr Opta::create(UA_Server * server, OptaVariant::Type const opta_ty
8185
if (UA_StatusCode_isBad(rc))
8286
{
8387
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
84-
"Opta::create: UA_Server_addVariableNode(..., \"ManufacturerName\", ...) failed with %s",
85-
UA_StatusCode_name(rc));
88+
"%s: UA_Server_addVariableNode(..., \"ManufacturerName\", ...) failed with %s", __PRETTY_FUNCTION__, UA_StatusCode_name(rc));
8689
return nullptr;
8790
}
8891

@@ -102,8 +105,7 @@ Opta::SharedPtr Opta::create(UA_Server * server, OptaVariant::Type const opta_ty
102105
if (UA_StatusCode_isBad(rc))
103106
{
104107
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
105-
"Opta::create: UA_Server_addVariableNode(..., \"ModelName\", ...) failed with %s",
106-
UA_StatusCode_name(rc));
108+
"%s: UA_Server_addVariableNode(..., \"ModelName\", ...) failed with %s", __PRETTY_FUNCTION__, UA_StatusCode_name(rc));
107109
return nullptr;
108110
}
109111

@@ -123,58 +125,61 @@ Opta::SharedPtr Opta::create(UA_Server * server, OptaVariant::Type const opta_ty
123125
if (UA_StatusCode_isBad(rc))
124126
{
125127
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER,
126-
"Opta::create: UA_Server_addVariableNode(..., \"Status\", ...) failed with %s",
127-
UA_StatusCode_name(rc));
128+
"%s: UA_Server_addVariableNode(..., \"Status\", ...) failed with %s", __PRETTY_FUNCTION__, UA_StatusCode_name(rc));
128129
return nullptr;
129130
}
130131

131132
auto const instance_ptr = std::make_shared<Opta>(server, node_id);
132133
return instance_ptr;
133134
}
134135

135-
AnalogInputManager::SharedPtr Opta::analog_input_mgr()
136+
AnalogInputManager::SharedPtr
137+
Opta::analog_input_mgr()
136138
{
137139
if (!_analog_input_mgr)
138140
{
139141
_analog_input_mgr = opcua::AnalogInputManager::create(_server, _node_id);
140142
if (!_analog_input_mgr)
141-
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Opta::analog_input_mgr: AnalogInputManager::create(...) failed.");
143+
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: AnalogInputManager::create(...) failed.", __PRETTY_FUNCTION__);
142144
}
143145

144146
return _analog_input_mgr;
145147
}
146148

147-
DigitalInputManager::SharedPtr Opta::digital_input_mgr()
149+
DigitalInputManager::SharedPtr
150+
Opta::digital_input_mgr()
148151
{
149152
if (!_digital_input_mgr)
150153
{
151154
_digital_input_mgr = opcua::DigitalInputManager::create(_server, _node_id);
152155
if (!_digital_input_mgr)
153-
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Opta::digital_input_mgr: DigitalInputManager::create(...) failed.");
156+
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: DigitalInputManager::create(...) failed.", __PRETTY_FUNCTION__);
154157
}
155158

156159
return _digital_input_mgr;
157160
}
158161

159-
RelayManager::SharedPtr Opta::relay_mgr()
162+
RelayManager::SharedPtr
163+
Opta::relay_mgr()
160164
{
161165
if (!_relay_mgr)
162166
{
163167
_relay_mgr = opcua::RelayManager::create(_server, _node_id);
164168
if (!_relay_mgr)
165-
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Opta::relay_mgr: RelayManager::create(...) failed.");
169+
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: RelayManager::create(...) failed.", __PRETTY_FUNCTION__);
166170
}
167171

168172
return _relay_mgr;
169173
}
170174

171-
LedManager::SharedPtr Opta::led_mgr()
175+
LedManager::SharedPtr
176+
Opta::led_mgr()
172177
{
173178
if (!_led_mgr)
174179
{
175180
_led_mgr = opcua::LedManager::create(_server, _node_id);
176181
if (!_led_mgr)
177-
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "Opta::led_mgr: LedManager::create(...) failed.");
182+
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: LedManager::create(...) failed.", __PRETTY_FUNCTION__);
178183
}
179184

180185
return _led_mgr;

‎src/Opta.h‎

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -42,10 +42,15 @@ class Opta
4242
typedef std::shared_ptr<Opta> SharedPtr;
4343

4444

45-
static SharedPtr create(UA_Server * server, OptaVariant::Type const opta_type);
45+
static SharedPtr
46+
create(
47+
UA_Server * server,
48+
OptaVariant::Type const opta_type);
4649

4750

48-
Opta(UA_Server * server, UA_NodeId const & node_id);
51+
Opta(
52+
UA_Server * server,
53+
UA_NodeId const & node_id);
4954

5055

5156
AnalogInputManager::SharedPtr analog_input_mgr();

‎src/OptaExpansionManager.cpp‎

Lines changed: 9 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,9 @@ namespace opcua
2424
* PUBLIC MEMBER FUNCTIONS
2525
**************************************************************************************/
2626

27-
DigitalMechExpansion::SharedPtr OptaExpansionManager::create_digital_mechanical_expansion(uint8_t const exp_num)
27+
DigitalMechExpansion::SharedPtr
28+
OptaExpansionManager::create_digital_mechanical_expansion(
29+
uint8_t const exp_num)
2830
{
2931
auto const exp_mech_opcua = opcua::DigitalMechExpansion::create(
3032
_server,
@@ -35,7 +37,9 @@ DigitalMechExpansion::SharedPtr OptaExpansionManager::create_digital_mechanical_
3537
return exp_mech_opcua;
3638
}
3739

38-
DigitalStSolidExpansion::SharedPtr OptaExpansionManager::create_digital_solid_state_expansion(uint8_t const exp_num)
40+
DigitalStSolidExpansion::SharedPtr
41+
OptaExpansionManager::create_digital_solid_state_expansion(
42+
uint8_t const exp_num)
3943
{
4044
auto const exp_solid_state_opcua = opcua::DigitalStSolidExpansion::create(
4145
_server,
@@ -46,7 +50,9 @@ DigitalStSolidExpansion::SharedPtr OptaExpansionManager::create_digital_solid_st
4650
return exp_solid_state_opcua;
4751
}
4852

49-
AnalogExpansion::SharedPtr OptaExpansionManager::create_analog_expansion(uint8_t const exp_num)
53+
AnalogExpansion::SharedPtr
54+
OptaExpansionManager::create_analog_expansion(
55+
uint8_t const exp_num)
5056
{
5157
auto const exp_analog_opcua = opcua::AnalogExpansion::create(
5258
_server,

‎src/OptaExpansionManager.h‎

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -38,12 +38,15 @@ class OptaExpansionManager
3838
typedef std::shared_ptr<OptaExpansionManager> SharedPtr;
3939

4040

41-
static SharedPtr create(UA_Server * server) {
41+
static SharedPtr
42+
create(
43+
UA_Server * server) {
4244
return std::make_shared<OptaExpansionManager>(server);
4345
}
4446

4547

46-
OptaExpansionManager(UA_Server * server)
48+
OptaExpansionManager(
49+
UA_Server * server)
4750
: _server{server}
4851
{ }
4952

‎src/OptaVariant.cpp‎

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,9 @@ namespace opcua
3232
* PUBLIC MEMBER FUNCTIONS
3333
**************************************************************************************/
3434

35-
bool OptaVariant::get_opta_variant(Type & type)
35+
bool
36+
OptaVariant::get_opta_variant(
37+
Type & type)
3638
{
3739
OptaBoardInfo * info = boardInfo();
3840

@@ -51,7 +53,9 @@ bool OptaVariant::get_opta_variant(Type & type)
5153
return true;
5254
}
5355

54-
std::string OptaVariant::toString(Type const type)
56+
std::string
57+
OptaVariant::toString(
58+
Type const type)
5559
{
5660
switch(type)
5761
{
@@ -62,13 +66,15 @@ std::string OptaVariant::toString(Type const type)
6266
}
6367
}
6468

65-
std::string OptaVariant::toSKUString(Type const type)
69+
std::string
70+
OptaVariant::toSKUString(
71+
Type const type)
6672
{
6773
switch(type)
6874
{
69-
case OptaVariant::Type::WiFi: return std::string("AFX00002"); break;
75+
case OptaVariant::Type::WiFi: return std::string("AFX00002"); break;
7076
case OptaVariant::Type::RS485: return std::string("AFX00001"); break;
71-
case OptaVariant::Type::Lite: return std::string("AFX00003"); break;
77+
case OptaVariant::Type::Lite: return std::string("AFX00003"); break;
7278
default: __builtin_unreachable(); break;
7379
}
7480
}

‎src/OptaVariant.h‎

Lines changed: 11 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -32,12 +32,20 @@ class OptaVariant
3232
OptaVariant() = delete;
3333
OptaVariant(OptaVariant const &) = delete;
3434

35+
3536
enum class Type { Lite, RS485, WiFi };
3637

37-
static bool get_opta_variant(Type & type);
3838

39-
static std::string toString(Type const type);
40-
static std::string toSKUString(Type const type);
39+
static bool
40+
get_opta_variant(
41+
Type & type);
42+
43+
static std::string
44+
toString(
45+
Type const type);
46+
static std::string
47+
toSKUString(
48+
Type const type);
4149
};
4250

4351
/**************************************************************************************

‎src/expansion/DigitalExpansion.cpp‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -26,37 +26,40 @@ namespace opcua
2626
* PUBLIC MEMBER FUNCTIONS
2727
**************************************************************************************/
2828

29-
AnalogInputManager::SharedPtr DigitalExpansion::analog_input_mgr()
29+
AnalogInputManager::SharedPtr
30+
DigitalExpansion::analog_input_mgr()
3031
{
3132
if (!_analog_input_mgr)
3233
{
3334
_analog_input_mgr = opcua::AnalogInputManager::create(_server, _node_id);
3435
if (!_analog_input_mgr)
35-
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "DigitalExpansion::analog_input_mgr: AnalogInputManager::create(...) failed.");
36+
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: AnalogInputManager::create(...) failed.", __PRETTY_FUNCTION__);
3637
}
3738

3839
return _analog_input_mgr;
3940
}
4041

41-
DigitalInputManager::SharedPtr DigitalExpansion::digital_input_mgr()
42+
DigitalInputManager::SharedPtr
43+
DigitalExpansion::digital_input_mgr()
4244
{
4345
if (!_digital_input_mgr)
4446
{
4547
_digital_input_mgr = opcua::DigitalInputManager::create(_server, _node_id);
4648
if (!_digital_input_mgr)
47-
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "DigitalExpansion::digital_input_mgr: DigitalInputManager::create(...) failed.");
49+
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: DigitalInputManager::create(...) failed.", __PRETTY_FUNCTION__);
4850
}
4951

5052
return _digital_input_mgr;
5153
}
5254

53-
RelayManager::SharedPtr DigitalExpansion::relay_mgr()
55+
RelayManager::SharedPtr
56+
DigitalExpansion::relay_mgr()
5457
{
5558
if (!_relay_mgr)
5659
{
5760
_relay_mgr = opcua::RelayManager::create(_server, _node_id);
5861
if (!_relay_mgr)
59-
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "DigitalExpansion::relay_mgr: RelayManager::create(...) failed.");
62+
UA_LOG_ERROR(UA_Log_Stdout, UA_LOGCATEGORY_SERVER, "%s: RelayManager::create(...) failed.", __PRETTY_FUNCTION__);
6063
}
6164

6265
return _relay_mgr;

‎src/expansion/DigitalExpansion.h‎

Lines changed: 6 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -38,11 +38,12 @@ class DigitalExpansion : public Expansion
3838
typedef std::shared_ptr<DigitalExpansion> SharedPtr;
3939

4040

41-
DigitalExpansion(UA_Server * server,
42-
UA_NodeId const parent_node_id,
43-
char * display_name,
44-
char * node_name,
45-
char * model_name)
41+
DigitalExpansion(
42+
UA_Server * server,
43+
UA_NodeId const parent_node_id,
44+
char * display_name,
45+
char * node_name,
46+
char * model_name)
4647
: Expansion(server, parent_node_id, display_name, node_name, model_name)
4748
{ }
4849

‎src/expansion/DigitalMechExpansion.h‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ class DigitalMechExpansion : public DigitalExpansion
3232
typedef std::shared_ptr<DigitalMechExpansion> SharedPtr;
3333

3434

35-
static SharedPtr create(UA_Server *server, UA_NodeId const parent_node_id, uint8_t const exp_num)
35+
static SharedPtr
36+
create(
37+
UA_Server *server,
38+
UA_NodeId const parent_node_id,
39+
uint8_t const exp_num)
3640
{
3741
char display_name[64] = {0};
3842
snprintf(display_name, sizeof(display_name), "Arduino Opta Expansion %d: Digital (Mechanical)", exp_num);
@@ -47,11 +51,12 @@ class DigitalMechExpansion : public DigitalExpansion
4751
}
4852

4953

50-
DigitalMechExpansion(UA_Server * server,
51-
UA_NodeId const parent_node_id,
52-
char * display_name,
53-
char * node_name,
54-
char * model_name)
54+
DigitalMechExpansion(
55+
UA_Server * server,
56+
UA_NodeId const parent_node_id,
57+
char * display_name,
58+
char * node_name,
59+
char * model_name)
5560
: DigitalExpansion{server, parent_node_id, display_name, node_name, model_name}
5661
{}
5762
};

‎src/expansion/DigitalStSolidExpansion.h‎

Lines changed: 11 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -32,7 +32,11 @@ class DigitalStSolidExpansion : public DigitalExpansion
3232
typedef std::shared_ptr<DigitalStSolidExpansion> SharedPtr;
3333

3434

35-
static SharedPtr create(UA_Server *server, UA_NodeId const parent_node_id, uint8_t const exp_num)
35+
static SharedPtr
36+
create(
37+
UA_Server *server,
38+
UA_NodeId const parent_node_id,
39+
uint8_t const exp_num)
3640
{
3741
char display_name[64] = {0};
3842
snprintf(display_name, sizeof(display_name), "Arduino Opta Expansion %d: Digital (Solid State)", exp_num);
@@ -47,11 +51,12 @@ class DigitalStSolidExpansion : public DigitalExpansion
4751
}
4852

4953

50-
DigitalStSolidExpansion(UA_Server * server,
51-
UA_NodeId const parent_node_id,
52-
char * display_name,
53-
char * node_name,
54-
char * model_name)
54+
DigitalStSolidExpansion(
55+
UA_Server * server,
56+
UA_NodeId const parent_node_id,
57+
char * display_name,
58+
char * node_name,
59+
char * model_name)
5560
: DigitalExpansion{server, parent_node_id, display_name, node_name, model_name}
5661
{}
5762
};

0 commit comments

Comments
 (0)