WIP
This commit is contained in:
@@ -19,16 +19,15 @@
|
||||
#include "ecmcDataItem.h"
|
||||
|
||||
/* Class to store data channels */
|
||||
class ecmcDataChannel {
|
||||
class ecmcDAQDataChannel {
|
||||
public:
|
||||
ecmcDataChannel(char* name, int formatAsTime) {
|
||||
ecmcDAQDataChannel(char* name, int formatAsTime) {
|
||||
dataItem_ = NULL;
|
||||
dataItemInfo_ = NULL;
|
||||
name_ = name;
|
||||
timeFormat_ = formatAsTime;
|
||||
}
|
||||
|
||||
void connectToSource() {
|
||||
void connectToSources() {
|
||||
// Get data item for
|
||||
dataItem_ = (ecmcDataItem*) getEcmcDataItem(name_.c_str());
|
||||
if(!dataItem_) {
|
||||
@@ -49,7 +48,7 @@ class ecmcDataChannel {
|
||||
int timeFormat_;
|
||||
};
|
||||
|
||||
/* Class to fromat an array of ecmcDataChannels with headers and push over asyn to epics */
|
||||
/* Class to fromat an array of ecmcDAQDataChannels with headers and push over asyn to epics */
|
||||
class ecmcDAQDataArray {
|
||||
public:
|
||||
ecmcDAQDataArray(size_t nelm);
|
||||
@@ -60,7 +59,7 @@ class ecmcDAQDataArray {
|
||||
|
||||
private:
|
||||
double *buffer_;
|
||||
std::vector<ecmcDataChannel*> dataChannels_;
|
||||
std::vector<ecmcDAQDataChannel*> dataChannels_;
|
||||
size_t channelCounter_;
|
||||
};
|
||||
|
||||
|
||||
Reference in New Issue
Block a user