Merge pull request #82 from juanfem/issue_81

Adding feature to CA provider to be able to do "valueAlarm" requests.

Author: shroffk

pvAccessJava/src/org/epics/ca/BaseV3Channel.java

@@ -381,7 +381,7 @@ else if(!subField.equals("value")) {
             }
         }
         String properties = "timeStamp,alarm";
-        if(extraProperties) properties += ",display,control";
+        if(extraProperties) properties += ",display,control,valueAlarm";
         Structure structure =  null;
         switch(valueType) {
         case scalar:

pvAccessJava/src/org/epics/ca/BaseV3ChannelStructure.java

@@ -166,6 +166,9 @@ public PVStructure createPVStructure(PVStructure pvRequest,boolean propertiesAll
             if(nativeDBRType!=DBRType.ENUM) {
                 propertyList.add("display");
                 propertyList.add("control");
+                if (nativeDBRType != DBRType.STRING) {
+                    propertyList.add("valueAlarm");
+                }
             }
         }
         for(int indField = 0; indField<pvFields.length; indField++) {
@@ -186,6 +189,10 @@ public PVStructure createPVStructure(PVStructure pvRequest,boolean propertiesAll
                 if(propertiesAllowed && nativeDBRType!=DBRType.ENUM) propertyList.add("control");
                 continue;
             }
+            if(pvField.getFieldName().equals("valueAlarm")) {
+                if(propertiesAllowed && nativeDBRType!=DBRType.STRING && nativeDBRType!=DBRType.ENUM) propertyList.add("valueAlarm");
+                continue;
+            }
             if(!pvField.getFieldName().equals("value")) {
                 String message = pvField.toString() + " name not suported";
                 v3Channel.message(message, MessageType.error);
@@ -241,6 +248,10 @@ public PVStructure createPVStructure(PVStructure pvRequest,boolean propertiesAll
                     dbrProperty = DBRProperty.control;
                     continue;
                 }
+                if(propertyName.equals("valueAlarm")&& (dbrProperty.compareTo(DBRProperty.control)<0)) {
+                    dbrProperty = DBRProperty.control;
+                    continue;
+                }
             }
         }
         Type type = Type.scalar;
@@ -452,6 +463,12 @@ public void toStructure(DBR fromDBR) {
         double displayHigh = 0.0;
         double controlLow = 0.0;
         double controlHigh = 0.0;
+       
+        double lowAlarmLimit = 0.0;
+        double lowWarningLimit = 0.0;
+        double highWarningLimit = 0.0;
+        double highAlarmLimit = 0.0;
+
         String units = null;
         bitSet.clear();
         DBRType requestDBRType = fromDBR.getType();
@@ -678,6 +695,12 @@ public void toStructure(DBR fromDBR) {
                 displayHigh = dbr.getUpperDispLimit().doubleValue();
                 controlLow = dbr.getLowerCtrlLimit().doubleValue();
                 controlHigh = dbr.getUpperCtrlLimit().doubleValue();
+
+                lowAlarmLimit = dbr.getLowerAlarmLimit().doubleValue();
+                lowWarningLimit = dbr.getLowerWarningLimit().doubleValue();
+                highWarningLimit = dbr.getUpperWarningLimit().doubleValue();
+                highAlarmLimit = dbr.getUpperAlarmLimit().doubleValue();
+
                 if(elementCount==1) {
                     convert.fromByte(pvScalarValue, dbr.getByteValue()[0]);
                 } else {
@@ -719,7 +742,13 @@ public void toStructure(DBR fromDBR) {
                 displayLow = dbr.getLowerDispLimit().doubleValue();
                 displayHigh = dbr.getUpperDispLimit().doubleValue();
                 controlLow = dbr.getLowerCtrlLimit().doubleValue();
-                controlHigh = dbr.getUpperCtrlLimit().doubleValue();
+                controlHigh = dbr.getUpperCtrlLimit().doubleValue();                
+
+                lowAlarmLimit = dbr.getLowerAlarmLimit().doubleValue();
+                lowWarningLimit = dbr.getLowerWarningLimit().doubleValue();
+                highWarningLimit = dbr.getUpperWarningLimit().doubleValue();
+                highAlarmLimit = dbr.getUpperAlarmLimit().doubleValue();
+                
                 if(elementCount==1) {
                     convert.fromShort(pvScalarValue, dbr.getShortValue()[0]);
                 } else {
@@ -761,7 +790,13 @@ public void toStructure(DBR fromDBR) {
                 displayLow = dbr.getLowerDispLimit().doubleValue();
                 displayHigh = dbr.getUpperDispLimit().doubleValue();
                 controlLow = dbr.getLowerCtrlLimit().doubleValue();
-                controlHigh = dbr.getUpperCtrlLimit().doubleValue();
+                controlHigh = dbr.getUpperCtrlLimit().doubleValue();                
+
+                lowAlarmLimit = dbr.getLowerAlarmLimit().doubleValue();
+                lowWarningLimit = dbr.getLowerWarningLimit().doubleValue();
+                highWarningLimit = dbr.getUpperWarningLimit().doubleValue();
+                highAlarmLimit = dbr.getUpperAlarmLimit().doubleValue();
+                
                 if(elementCount==1) {
                     convert.fromInt(pvScalarValue, dbr.getIntValue()[0]);
                 } else {
@@ -803,7 +838,13 @@ public void toStructure(DBR fromDBR) {
                 displayLow = dbr.getLowerDispLimit().doubleValue();
                 displayHigh = dbr.getUpperDispLimit().doubleValue();
                 controlLow = dbr.getLowerCtrlLimit().doubleValue();
-                controlHigh = dbr.getUpperCtrlLimit().doubleValue();
+                controlHigh = dbr.getUpperCtrlLimit().doubleValue();                
+
+                lowAlarmLimit = dbr.getLowerAlarmLimit().doubleValue();
+                lowWarningLimit = dbr.getLowerWarningLimit().doubleValue();
+                highWarningLimit = dbr.getUpperWarningLimit().doubleValue();
+                highAlarmLimit = dbr.getUpperAlarmLimit().doubleValue();
+                
                 if(elementCount==1) {
                     convert.fromFloat(pvScalarValue, dbr.getFloatValue()[0]);
                 } else {
@@ -846,6 +887,12 @@ public void toStructure(DBR fromDBR) {
                 displayHigh = dbr.getUpperDispLimit().doubleValue();
                 controlLow = dbr.getLowerCtrlLimit().doubleValue();
                 controlHigh = dbr.getUpperCtrlLimit().doubleValue();
+
+                lowAlarmLimit = dbr.getLowerAlarmLimit().doubleValue();
+                lowWarningLimit = dbr.getLowerWarningLimit().doubleValue();
+                highWarningLimit = dbr.getUpperWarningLimit().doubleValue();
+                highAlarmLimit = dbr.getUpperAlarmLimit().doubleValue();
+                
                 if(elementCount==1) {
                     convert.fromDouble(pvScalarValue, dbr.getDoubleValue()[0]);
                 } else {
@@ -939,6 +986,25 @@ public void toStructure(DBR fromDBR) {
                 }
             }
         }
+
+        if (lowAlarmLimit < highAlarmLimit || lowWarningLimit < highWarningLimit) {
+            pvStructure = this.pvStructure.getStructureField("valueAlarm");
+            if (pvStructure != null) {
+                PVDouble pvLowWarning = pvStructure.getDoubleField("lowWarningLimit");
+                PVDouble pvHighWarning = pvStructure.getDoubleField("highWarningLimit");
+                if (pvLowWarning != null && pvHighWarning != null) {
+                    pvLowWarning.put(lowWarningLimit);
+                    pvHighWarning.put(highWarningLimit);
+                }
+                PVDouble pvLowAlarm = pvStructure.getDoubleField("lowAlarmLimit");
+                PVDouble pvHighAlarm = pvStructure.getDoubleField("highAlarmLimit");
+                if (pvLowAlarm != null && pvHighAlarm != null) {
+                    pvLowAlarm.put(lowAlarmLimit);
+                    pvHighAlarm.put(highAlarmLimit);
+                }
+            }
+        }
+        
         if(firstGetPVStructure.getAndSet(false)) {
             bitSet.clear();
             bitSet.set(0);