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

update doc; fix bug in scalarAlarmSupport

Browse Source
This commit is contained in:
mrkraimer
2019-06-19 09:36:52 -04:00
parent 5279e4e739
commit fb4e7f0fc1
4 changed files with 11 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
src/support/scalarAlarmSupport.cpp
View File

@@ -36,7 +36,6 @@ epics::pvData::StructureConstPtr ScalarAlarmSupport::scalarAlarmField()
{
return FieldBuilder::begin()
->setId("scalarAlarm_t")
->add("active", pvBoolean)
->add("lowAlarmLimit", pvDouble)
->add("lowWarningLimit", pvDouble)
->add("highWarningLimit", pvDouble)
@@ -75,7 +74,6 @@ bool ScalarAlarmSupport::init(
}
pvScalarAlarm = static_pointer_cast<PVStructure>(pvsup);
if(pvScalarAlarm) {
pvActive = pvScalarAlarm->getSubField<PVBoolean>("active");
pvLowAlarmLimit = pvScalarAlarm->getSubField<PVDouble>("lowAlarmLimit");
pvLowWarningLimit = pvScalarAlarm->getSubField<PVDouble>("lowWarningLimit");
pvHighWarningLimit = pvScalarAlarm->getSubField<PVDouble>("highWarningLimit");
@@ -83,7 +81,6 @@ bool ScalarAlarmSupport::init(
pvHysteresis = pvScalarAlarm->getSubField<PVDouble>("hysteresis");
}
if(!pvScalarAlarm
|| !pvActive
|| !pvLowAlarmLimit || !pvLowWarningLimit
|| !pvLowWarningLimit || !pvHighAlarmLimit
|| !pvHysteresis)