diff --git a/Makefile b/Makefile index 1dfbf7d..05825c6 100644 --- a/Makefile +++ b/Makefile @@ -15,10 +15,14 @@ TEMPLATES += db/sps_status.db TEMPLATES += db/writebit.db TEMPLATES += db/readbit.db TEMPLATES += db/readstring.db +TEMPLATES += db/writeusint.db +TEMPLATES += db/readusint.db # Specific devices to include in the release TEMPLATES += db/shutter.db TEMPLATES += templates/shutter.substitutions SCRIPTS += scripts/shutter.cmd - SCRIPTS += sim/shutter_sim.py + +TEMPLATES += templates/sans_llb_beamstop.substitutions +SCRIPTS += scripts/sans_llb_beamstop.cmd diff --git a/db/readusint.db b/db/readusint.db index 09a8c42..d088264 100644 --- a/db/readusint.db +++ b/db/readusint.db @@ -2,7 +2,7 @@ record(longin, "$(INSTR)$(SPS_REGISTER_NAME):$(UINT_NAME)") { field(DTYP, "S7plcFW") field(DESC, "$(DESC)") - field(INP, "@$(SPS_REGISTER_NAME)/$(OFFSET) T=UINT8") + field(INP, "@$(SPS_REGISTER_NAME)/$(OFFSET) T=BYTE") field(PINI, "YES") field(SCAN, "I/O Intr") } diff --git a/db/writeusint.db b/db/writeusint.db index e1b6812..329d757 100644 --- a/db/writeusint.db +++ b/db/writeusint.db @@ -2,6 +2,6 @@ record(longout, "$(INSTR)$(SPS_REGISTER_NAME):$(UINT_NAME)") { field(DTYP, "S7plcFW") field(DESC, "$(DESC)") - field(OUT, "@$(SPS_REGISTER_NAME)/$(OFFSET) T=UINT8") + field(OUT, "@$(SPS_REGISTER_NAME)/$(OFFSET) T=BYTE") field(PINI, "NO") } diff --git a/scripts/sans_llb_beamstop.cmd b/scripts/sans_llb_beamstop.cmd index eb831f5..e3a74f7 100644 --- a/scripts/sans_llb_beamstop.cmd +++ b/scripts/sans_llb_beamstop.cmd @@ -1,5 +1,3 @@ -require sinqS7plcFW - # s7plcFWConfigure( # # Alias, # # IP, @@ -13,7 +11,6 @@ require sinqS7plcFW epicsEnvSet("SPS_REGISTER_NAME", "SPS-BEAMSTOP") epicsEnvSet("SPS_FETCH_SIZE", "40") -# Seems that 1 doesn't work epicsEnvSet("SPS_WRITE_SIZE", "2") s7plcFWConfigure("$(SPS_REGISTER_NAME)", "$(SPS_IP)", "$(FETCH_PORT=2000),1,$(FETCH_DB),0,$(SPS_FETCH_SIZE)", "$(WRITE_PORT=2001),1,$(WRITE_DB=$(FETCH_DB)),0,$(SPS_WRITE_SIZE)", "$(SPS_ENDIANNESS=1)", "$(SPS_RECEIVE_TIMEOUT=1000)", "$(SPS_RECEIVE_DELAY=200)", "0") diff --git a/scripts/shutter.cmd b/scripts/shutter.cmd index 2e8a788..be826d2 100644 --- a/scripts/shutter.cmd +++ b/scripts/shutter.cmd @@ -1,5 +1,3 @@ -require sinqS7plcFW - # s7plcFWConfigure( # # Alias, # # IP,