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
85c1e1c7
Commit
85c1e1c7
authored
Aug 11, 2017
by
Pavel Vainerman
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(SM): немного подправил логи, а также добавил вывод названий таймеров.
parent
21849ef5
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
24 additions
and
2 deletions
+24
-2
SharedMemory.cc
extensions/SharedMemory/SharedMemory.cc
+20
-0
SharedMemory.h
extensions/SharedMemory/SharedMemory.h
+2
-0
IOController.cc
src/Processes/IOController.cc
+2
-2
No files found.
extensions/SharedMemory/SharedMemory.cc
View file @
85c1e1c7
...
...
@@ -225,6 +225,26 @@ namespace uniset
}
}
}
// ------------------------------------------------------------------------------------------
string
SharedMemory
::
getTimerName
(
int
id
)
const
{
if
(
id
==
tmHeartBeatCheck
)
return
"HeartBeatCheckTimer"
;
if
(
id
==
tmEvent
)
return
"EventTimer"
;
if
(
id
==
tmHistory
)
return
"HistoryTimer"
;
if
(
id
==
tmPulsar
)
return
"PulsarTimer"
;
if
(
id
==
tmLastOfTimerID
)
return
"??LastOfTimerID??"
;
return
IONotifyController
::
getTimerName
(
id
);
}
// ------------------------------------------------------------------------------------------
void
SharedMemory
::
sysCommand
(
const
SystemMessage
*
sm
)
...
...
extensions/SharedMemory/SharedMemory.h
View file @
85c1e1c7
...
...
@@ -429,6 +429,8 @@ namespace uniset
virtual
void
sysCommand
(
const
uniset
::
SystemMessage
*
sm
)
override
;
virtual
void
timerInfo
(
const
uniset
::
TimerMessage
*
tm
)
override
;
virtual
void
askSensors
(
UniversalIO
::
UIOCommand
cmd
)
{};
virtual
std
::
string
getTimerName
(
int
id
)
const
override
;
void
sendEvent
(
uniset
::
SystemMessage
&
sm
);
void
initFromReserv
();
bool
initFromSM
(
uniset
::
ObjectId
sm_id
,
uniset
::
ObjectId
sm_node
);
...
...
src/Processes/IOController.cc
View file @
85c1e1c7
...
...
@@ -299,8 +299,8 @@ long IOController::localSetValue( std::shared_ptr<USensorInfo>& usi,
if
(
changed
||
blockChanged
)
{
ulog4
<<
myname
<<
"
: save sensor value
("
<<
usi
->
si
.
id
<<
")"
<<
" name: "
<<
uniset_conf
()
->
oind
->
getNameById
(
usi
->
si
.
id
)
ulog4
<<
myname
<<
"
(localSetValue):
("
<<
usi
->
si
.
id
<<
")"
<<
uniset_conf
()
->
oind
->
getNameById
(
usi
->
si
.
id
)
<<
" newvalue="
<<
value
<<
" value="
<<
usi
->
value
<<
" blocked="
<<
usi
->
blocked
...
...
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