From dc61b3a4cdf740b82611035fce9eca30097b6265 Mon Sep 17 00:00:00 2001 From: Dave Hickin Date: Mon, 18 Jul 2016 15:26:17 +0100 Subject: [PATCH] Correctly set status in caProvider --- src/ca/caChannel.cpp | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/src/ca/caChannel.cpp b/src/ca/caChannel.cpp index 874d614..6341ff9 100644 --- a/src/ca/caChannel.cpp +++ b/src/ca/caChannel.cpp @@ -792,7 +792,7 @@ void copy_DBR_GR(const void * dbr, unsigned count, PVStructure::shared_pointer c if (alarm.get()) { PVIntPtr status = alarm->getSubField("status"); - if (status.get()) status->put(0); + if (status.get()) status->put(dbrStatus2alarmStatus[data->status]); PVIntPtr severity = alarm->getSubField("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("status"); - if (status.get()) status->put(0); + if (status.get()) status->put(dbrStatus2alarmStatus[data->status]); PVIntPtr severity = alarm->getSubField("severity"); if (severity.get()) severity->put(data->severity);