Commit f58c5db9 authored by Jean-Luc Pons's avatar Jean-Luc Pons

Added type

parent 4a5b6596
......@@ -653,6 +653,9 @@ void AttributeCombiner::read_dyn_attributes(Tango::Attribute &attr, DynAttribute
case Tango::DEV_LONG64:
READG(attr,item->lVal64,item,arl);
break;
case Tango::DEV_ULONG64:
READG(attr,item->ulVal64,item,arl);
break;
case Tango::DEV_DOUBLE:
READG(attr,item->dVal,item,arl);
break;
......@@ -702,27 +705,26 @@ void AttributeCombiner::write_dyn_attributes(Tango::WAttribute &attr, DynAttribu
case Tango::DEV_SHORT:
WRITEG<Tango::DevShort>(attr,item,arl);
//WRITEG(Tango::DevShort);
break;
case Tango::DEV_LONG:
WRITEG<Tango::DevLong>(attr,item,arl);
//WRITEG(Tango::DevLong);
break;
case Tango::DEV_LONG64:
WRITEG<Tango::DevLong64>(attr,item,arl);
//WRITEG(Tango::DevLong64);
break;
case Tango::DEV_ULONG:
WRITEG<Tango::DevULong>(attr,item,arl);
//WRITEG(Tango::DevULong);
break;
case Tango::DEV_ULONG64:
WRITEG<Tango::DevULong64>(attr,item,arl);
break;
case Tango::DEV_DOUBLE:
WRITEG<Tango::DevDouble>(attr,item,arl);
//WRITEG(Tango::DevDouble);
break;
}
......@@ -901,6 +903,13 @@ void AttributeCombiner::read_dynspec_attributes(Tango::Attribute &attr,DynSpectr
READSCALAR<Tango::DevLong64, Tango::DevDouble>(attr,item,arl,NAN,NAN);
break;
case Tango::DEV_ULONG64:
if(item->isSpectrum)
READSPECTRUM<Tango::DevULong64>(attr,item,arl);
else
READSCALAR<Tango::DevULong64, Tango::DevDouble>(attr,item,arl,NAN,NAN);
break;
case Tango::DEV_STATE:
if(item->isSpectrum)
READSPECTRUM<Tango::DevState>(attr,item,arl);
......@@ -990,10 +999,18 @@ void AttributeCombiner::write_dynspec_attributes(Tango::WAttribute &attr,DynSpec
WRITES<Tango::DevDouble,Tango::DevLong>(attr,item,arl);
break;
case Tango::DEV_ULONG:
WRITES<Tango::DevDouble,Tango::DevULong>(attr,item,arl);
break;
case Tango::DEV_LONG64:
WRITES<Tango::DevDouble,Tango::DevLong64>(attr,item,arl);
break;
case Tango::DEV_ULONG64:
WRITES<Tango::DevDouble,Tango::DevULong64>(attr,item,arl);
break;
case Tango::DEV_STATE:
WRITES<Tango::DevState,Tango::DevState>(attr,item,arl);
break;
......@@ -1098,6 +1115,8 @@ int AttributeCombiner::ToTangoType(string name,string type) {
return Tango::DEV_SHORT;
} else if ( type.compare("DevULong")==0 ) {
return Tango::DEV_ULONG;
} else if ( type.compare("DevULong64")==0 ) {
return Tango::DEV_ULONG64;
} else if ( type.compare("DevDouble")==0 ) {
return Tango::DEV_DOUBLE;
} else {
......
......@@ -51,8 +51,9 @@ typedef struct _ATTITEM {
Tango::DevBoolean bVal;
Tango::DevShort sVal;
Tango::DevLong lVal;
Tango::DevULong ulVal;
Tango::DevLong64 lVal64;
Tango::DevULong ulVal;
Tango::DevULong64 ulVal64;
Tango::DevDouble dVal;
// Reference data
......
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