Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
9.2.2023: Due to updates GitLab will be unavailable for some minutes between 9:00 and 11:00.
Open sidebar
dcdb
dcdb
Commits
64cdead1
Commit
64cdead1
authored
Jun 18, 2019
by
Micha Müller
Browse files
Minor fix to configurators
parent
7a67c75b
Changes
6
Hide whitespace changes
Inline
Side-by-side
dcdbpusher/includes/ConfiguratorTemplate.h
View file @
64cdead1
...
...
@@ -483,6 +483,13 @@ protected:
}
}
//read in values inherited from EntityInterface
BOOST_FOREACH
(
boost
::
property_tree
::
iptree
::
value_type
&
val
,
config
)
{
if
(
boost
::
iequals
(
val
.
first
,
"mqttPart"
))
{
sEntity
.
setMqttPart
(
val
.
second
.
data
());
}
}
sensorEntity
(
sEntity
,
config
);
BOOST_FOREACH
(
boost
::
property_tree
::
iptree
::
value_type
&
val
,
config
)
{
...
...
dcdbpusher/includes/EntityInterface.h
View file @
64cdead1
...
...
@@ -91,7 +91,7 @@ public:
return
*
this
;
}
//TODO
check if getHostName() aliases are still required after refactor
//TODO
refactor getEntityName -> getName()
///@name Getters
///@{
const
std
::
string
&
getEntityName
()
const
{
return
_name
;
}
...
...
dcdbpusher/sensors/bacnet/BACnetConfigurator.cpp
View file @
64cdead1
...
...
@@ -55,7 +55,7 @@ void BACnetConfigurator::sensorGroup(BACnetSensorGroup& s, CFG_VAL config) {
}
void
BACnetConfigurator
::
global
(
CFG_VAL
config
)
{
_bacClient
=
std
::
make_shared
<
BACnetClient
>
();
_bacClient
=
std
::
make_shared
<
BACnetClient
>
(
"BACnetClient"
);
std
::
string
address_cache
,
interface
;
unsigned
port
=
47808
,
timeout
=
1000
,
apdu_timeout
=
200
,
apdu_retries
=
0
;
...
...
dcdbpusher/sensors/ipmi/IPMIConfigurator.cpp
View file @
64cdead1
...
...
@@ -72,14 +72,12 @@ void IPMIConfigurator::sensorGroup(IPMISensorGroup& s, CFG_VAL config) {
}
void
IPMIConfigurator
::
sensorEntity
(
IPMIHost
&
s
,
CFG_VAL
config
)
{
s
.
setHostName
(
config
.
data
());
s
.
setSessionTimeout
(
_globalHost
.
sessionTimeout
);
s
.
setRetransmissionTimeout
(
_globalHost
.
retransmissionTimeout
);
s
.
setCache
(
_tempdir
);
ADD
{
ATTRIBUTE
(
"username"
,
setUserName
);
ATTRIBUTE
(
"password"
,
setPassword
);
ATTRIBUTE
(
"mqttPart"
,
setMqttPart
);
ATTRIBUTE
(
"cipher"
,
setCipher
);
ATTRIBUTE
(
"ipmiVersion"
,
setIpmiVersion
);
}
...
...
dcdbpusher/sensors/pdu/PDUConfigurator.cpp
View file @
64cdead1
...
...
@@ -52,6 +52,5 @@ void PDUConfigurator::sensorGroup(PDUSensorGroup& s, CFG_VAL config) {
void
PDUConfigurator
::
sensorEntity
(
PDUUnit
&
s
,
CFG_VAL
config
)
{
ADD
{
ATTRIBUTE
(
"host"
,
setHost
);
//TODO add support for mqttPart if required
}
}
dcdbpusher/sensors/snmp/SNMPConfigurator.cpp
View file @
64cdead1
...
...
@@ -65,6 +65,5 @@ void SNMPConfigurator::sensorEntity(SNMPConnection& s, CFG_VAL config) {
ATTRIBUTE
(
"PrivProto"
,
setPrivProto
);
ATTRIBUTE
(
"AuthKey"
,
setAuthKey
);
ATTRIBUTE
(
"PrivKey"
,
setPrivKey
);
ATTRIBUTE
(
"MqttPart"
,
setMqttPart
);
}
}
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment