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

drop display.format

Browse Source
This commit is contained in:
Michael Davidsaver
2019-02-13 21:06:49 -08:00
parent 37cb765ed5
commit 5b14bbef5a
2 changed files with 4 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
src/ca/dbdToPv.cpp
View File

@ -718,8 +718,10 @@ Status DbdToPv::getFromDBD(
if(caDisplay.format!=format) {
caDisplay.format = format;
PVStringPtr pvString = pvDisplay->getSubField<PVString>("format");
pvString->put(format);
bitSet->set(pvString->getFieldOffset());
if(pvString) {
pvString->put(format);
bitSet->set(pvString->getFieldOffset());
}
}
}
if(valueAlarmRequested) {

1
testApp/remote/testServer.cpp
View File

@ -2204,7 +2204,6 @@ protected:
displayStructure->getSubField<PVDouble>("limitLow")->put(-1.0);
displayStructure->getSubField<PVDouble>("limitHigh")->put(1.0);
displayStructure->getSubField<PVString>("description")->put("Simulated ADC");
displayStructure->getSubField<PVString>("format")->put("%f");
displayStructure->getSubField<PVString>("units")->put("V");
}
else if (m_name.find("testRPC") == 0 || m_name == "testNTTable" || m_name == "testNTMatrix")