Commit 6062552c authored by Andrea Petrucci's avatar Andrea Petrucci
Browse files

references #283: first implementation

parent b1824b68
...@@ -61,6 +61,7 @@ namespace MetaData ...@@ -61,6 +61,7 @@ namespace MetaData
{ {
uint64_t timeStamp; uint64_t timeStamp;
uint32_t highVoltageReady; uint32_t highVoltageReady;
uint32_t highVoltageValid;
float magnetCurrent; float magnetCurrent;
DCS(); DCS();
...@@ -81,7 +82,7 @@ namespace MetaData ...@@ -81,7 +82,7 @@ namespace MetaData
bool operator!=(const Data& other); bool operator!=(const Data& other);
}; };
const uint8_t version = 2; const uint8_t version = 3;
const size_t dataSize = sizeof(Data); const size_t dataSize = sizeof(Data);
} //namespace MetaData } //namespace MetaData
......
...@@ -5,8 +5,8 @@ ...@@ -5,8 +5,8 @@
#define WORKSUITE_EVB_VERSION_MAJOR 6 #define WORKSUITE_EVB_VERSION_MAJOR 6
#define WORKSUITE_EVB_VERSION_MINOR 9 #define WORKSUITE_EVB_VERSION_MINOR 9
#define WORKSUITE_EVB_VERSION_PATCH 6 #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" #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) #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 #ifndef WORKSUITE_EVB_PREVIOUS_VERSIONS
......
...@@ -392,6 +392,7 @@ void evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage(toolbox::mem::R ...@@ -392,6 +392,7 @@ void evb::readoutunit::MetaDataRetrieverDIPBridge::handleMessage(toolbox::mem::R
p = table.getValueAt(0, "__DIP_DEFAULT__"); p = table.getValueAt(0, "__DIP_DEFAULT__");
const std::string state = dynamic_cast<xdata::String*>(p)->value_; const std::string state = dynamic_cast<xdata::String*>(p)->value_;
lastDCS_.highVoltageValid |= (1 << pos);
if ( state == "ON" || state == "READY" ) if ( state == "ON" || state == "READY" )
lastDCS_.highVoltageReady |= (1 << pos); lastDCS_.highVoltageReady |= (1 << pos);
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment