EPICS_base/pvAccess
0
0
Fork 0
Code Issues Pull Requests Projects Wiki Activity

pvput: fix enum_t

Browse Source 
Need to get value.choices
This commit is contained in:
Michael Davidsaver
2018-02-27 14:18:15 -08:00
parent d605eaca11
commit 74fbd22d40
1 changed files with 6 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pvtoolsSrc/pvput.cpp
View File

@ -269,6 +269,8 @@ struct Putter : public pvac::ClientChannel::PutCallback
shared_vector<std::string> jarr;
PVStructure::const_shared_pointer current;
virtual void putBuild(const epics::pvData::StructureConstPtr& build, Args& args)
{
if(debug) std::cerr<<"Server defined structure\n"<<build;
@ -314,7 +316,7 @@ struct Putter : public pvac::ClientChannel::PutCallback
PVStructure* sfld(static_cast<PVStructure*>(fld.get()));
PVScalar* idxfld(sfld->getSubFieldT<PVScalar>("index").get());
PVStringArray::const_svector choices(sfld->getSubFieldT<PVStringArray>("choices")->view());
PVStringArray::const_svector choices(current->getSubFieldT<PVStringArray>("value.choices")->view());
bool found=false;
for(size_t i=0; i<choices.size(); i++) {
@ -616,9 +618,11 @@ int main (int argc, char *argv[])
pvac::ClientChannel chan(ctxt.connect(pvName));
thework.current = chan.get(timeOut, pvRequest);
if (mode != TerseMode && !quiet) {
std::cout << "Old : ";
printValue(pvName, chan.get(timeOut, pvRequest));
printValue(pvName, thework.current);
}
{