Skip to content

Update TEST ioc with stream device support #485

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Update TEST ioc with stream device support #485

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
27da750
Add simple stream device echo test
FreddieAkeroyd Mar 9, 2020
5e7ddaf
Add lso/lsi
FreddieAkeroyd Mar 9, 2020
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
31 changes: 31 additions & 0 deletions TEST/TEST-IOC-01App/Db/TEST-IOC-01.db
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,34 @@
record(lso,"$(P)LSOVAL:SP")
{
field(DTYP, "stream")
field(OUT, "@test.proto writeString $(PORT)")
field(SIZV, "1024")
field(FLNK, "$(P)LSIVAL")
}

record(lsi,"$(P)LSIVAL")
{
field(DTYP, "stream")
field(INP, "@test.proto readString $(PORT)")
field(SIZV, "1024")
}

record(waveform,"$(P)WFVAL:SP")
{
field(NELM , "1024")
field(FTVL, "CHAR")
field(DTYP, "stream")
field(INP, "@test.proto writeString $(PORT)")
field(FLNK, "$(P)WFVAL")
}

record(waveform,"$(P)WFVAL")
{
field(NELM , "1024")
field(FTVL, "CHAR")
field(DTYP, "stream")
field(INP, "@test.proto readString $(PORT)")
}

record(ai,"$(P)VAL")
{
Expand Down
1 change: 1 addition & 0 deletions TEST/TEST-IOC-01App/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,5 +4,6 @@ DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Src*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *Db*))
DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard protocol))
include $(TOP)/configure/RULES_DIRS

6 changes: 6 additions & 0 deletions TEST/TEST-IOC-01App/protocol/Makefile
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
TOP = ../..
include $(TOP)/configure/CONFIG
DATA += test.proto

include $(TOP)/configure/RULES

9 changes: 9 additions & 0 deletions TEST/TEST-IOC-01App/protocol/test.proto
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,9 @@
Terminator = LF;

writeString {
out "%s";
}

readString {
in "%s";
}
10 changes: 7 additions & 3 deletions TEST/TEST-IOC-01App/src/build.mak
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,18 +25,22 @@ $(APPNAME)_DBD += devIocStats.dbd
$(APPNAME)_DBD += caPutLog.dbd
$(APPNAME)_DBD += utilities.dbd
## add other dbd here ##
$(APPNAME)_DBD += calcSupport.dbd
$(APPNAME)_DBD += randomSupport.dbd
$(APPNAME)_DBD += PVAServerRegister.dbd
$(APPNAME)_DBD += asyn.dbd
$(APPNAME)_DBD += drvAsynEcho.dbd
$(APPNAME)_DBD += stream.dbd

# Add all the support libraries needed by this IOC
## ISIS standard libraries ##
$(APPNAME)_LIBS += seq pv
$(APPNAME)_LIBS += stream asyn asynEcho
$(APPNAME)_LIBS += devIocStats
$(APPNAME)_LIBS += pvdump $(MYSQLLIB) easySQLite sqlite
$(APPNAME)_LIBS += caPutLog
$(APPNAME)_LIBS += icpconfig pugixml
$(APPNAME)_LIBS += autosave
$(APPNAME)_LIBS += autosave calc sscan
$(APPNAME)_LIBS += utilities pcre
$(APPNAME)_LIBS += seq pv
## Add other libraries here ##
$(APPNAME)_LIBS += random
ifdef EPICS_BASE_PVA_CORE_LIBS
Expand Down
8 changes: 5 additions & 3 deletions TEST/iocBoot/iocTEST-IOC-01/st.cmd
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,6 +11,10 @@ cd ${TOP}
dbLoadDatabase "dbd/TEST-IOC-01.dbd"
TEST_IOC_01_registerRecordDeviceDriver pdbbase

epicsEnvSet ("STREAM_PROTOCOL_PATH", "$(TOP)/data")

echoDriverInit("L0", 0.1, 0, 0)

##ISIS## Run IOC initialisation
< $(IOCSTARTUP)/init.cmd

Expand All @@ -20,7 +24,7 @@ TEST_IOC_01_registerRecordDeviceDriver pdbbase
< $(IOCSTARTUP)/dbload.cmd

## Load our record instances
dbLoadRecords("db/TEST-IOC-01.db","P=$(MYPVPREFIX)$(IOCNAME):, RANDDEV=Random Async, RANDSEED=324235")
dbLoadRecords("db/TEST-IOC-01.db","P=$(MYPVPREFIX)$(IOCNAME):,RANDDEV=Random Async,RANDSEED=324235,PORT=L0")

##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called
< $(IOCSTARTUP)/preiocinit.cmd
Expand All @@ -33,5 +37,3 @@ iocInit

##ISIS## Stuff that needs to be done after iocInit is called e.g. sequence programs
< $(IOCSTARTUP)/postiocinit.cmd

startPVAServer