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

Merge pull request #56 from dhickin/caProvider_status

Browse Source 
Correctly set status in caProvider
This commit is contained in:
Matej Sekoranja
2016-07-19 12:16:05 +02:00
committed by GitHub
parent 4e75078db2 dc61b3a4cd
commit 755759a650
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/ca/caChannel.cpp
View File

@@ -792,7 +792,7 @@ void copy_DBR_GR(const void * dbr, unsigned count, PVStructure::shared_pointer c
if (alarm.get())
{
PVIntPtr status = alarm->getSubField<PVInt>("status");
if (status.get()) status->put(0);
if (status.get()) status->put(dbrStatus2alarmStatus[data->status]);
PVIntPtr severity = alarm->getSubField<PVInt>("severity");
if (severity.get()) severity->put(data->severity);
@@ -856,7 +856,7 @@ void copy_DBR_CTRL(const void * dbr, unsigned count, PVStructure::shared_pointer
if (alarm.get())
{
PVIntPtr status = alarm->getSubField<PVInt>("status");
if (status.get()) status->put(0);
if (status.get()) status->put(dbrStatus2alarmStatus[data->status]);
PVIntPtr severity = alarm->getSubField<PVInt>("severity");
if (severity.get()) severity->put(data->severity);