*** empty log message ***

diff --git a/allParam/ca/server/paramBlobRecord.cc b/allParam/ca/server/paramBlobRecord.cc
index 446b99ea1aea19db3048f06e7a8c78cb13fbc78a..163d5cff7d2f34dea1bb9d5d67eda0e254231f26 100644 (file)
--- a/allParam/ca/server/paramBlobRecord.cc
+++ b/allParam/ca/server/paramBlobRecord.cc
@@ -30,11 +30,16 @@ ParamBlobRecord::ParamBlobRecord(caServer& cas, const Param *p, const char *rn,
        funcTable.installReadFunc("units", &Record::readUnits);
        funcTable.installReadFunc("status", &Record::readStatus);
        funcTable.installReadFunc("severity", &Record::readSeverity);
-
-       funcTable.installReadFunc("controlLow", &ParamRecord::readLowCtrl);
-       funcTable.installReadFunc("controlHigh", &ParamRecord::readHighCtrl);
-       funcTable.installReadFunc("graphicLow", &ParamRecord::readLopr);
-       funcTable.installReadFunc("graphicHigh", &ParamRecord::readHopr);
+       funcTable.installReadFunc("seconds", &Record::readSeconds);
+
+       funcTable.installReadFunc("alarmLow", &ParamRecord::readAlarmLow);
+       funcTable.installReadFunc("alarmHigh", &ParamRecord::readAlarmHigh);
+       funcTable.installReadFunc("alarmLowWarning", &ParamRecord::readAlarmLowWarning);
+       funcTable.installReadFunc("alarmHighWarning", &ParamRecord::readAlarmHighWarning);
+       funcTable.installReadFunc("graphicLow", &ParamRecord::readGraphicLow);
+       funcTable.installReadFunc("graphicHigh", &ParamRecord::readGraphicHigh);
+       funcTable.installReadFunc("controlLow", &ParamRecord::readControlLow);
+       funcTable.installReadFunc("controlHigh", &ParamRecord::readControlHigh);
        funcTable.installReadFunc("precision", &ParamRecord::readPrecision);
 
        funcTable.installReadFunc("value", &ParamBlobRecord::readValue);

diff --git a/allParam/ca/server/paramFilenameRecord.cc b/allParam/ca/server/paramFilenameRecord.cc
index b4e27b3cb472eade873472c4d09086b9d083df6a..7fb100517ebbc594e05ac9a54739c118f555c2d8 100644 (file)
--- a/allParam/ca/server/paramFilenameRecord.cc
+++ b/allParam/ca/server/paramFilenameRecord.cc
@@ -29,11 +29,16 @@ ParamFilenameRecord::ParamFilenameRecord(caServer& cas, const Param *p, const ch
        funcTable.installReadFunc("units", &Record::readUnits);
        funcTable.installReadFunc("status", &Record::readStatus);
        funcTable.installReadFunc("severity", &Record::readSeverity);
-
-       funcTable.installReadFunc("controlLow", &ParamRecord::readLowCtrl);
-       funcTable.installReadFunc("controlHigh", &ParamRecord::readHighCtrl);
-       funcTable.installReadFunc("graphicLow", &ParamRecord::readLopr);
-       funcTable.installReadFunc("graphicHigh", &ParamRecord::readHopr);
+       funcTable.installReadFunc("seconds", &Record::readSeconds);
+
+       funcTable.installReadFunc("alarmLow", &ParamRecord::readAlarmLow);
+       funcTable.installReadFunc("alarmHigh", &ParamRecord::readAlarmHigh);
+       funcTable.installReadFunc("alarmLowWarning", &ParamRecord::readAlarmLowWarning);
+       funcTable.installReadFunc("alarmHighWarning", &ParamRecord::readAlarmHighWarning);
+       funcTable.installReadFunc("graphicLow", &ParamRecord::readGraphicLow);
+       funcTable.installReadFunc("graphicHigh", &ParamRecord::readGraphicHigh);
+       funcTable.installReadFunc("controlLow", &ParamRecord::readControlLow);
+       funcTable.installReadFunc("controlHigh", &ParamRecord::readControlHigh);
        funcTable.installReadFunc("precision", &ParamRecord::readPrecision);
 
        funcTable.installReadFunc("value", &ParamFilenameRecord::readValue);

diff --git a/allParam/ca/server/paramIntRecord.cc b/allParam/ca/server/paramIntRecord.cc
index bbb077aa329ec65cba38ddae4742fd09eee8ee5d..ef06adc8c51842084a08eb380569bbf95bdc75b8 100644 (file)
--- a/allParam/ca/server/paramIntRecord.cc
+++ b/allParam/ca/server/paramIntRecord.cc
@@ -26,11 +26,16 @@ ParamIntRecord::ParamIntRecord(caServer& cas, const Param *p, const char *rn, co
        funcTable.installReadFunc("units", &Record::readUnits);
        funcTable.installReadFunc("status", &Record::readStatus);
        funcTable.installReadFunc("severity", &Record::readSeverity);
-
-       funcTable.installReadFunc("controlLow", &ParamRecord::readLowCtrl);
-       funcTable.installReadFunc("controlHigh", &ParamRecord::readHighCtrl);
-       funcTable.installReadFunc("graphicLow", &ParamRecord::readLopr);
-       funcTable.installReadFunc("graphicHigh", &ParamRecord::readHopr);
+       funcTable.installReadFunc("seconds", &Record::readSeconds);
+
+       funcTable.installReadFunc("alarmLow", &ParamRecord::readAlarmLow);
+       funcTable.installReadFunc("alarmHigh", &ParamRecord::readAlarmHigh);
+       funcTable.installReadFunc("alarmLowWarning", &ParamRecord::readAlarmLowWarning);
+       funcTable.installReadFunc("alarmHighWarning", &ParamRecord::readAlarmHighWarning);
+       funcTable.installReadFunc("graphicLow", &ParamRecord::readGraphicLow);
+       funcTable.installReadFunc("graphicHigh", &ParamRecord::readGraphicHigh);
+       funcTable.installReadFunc("controlLow", &ParamRecord::readControlLow);
+       funcTable.installReadFunc("controlHigh", &ParamRecord::readControlHigh);
        funcTable.installReadFunc("precision", &ParamRecord::readPrecision);
 
        funcTable.installReadFunc("value", &ParamIntRecord::readValue);

diff --git a/allParam/ca/server/paramRecord.cc b/allParam/ca/server/paramRecord.cc
index e229d9d8d47b85ddea9e05b4a63b145ea566235d..ad4861a3701e485172cdcff02c1c798dfcdda30a 100644 (file)
--- a/allParam/ca/server/paramRecord.cc
+++ b/allParam/ca/server/paramRecord.cc
@@ -47,25 +47,49 @@ const char *ParamRecord::getPVName()
        return pPVName;
 }
 
-gddAppFuncTableStatus ParamRecord::readLowCtrl(gdd &value)
+gddAppFuncTableStatus ParamRecord::readAlarmLow(gdd &value)
 {
        value.putConvert(0);
        return S_casApp_success;
 }
 
-gddAppFuncTableStatus ParamRecord::readHighCtrl(gdd &value)
+gddAppFuncTableStatus ParamRecord::readAlarmHigh(gdd &value)
 {
        value.putConvert(0);
        return S_casApp_success;
 }
 
-gddAppFuncTableStatus ParamRecord::readLopr(gdd &value)
+gddAppFuncTableStatus ParamRecord::readAlarmLowWarning(gdd &value)
 {
        value.putConvert(0);
        return S_casApp_success;
 }
 
-gddAppFuncTableStatus ParamRecord::readHopr(gdd &value)
+gddAppFuncTableStatus ParamRecord::readAlarmHighWarning(gdd &value)
+{
+       value.putConvert(0);
+       return S_casApp_success;
+}
+
+gddAppFuncTableStatus ParamRecord::readGraphicLow(gdd &value)
+{
+       value.putConvert(0);
+       return S_casApp_success;
+}
+
+gddAppFuncTableStatus ParamRecord::readGraphicHigh(gdd &value)
+{
+       value.putConvert(0);
+       return S_casApp_success;
+}
+
+gddAppFuncTableStatus ParamRecord::readControlLow(gdd &value)
+{
+       value.putConvert(0);
+       return S_casApp_success;
+}
+
+gddAppFuncTableStatus ParamRecord::readControlHigh(gdd &value)
 {
        value.putConvert(0);
        return S_casApp_success;

diff --git a/allParam/ca/server/paramRecord.h b/allParam/ca/server/paramRecord.h
index 5a37f56416ac64bb7b12d3a7b620029c266ee134..bd28362267b6db86a20f46388b4a826a87c4d8fc 100644 (file)
--- a/allParam/ca/server/paramRecord.h
+++ b/allParam/ca/server/paramRecord.h
@@ -24,10 +24,14 @@ class ParamRecord : public Record {
 
        const char *getPVName();
 
-       virtual gddAppFuncTableStatus readLowCtrl(gdd &);
-       virtual gddAppFuncTableStatus readHighCtrl(gdd &);
-       virtual gddAppFuncTableStatus readLopr(gdd &);
-       virtual gddAppFuncTableStatus readHopr(gdd &);
+       virtual gddAppFuncTableStatus readAlarmLow(gdd &);
+       virtual gddAppFuncTableStatus readAlarmHigh(gdd &);
+       virtual gddAppFuncTableStatus readAlarmLowWarning(gdd &);
+       virtual gddAppFuncTableStatus readAlarmHighWarning(gdd &);
+       virtual gddAppFuncTableStatus readGraphicLow(gdd &);
+       virtual gddAppFuncTableStatus readGraphicHigh(gdd &);
+       virtual gddAppFuncTableStatus readControlLow(gdd &);
+       virtual gddAppFuncTableStatus readControlHigh(gdd &);
        virtual gddAppFuncTableStatus readPrecision(gdd &);
 
        virtual gddAppFuncTableStatus readValue(gdd &) = 0;

diff --git a/allParam/ca/server/paramStringRecord.cc b/allParam/ca/server/paramStringRecord.cc
index a8a738eb0bdef2dda7c92fa8207d79e535abf767..cfee87a13d92959ba4a4cf73abbd9572cb233876 100644 (file)
--- a/allParam/ca/server/paramStringRecord.cc
+++ b/allParam/ca/server/paramStringRecord.cc
@@ -29,11 +29,16 @@ ParamStringRecord::ParamStringRecord(caServer& cas, const Param *p, const char *
        funcTable.installReadFunc("units", &Record::readUnits);
        funcTable.installReadFunc("status", &Record::readStatus);
        funcTable.installReadFunc("severity", &Record::readSeverity);
-
-       funcTable.installReadFunc("controlLow", &ParamRecord::readLowCtrl);
-       funcTable.installReadFunc("controlHigh", &ParamRecord::readHighCtrl);
-       funcTable.installReadFunc("graphicLow", &ParamRecord::readLopr);
-       funcTable.installReadFunc("graphicHigh", &ParamRecord::readHopr);
+       funcTable.installReadFunc("seconds", &Record::readSeconds);
+
+       funcTable.installReadFunc("alarmLow", &ParamRecord::readAlarmLow);
+       funcTable.installReadFunc("alarmHigh", &ParamRecord::readAlarmHigh);
+       funcTable.installReadFunc("alarmLowWarning", &ParamRecord::readAlarmLowWarning);
+       funcTable.installReadFunc("alarmHighWarning", &ParamRecord::readAlarmHighWarning);
+       funcTable.installReadFunc("graphicLow", &ParamRecord::readGraphicLow);
+       funcTable.installReadFunc("graphicHigh", &ParamRecord::readGraphicHigh);
+       funcTable.installReadFunc("controlLow", &ParamRecord::readControlLow);
+       funcTable.installReadFunc("controlHigh", &ParamRecord::readControlHigh);
        funcTable.installReadFunc("precision", &ParamRecord::readPrecision);
 
        funcTable.installReadFunc("value", &ParamStringRecord::readValue);

diff --git a/allParam/ca/server/record.cc b/allParam/ca/server/record.cc
index 51ca0a37235a7bd34162f9d72b31ca45041f4df5..b634b5b8f891743cd488a6b0e77abc9a7205cd38 100644 (file)
--- a/allParam/ca/server/record.cc
+++ b/allParam/ca/server/record.cc
@@ -1,7 +1,11 @@
+static const char rcsId[] = "$Header: /misc/hadesprojects/daq/cvsroot/eventbuilder/allParam/ca/server/record.cc,v 1.3 2002-05-20 15:11:15 hadaq Exp $";
 #define _POSIX_C_SOURCE 199509L
 
 extern "C" {
+  #include <unistd.h>
+
   #include <string.h>
+  #include <time.h>
 }
 
 #include "record.h"
@@ -62,6 +66,13 @@ gddAppFuncTableStatus Record::readSeverity(gdd &value) {
        return S_casApp_success;
 }
 
+gddAppFuncTableStatus Record::readSeconds(gdd &value) {
+       time_t now;
+       now = time(NULL);
+       value.putConvert((aitUint32) now);
+       return S_casApp_success;
+}
+
 /***********************
  * scanTimer Functions *
  ***********************/

diff --git a/allParam/ca/server/record.h b/allParam/ca/server/record.h
index 80351133aa1a7d8fe8aba8f22e8ea39d2f7aeffa..b82d9ba7912002eb321a80bb1b718d652fab7446 100644 (file)
--- a/allParam/ca/server/record.h
+++ b/allParam/ca/server/record.h
@@ -37,6 +37,7 @@ class Record : public casPV {
        gddAppFuncTableStatus readUnits(gdd &);
        gddAppFuncTableStatus readStatus(gdd &);
        gddAppFuncTableStatus readSeverity(gdd &);
+       gddAppFuncTableStatus readSeconds(gdd &);
 
        virtual gddAppFuncTableStatus readValue(gdd &) = 0;
        virtual caStatus scan() = 0;