Skip to content
GitLab
Menu
Projects
Groups
Snippets
Loading...
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Sign in
Toggle navigation
Menu
Open sidebar
cmsos
worksuite
Commits
6062552c
Commit
6062552c
authored
Nov 30, 2021
by
Andrea Petrucci
Browse files
references
#283
: first implementation
parent
b1824b68
Changes
3
Hide whitespace changes
Inline
Side-by-side
evb/include/evb/readoutunit/MetaData.h
View file @
6062552c
...
...
@@ -61,6 +61,7 @@ namespace MetaData
{
uint64_t
timeStamp
;
uint32_t
highVoltageReady
;
uint32_t
highVoltageValid
;
float
magnetCurrent
;
DCS
();
...
...
@@ -81,7 +82,7 @@ namespace MetaData
bool
operator
!=
(
const
Data
&
other
);
};
const
uint8_t
version
=
2
;
const
uint8_t
version
=
3
;
const
size_t
dataSize
=
sizeof
(
Data
);
}
//namespace MetaData
...
...
evb/include/evb/version.h
View file @
6062552c
...
...
@@ -5,8 +5,8 @@
#define WORKSUITE_EVB_VERSION_MAJOR 6
#define WORKSUITE_EVB_VERSION_MINOR 9
#define WORKSUITE_EVB_VERSION_PATCH
6
#define WORKSUITE_EVB_PREVIOUS_VERSIONS "6.5.0,6.5.1,6.5.2,6.6.0,6.6.1,6.7.0,6.7.1,6.8.0,6.8.1,6.8.2,6.9.0,6.9.1,6.9.2,6.9.3,6.9.4,6.9.5"
#define WORKSUITE_EVB_VERSION_PATCH
7
#define WORKSUITE_EVB_PREVIOUS_VERSIONS "6.5.0,6.5.1,6.5.2,6.6.0,6.6.1,6.7.0,6.7.1,6.8.0,6.8.1,6.8.2,6.9.0,6.9.1,6.9.2,6.9.3,6.9.4,6.9.5
,6.9.6
"
#define WORKSUITE_EVB_VERSION_CODE PACKAGE_VERSION_CODE(WORKSUITE_EVB_VERSION_MAJOR,WORKSUITE_EVB_VERSION_MINOR,WORKSUITE_EVB_VERSION_PATCH)
#ifndef WORKSUITE_EVB_PREVIOUS_VERSIONS
...
...
evb/src/common/readoutunit/MetaDataRetrieverDIPBridge.cc
View file @
6062552c
...
...
@@ -392,6 +392,7 @@ void evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage(toolbox::mem::R
p
=
table
.
getValueAt
(
0
,
"__DIP_DEFAULT__"
);
const
std
::
string
state
=
dynamic_cast
<
xdata
::
String
*>
(
p
)
->
value_
;
lastDCS_
.
highVoltageValid
|=
(
1
<<
pos
);
if
(
state
==
"ON"
||
state
==
"READY"
)
lastDCS_
.
highVoltageReady
|=
(
1
<<
pos
);
...
...
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