Skip to content
This repository has been archived by the owner on Sep 27, 2024. It is now read-only.

Add caPutLog module to BPMApp #56

Draft
wants to merge 1 commit into
base: devel
Choose a base branch
from
Draft

Add caPutLog module to BPMApp #56

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 4 additions & 0 deletions BPMApp/Db/accessSecurityFile.acf
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,4 @@
ASG(DEFAULT){
RULE(1,READ)
RULE(1,WRITE,TRAPWRITE)
}
1 change: 1 addition & 0 deletions BPMApp/src/BPMInclude.dbd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,3 +9,4 @@ include "busySupport.dbd"
include "asSupport.dbd"
include "FFTRecords.dbd"
include "BPMSupport.dbd"
include "caPutLog.dbd"
2 changes: 2 additions & 0 deletions BPMApp/src/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand All @@ -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)
Expand Down
1 change: 1 addition & 0 deletions configure/RELEASE
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

NOTE: These changes assume that caPutLog-R4.0 is installed at "$(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
Expand Down
6 changes: 6 additions & 0 deletions iocBoot/iocBPM/stBPM250M.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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")
Comment on lines +14 to +15
Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

These should be taken from environment variables...


< BPM.config

## Register all support components
Expand All @@ -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
Expand All @@ -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}")
Expand Down