From 15b3796b6e1ff7fd59507c818643048967b1b866 Mon Sep 17 00:00:00 2001 From: hadaq Date: Mon, 20 May 2002 15:11:15 +0000 Subject: [PATCH] *** empty log message *** --- allParam/ca/server/paramBlobRecord.cc | 15 +++++++---- allParam/ca/server/paramFilenameRecord.cc | 15 +++++++---- allParam/ca/server/paramIntRecord.cc | 15 +++++++---- allParam/ca/server/paramRecord.cc | 32 ++++++++++++++++++++--- allParam/ca/server/paramRecord.h | 12 ++++++--- allParam/ca/server/paramStringRecord.cc | 15 +++++++---- allParam/ca/server/record.cc | 11 ++++++++ allParam/ca/server/record.h | 1 + 8 files changed, 88 insertions(+), 28 deletions(-) diff --git a/allParam/ca/server/paramBlobRecord.cc b/allParam/ca/server/paramBlobRecord.cc index 446b99e..163d5cf 100644 --- 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 b4e27b3..7fb1005 100644 --- 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 bbb077a..ef06adc 100644 --- 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 e229d9d..ad4861a 100644 --- 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 5a37f56..bd28362 100644 --- 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 a8a738e..cfee87a 100644 --- 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 51ca0a3..b634b5b 100644 --- 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 + #include + #include } #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 8035113..b82d9ba 100644 --- 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; -- 2.43.0