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
3f664191
Commit
3f664191
authored
May 18, 2018
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
make style
parent
373b2172
Expand all
Hide whitespace changes
Inline
Side-by-side
Showing
7 changed files
with
6 additions
and
3 deletions
+6
-3
IOControl.cc
extensions/IOControl/IOControl.cc
+1
-1
IOControl.h
extensions/IOControl/IOControl.h
+1
-1
LogDB.cc
extensions/LogDB/LogDB.cc
+2
-1
UObject_SK.h
extensions/include/UObject_SK.h
+0
-0
UObject_SK.cc
extensions/lib/UObject_SK.cc
+0
-0
UHttpRequestHandler.cc
src/Communications/Http/UHttpRequestHandler.cc
+1
-0
ModbusTCPSession.cc
src/Communications/Modbus/ModbusTCPSession.cc
+1
-0
No files found.
extensions/IOControl/IOControl.cc
View file @
3f664191
...
@@ -892,7 +892,7 @@ namespace uniset
...
@@ -892,7 +892,7 @@ namespace uniset
<<
". Must be aref=[0..3]"
<<
endl
;
<<
". Must be aref=[0..3]"
<<
endl
;
return
false
;
return
false
;
}
}
inf
->
adelay
=
IOBase
::
initIntProp
(
it
,
"adelay"
,
prop_prefix
,
false
);
inf
->
adelay
=
IOBase
::
initIntProp
(
it
,
"adelay"
,
prop_prefix
,
false
);
}
}
...
...
extensions/IOControl/IOControl.h
View file @
3f664191
...
@@ -276,7 +276,7 @@ namespace uniset
...
@@ -276,7 +276,7 @@ namespace uniset
3 - analog ref = other (undefined)
3 - analog ref = other (undefined)
*/
*/
int
aref
;
int
aref
;
int
adelay
;
/*! Задержка на чтение аналоговых входов с мультиплексированием ( в мкс ) */
int
adelay
;
/*! Задержка на чтение аналоговых входов с мультиплексированием ( в мкс ) */
/*! Измерительный диапазон
/*! Измерительный диапазон
...
...
extensions/LogDB/LogDB.cc
View file @
3f664191
...
@@ -90,7 +90,8 @@ LogDB::LogDB( const string& name, int argc, const char* const* argv, const strin
...
@@ -90,7 +90,8 @@ LogDB::LogDB( const string& name, int argc, const char* const* argv, const strin
else
else
{
{
// инициализируем сами, т.к. conf нету..
// инициализируем сами, т.к. conf нету..
const
std
::
string
loglevels
=
uniset
::
getArg2Param
(
"--"
+
prefix
+
"log-add-levels"
,
argc
,
argv
,
it
.
getProp
(
"log"
),
""
);
const
std
::
string
loglevels
=
uniset
::
getArg2Param
(
"--"
+
prefix
+
"log-add-levels"
,
argc
,
argv
,
it
.
getProp
(
"log"
),
""
);
if
(
!
loglevels
.
empty
()
)
if
(
!
loglevels
.
empty
()
)
dblog
->
level
(
Debug
::
value
(
loglevels
));
dblog
->
level
(
Debug
::
value
(
loglevels
));
}
}
...
...
extensions/include/UObject_SK.h
View file @
3f664191
This diff is collapsed.
Click to expand it.
extensions/lib/UObject_SK.cc
View file @
3f664191
This diff is collapsed.
Click to expand it.
src/Communications/Http/UHttpRequestHandler.cc
View file @
3f664191
...
@@ -43,6 +43,7 @@ namespace uniset
...
@@ -43,6 +43,7 @@ namespace uniset
resp
.
set
(
"Access-Control-Allow-Methods"
,
"GET"
);
resp
.
set
(
"Access-Control-Allow-Methods"
,
"GET"
);
resp
.
set
(
"Access-Control-Allow-Request-Method"
,
"*"
);
resp
.
set
(
"Access-Control-Allow-Request-Method"
,
"*"
);
resp
.
set
(
"Access-Control-Allow-Origin"
,
httpCORS_allow
/* req.get("Origin") */
);
resp
.
set
(
"Access-Control-Allow-Origin"
,
httpCORS_allow
/* req.get("Origin") */
);
if
(
!
registry
)
if
(
!
registry
)
{
{
resp
.
setStatus
(
HTTPResponse
::
HTTP_INTERNAL_SERVER_ERROR
);
resp
.
setStatus
(
HTTPResponse
::
HTTP_INTERNAL_SERVER_ERROR
);
...
...
src/Communications/Modbus/ModbusTCPSession.cc
View file @
3f664191
...
@@ -308,6 +308,7 @@ namespace uniset
...
@@ -308,6 +308,7 @@ namespace uniset
if
(
res
<
0
)
if
(
res
<
0
)
{
{
int
errnum
=
errno
;
int
errnum
=
errno
;
if
(
errnum
!=
EAGAIN
&&
dlog
->
is_warn
()
)
if
(
errnum
!=
EAGAIN
&&
dlog
->
is_warn
()
)
dlog
->
warn
()
<<
peername
<<
"(getNextData): read from socket error("
<<
errnum
<<
"): "
<<
strerror
(
errnum
)
<<
endl
;
dlog
->
warn
()
<<
peername
<<
"(getNextData): read from socket error("
<<
errnum
<<
"): "
<<
strerror
(
errnum
)
<<
endl
;
...
...
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