Skip to content
Projects
Groups
Snippets
Help
This project
Loading...
Sign in / Register
Toggle navigation
U
uniset2
Project
Project
Details
Activity
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
1
Issues
1
List
Board
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
UniSet project repositories
uniset2
Commits
d1ded5c1
Commit
d1ded5c1
authored
Dec 23, 2020
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make style
parent
30c0a338
Show whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
10 additions
and
7 deletions
+10
-7
Configuration.h
include/Configuration.h
+1
-1
DBServer.h
include/DBServer.h
+4
-1
IOController.h
include/IOController.h
+1
-1
UniSetActivator.h
include/UniSetActivator.h
+1
-1
mq-test.cc
tests/MQPerfTest/mq-test.cc
+1
-1
test_messagetype.cc
tests/test_messagetype.cc
+1
-1
test_unixml.cc
tests/test_unixml.cc
+1
-1
No files found.
include/Configuration.h
View file @
d1ded5c1
...
@@ -180,7 +180,7 @@ namespace uniset
...
@@ -180,7 +180,7 @@ namespace uniset
virtual
void
initNode
(
uniset
::
NodeInfo
&
ninfo
,
UniXML
::
iterator
&
it
)
noexcept
;
virtual
void
initNode
(
uniset
::
NodeInfo
&
ninfo
,
UniXML
::
iterator
&
it
)
noexcept
;
void
initRepSections
();
void
initRepSections
();
std
::
pair
<
std
::
string
,
xmlNode
*>
getRepSectionName
(
const
std
::
string
&
sec
);
std
::
pair
<
std
::
string
,
xmlNode
*>
getRepSectionName
(
const
std
::
string
&
sec
);
void
setConfFileName
(
const
std
::
string
&
fn
=
""
);
void
setConfFileName
(
const
std
::
string
&
fn
=
""
);
void
initParameters
();
void
initParameters
();
void
setLocalNode
(
const
std
::
string
&
nodename
);
void
setLocalNode
(
const
std
::
string
&
nodename
);
...
...
include/DBServer.h
View file @
d1ded5c1
...
@@ -68,7 +68,10 @@ namespace uniset
...
@@ -68,7 +68,10 @@ namespace uniset
virtual
bool
activateObject
()
override
;
virtual
bool
activateObject
()
override
;
virtual
void
initDBServer
()
{}
virtual
void
initDBServer
()
{}
virtual
std
::
string
getMonitInfo
(
const
std
::
string
&
params
){
return
""
;
}
virtual
std
::
string
getMonitInfo
(
const
std
::
string
&
params
)
{
return
""
;
}
std
::
shared_ptr
<
LogAgregator
>
loga
;
std
::
shared_ptr
<
LogAgregator
>
loga
;
...
...
include/IOController.h
View file @
d1ded5c1
...
@@ -183,7 +183,7 @@ namespace uniset
...
@@ -183,7 +183,7 @@ namespace uniset
// http API
// http API
virtual
Poco
::
JSON
::
Object
::
Ptr
request_get
(
const
std
::
string
&
req
,
const
Poco
::
URI
::
QueryParameters
&
p
);
virtual
Poco
::
JSON
::
Object
::
Ptr
request_get
(
const
std
::
string
&
req
,
const
Poco
::
URI
::
QueryParameters
&
p
);
virtual
Poco
::
JSON
::
Object
::
Ptr
request_sensors
(
const
std
::
string
&
req
,
const
Poco
::
URI
::
QueryParameters
&
p
);
virtual
Poco
::
JSON
::
Object
::
Ptr
request_sensors
(
const
std
::
string
&
req
,
const
Poco
::
URI
::
QueryParameters
&
p
);
void
getSensorInfo
(
Poco
::
JSON
::
Array
::
Ptr
&
jdata
,
std
::
shared_ptr
<
USensorInfo
>&
s
,
bool
shortInfo
=
false
);
void
getSensorInfo
(
Poco
::
JSON
::
Array
::
Ptr
&
jdata
,
std
::
shared_ptr
<
USensorInfo
>&
s
,
bool
shortInfo
=
false
);
#endif
#endif
// переопределяем для добавления вызова регистрации датчиков
// переопределяем для добавления вызова регистрации датчиков
...
...
include/UniSetActivator.h
View file @
d1ded5c1
...
@@ -92,7 +92,7 @@ namespace uniset
...
@@ -92,7 +92,7 @@ namespace uniset
#ifndef DISABLE_REST_API
#ifndef DISABLE_REST_API
// Поддержка REST API (IHttpRequestRegistry)
// Поддержка REST API (IHttpRequestRegistry)
virtual
Poco
::
JSON
::
Object
::
Ptr
httpGetByName
(
const
std
::
string
&
name
,
const
Poco
::
URI
::
QueryParameters
&
p
)
override
;
virtual
Poco
::
JSON
::
Object
::
Ptr
httpGetByName
(
const
std
::
string
&
name
,
const
Poco
::
URI
::
QueryParameters
&
p
)
override
;
virtual
Poco
::
JSON
::
Array
::
Ptr
httpGetObjectsList
(
const
Poco
::
URI
::
QueryParameters
&
p
)
override
;
virtual
Poco
::
JSON
::
Array
::
Ptr
httpGetObjectsList
(
const
Poco
::
URI
::
QueryParameters
&
p
)
override
;
virtual
Poco
::
JSON
::
Object
::
Ptr
httpHelpByName
(
const
std
::
string
&
name
,
const
Poco
::
URI
::
QueryParameters
&
p
)
override
;
virtual
Poco
::
JSON
::
Object
::
Ptr
httpHelpByName
(
const
std
::
string
&
name
,
const
Poco
::
URI
::
QueryParameters
&
p
)
override
;
virtual
Poco
::
JSON
::
Object
::
Ptr
httpRequestByName
(
const
std
::
string
&
name
,
const
std
::
string
&
req
,
const
Poco
::
URI
::
QueryParameters
&
p
)
override
;
virtual
Poco
::
JSON
::
Object
::
Ptr
httpRequestByName
(
const
std
::
string
&
name
,
const
std
::
string
&
req
,
const
Poco
::
URI
::
QueryParameters
&
p
)
override
;
...
...
tests/MQPerfTest/mq-test.cc
View file @
d1ded5c1
...
@@ -87,7 +87,7 @@ int main(int argc, const char** argv)
...
@@ -87,7 +87,7 @@ int main(int argc, const char** argv)
// вычисляем среднее
// вычисляем среднее
int
sum
=
0
;
int
sum
=
0
;
for
(
auto
&&
r
:
res
)
for
(
auto
&&
r
:
res
)
sum
+=
r
;
sum
+=
r
;
float
avg
=
(
float
)
sum
/
tnum
;
float
avg
=
(
float
)
sum
/
tnum
;
...
...
tests/test_messagetype.cc
View file @
d1ded5c1
...
@@ -248,7 +248,7 @@ TEST_CASE("TextMessage", "[basic][message types][TextMessage]" )
...
@@ -248,7 +248,7 @@ TEST_CASE("TextMessage", "[basic][message types][TextMessage]" )
SECTION
(
"TextMessage from network"
)
SECTION
(
"TextMessage from network"
)
{
{
std
::
string
txt
=
"Hello world"
;
std
::
string
txt
=
"Hello world"
;
::
uniset
::
Timespec
tspec
;
::
uniset
::
Timespec
tspec
;
tspec
.
sec
=
10
;
tspec
.
sec
=
10
;
...
...
tests/test_unixml.cc
View file @
d1ded5c1
...
@@ -98,7 +98,7 @@ TEST_CASE("UniXML::iterator", "[unixml][iterator][basic]" )
...
@@ -98,7 +98,7 @@ TEST_CASE("UniXML::iterator", "[unixml][iterator][basic]" )
CHECK
(
it
.
getName
()
==
"UserData"
);
CHECK
(
it
.
getName
()
==
"UserData"
);
UniXML
::
iterator
it_bad
=
uxml
.
begin
();
UniXML
::
iterator
it_bad
=
uxml
.
begin
();
REQUIRE_FALSE
(
it_bad
.
findName
(
"UnknownNode"
,
"NOTFOUND"
)
);
REQUIRE_FALSE
(
it_bad
.
findName
(
"UnknownNode"
,
"NOTFOUND"
)
);
REQUIRE_FALSE
(
!
it_bad
);
REQUIRE_FALSE
(
!
it_bad
);
it
=
uxml
.
begin
();
it
=
uxml
.
begin
();
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a 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