From a779ff73fbdc6f5b7b236a9bd0c726f8e52ebfba Mon Sep 17 00:00:00 2001 From: Guilherme Ricioli Date: Fri, 12 Aug 2022 16:51:12 -0300 Subject: [PATCH] Add caPutLog module to BPMApp --- BPMApp/Db/accessSecurityFile.acf | 4 ++++ BPMApp/src/BPMInclude.dbd | 1 + BPMApp/src/Makefile | 2 ++ configure/RELEASE | 1 + iocBoot/iocBPM/stBPM250M.cmd | 6 ++++++ 5 files changed, 14 insertions(+) create mode 100644 BPMApp/Db/accessSecurityFile.acf diff --git a/BPMApp/Db/accessSecurityFile.acf b/BPMApp/Db/accessSecurityFile.acf new file mode 100644 index 0000000..20ed97c --- /dev/null +++ b/BPMApp/Db/accessSecurityFile.acf @@ -0,0 +1,4 @@ +ASG(DEFAULT){ + RULE(1,READ) + RULE(1,WRITE,TRAPWRITE) +} diff --git a/BPMApp/src/BPMInclude.dbd b/BPMApp/src/BPMInclude.dbd index e6e76e6..5c37517 100644 --- a/BPMApp/src/BPMInclude.dbd +++ b/BPMApp/src/BPMInclude.dbd @@ -9,3 +9,4 @@ include "busySupport.dbd" include "asSupport.dbd" include "FFTRecords.dbd" include "BPMSupport.dbd" +include "caPutLog.dbd" diff --git a/BPMApp/src/Makefile b/BPMApp/src/Makefile index 77fb6b8..cb26f34 100644 --- a/BPMApp/src/Makefile +++ b/BPMApp/src/Makefile @@ -28,6 +28,7 @@ BPM_DBD += base.dbd BPM_DBD += asyn.dbd BPM_DBD += devIocStats.dbd BPM_DBD += FFTRecords.dbd +BPM_DBD += caPutLog.dbd # BPM_registerRecordDeviceDriver.cpp derives from BPM.dbd BPM_SRCS += BPM_registerRecordDeviceDriver.cpp @@ -43,6 +44,7 @@ BPM_LIBS += asyn BPM_LIBS += autosave BPM_LIBS += FFTRecords BPM_LIBS += devIocStats +BPM_LIBS += caPutLog # Link to the EPICS Base libraries BPM_LIBS += $(EPICS_BASE_IOC_LIBS) diff --git a/configure/RELEASE b/configure/RELEASE index 4856a6c..a4a2dcc 100644 --- a/configure/RELEASE +++ b/configure/RELEASE @@ -81,6 +81,7 @@ BUSY=$(SUPPORT)/busy-R1-7-1 FFT=FFTRecordsApp AREA_DETECTOR=$(SUPPORT)/areaDetector-R3-6 DEVIOCSTATS=$(SUPPORT)/iocStats-3-1-15 +CAPUTLOG=$(SUPPORT)/caPutLog-R4.0 ADCORE=$(AREA_DETECTOR)/ADCore ## Set our custom variable so Area Detector path remains the same ## for synApps_5_7 and synApps_5_8 diff --git a/iocBoot/iocBPM/stBPM250M.cmd b/iocBoot/iocBPM/stBPM250M.cmd index f5d87df..af51a46 100755 --- a/iocBoot/iocBPM/stBPM250M.cmd +++ b/iocBoot/iocBPM/stBPM250M.cmd @@ -11,6 +11,9 @@ epicsEnvSet("LOCATION","$(LOCATION=DIGS)") epicsEnvSet("STARTUP","$(TOP)") epicsEnvSet("ST_CMD","stBPM250.cmd") +epicsEnvSet("EPICS_IOC_CAPUTLOG_INET", "10.0.38.59") +epicsEnvSet("EPICS_IOC_CAPUTLOG_PORT", "7012") + < BPM.config ## Register all support components @@ -34,6 +37,8 @@ dbLoadRecords("$(ASYN)/db/asynRecord.db","P=${P}, R=${R}asyn,PORT=$(PORT),ADDR=0 dbLoadRecords("$(DEVIOCSTATS)/db/iocAdminSoft.db","IOC=${P}${R}Stats") dbLoadRecords("$(DEVIOCSTATS)/db/iocAdminScanMon.db","IOC=${P}${R}Stats") +asSetFilename("${TOP}/BPMApp/Db/accessSecurityFile.acf") + < triggerBPM.cmd < fmc250m_4ch.cmd < waveformPlugins.cmd @@ -57,6 +62,7 @@ var dbThreadRealtimeLock 0 iocInit() < initBPMCommands +caPutLogInit "$(EPICS_IOC_CAPUTLOG_INET):$(EPICS_IOC_CAPUTLOG_PORT)" 2 # save things every thirty seconds create_monitor_set("auto_settings.req", 30,"P=${P}, R=${R}")