Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
ControlSystemAdapter-DoocsAdapter
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package Registry
Container Registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
ChimeraTK Mirror
ControlSystemAdapter-DoocsAdapter
Commits
d9179cf9
Commit
d9179cf9
authored
4 years ago
by
vargheseg
Browse files
Options
Downloads
Patches
Plain Diff
Added zmq support for DoocsIfff
parent
b9d4f6e2
No related branches found
Branches containing commit
No related tags found
Tags containing commit
No related merge requests found
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
include/DoocsIfff.h
+2
-0
2 additions, 0 deletions
include/DoocsIfff.h
src/DoocsIfff.cc
+19
-3
19 additions, 3 deletions
src/DoocsIfff.cc
with
21 additions
and
3 deletions
include/DoocsIfff.h
+
2
−
0
View file @
d9179cf9
...
...
@@ -31,6 +31,7 @@ namespace ChimeraTK {
void
auto_init
(
void
)
override
;
void
setMacroPulseNumberSource
(
boost
::
shared_ptr
<
ChimeraTK
::
NDRegisterAccessor
<
int64_t
>>
macroPulseNumberSource
);
void
publishZeroMQ
()
{
_publishZMQ
=
true
;
}
DataConsistencyGroup
_consistencyGroup
;
protected
:
...
...
@@ -45,6 +46,7 @@ namespace ChimeraTK {
boost
::
shared_ptr
<
NDRegisterAccessor
<
float
>>
_f3Value
;
DoocsUpdater
&
_updater
;
EqFct
*
_eqFct
;
bool
_publishZMQ
{
false
};
bool
isWriteable
;
boost
::
shared_ptr
<
ChimeraTK
::
NDRegisterAccessor
<
int64_t
>>
_macroPulseNumberSource
;
...
...
This diff is collapsed.
Click to expand it.
src/DoocsIfff.cc
+
19
−
3
View file @
d9179cf9
...
...
@@ -60,9 +60,7 @@ namespace ChimeraTK {
ifff
.
f3_data
=
_f3Value
->
accessData
(
0
);
doocs
::
Timestamp
timestamp
(
_i1Value
->
getVersionNumber
().
getTime
());
auto
sinceEpoch
=
timestamp
.
get_seconds_and_microseconds_since_epoch
();
auto
seconds
=
sinceEpoch
.
seconds
;
auto
microseconds
=
sinceEpoch
.
microseconds
;
// update global time stamp of DOOCS, but only if our time stamp is newer
if
(
get_global_timestamp
()
<
timestamp
)
{
set_global_timestamp
(
timestamp
);
...
...
@@ -82,8 +80,26 @@ namespace ChimeraTK {
this
->
set_value
(
&
ifff
);
}
auto
sinceEpoch
=
timestamp
.
get_seconds_and_microseconds_since_epoch
();
auto
seconds
=
sinceEpoch
.
seconds
;
auto
microseconds
=
sinceEpoch
.
microseconds
;
this
->
set_tmstmp
(
seconds
,
microseconds
);
if
(
_macroPulseNumberSource
)
this
->
set_mpnum
(
_macroPulseNumberSource
->
accessData
(
0
));
if
(
_publishZMQ
)
{
dmsg_info
info
;
memset
(
&
info
,
0
,
sizeof
(
info
));
info
.
sec
=
seconds
;
info
.
usec
=
microseconds
;
if
(
_macroPulseNumberSource
!=
nullptr
)
{
info
.
ident
=
_macroPulseNumberSource
->
accessData
(
0
);
}
else
{
info
.
ident
=
0
;
}
this
->
send
(
&
info
);
}
}
void
DoocsIfff
::
set
(
EqAdr
*
eqAdr
,
EqData
*
data1
,
EqData
*
data2
,
EqFct
*
eqFct
)
{
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
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!
Save comment
Cancel
Please
register
or
sign in
to comment