From bf0d445031e08f0d22d207c12384e96731adc686 Mon Sep 17 00:00:00 2001 From: bernardo carvalho Date: Fri, 7 May 2021 15:07:37 +0100 Subject: [PATCH 1/7] changeg pfiffer interface --- .../ISTTOKrpi2App/Db/ISTTOKpfeiffer.db | 31 +++++++++++++------ .../ISTTOKrpi2App/Db/pfeiffer.proto | 8 ++--- .../ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd | 6 +++- 3 files changed, 31 insertions(+), 14 deletions(-) diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/ISTTOKpfeiffer.db b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/ISTTOKpfeiffer.db index 577e88b..f2d6a7c 100644 --- a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/ISTTOKpfeiffer.db +++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/ISTTOKpfeiffer.db @@ -3,7 +3,7 @@ record (longin, "$(P)$(R)P001:M") field (DESC, "getPressure001 $(bus)") field (DTYP, "stream") field (INP, "@pfeiffer.proto getPressure001($(P)$(R)P001:E) $(bus)") - field (SCAN, "1 second") +# field (SCAN, "1 second") field (FLNK, "$(P)$(R)VVessel-Pressure") } record (longin, "$(P)$(R)P001:E") @@ -18,14 +18,19 @@ record (calc, "$(P)$(R)VVessel-Pressure") field(CALC, "(A*0.001)*10.0**(B-20)") field(PREC, "3") field(EGU, "mBar") + field(HIHI,"1.0e-1") + field(HIGH,"1.0e-2") + field(HHSV,"MAJOR") + field(HSV, "MINOR") } - +# 8/5/2021 Only sensor 2 is working. Running with dspIC record (longin, "$(P)$(R)P002:M") { field (DESC, "getPressure002 $(bus)") field (DTYP, "stream") field (INP, "@pfeiffer.proto getPressure002($(P)$(R)P002:E) $(bus)") - field (SCAN, "2 second") + field (SCAN, "I/O Intr") +# field (SCAN, "2 second") field (FLNK, "$(P)$(R)RPump1-Pressure") } record (longin, "$(P)$(R)P002:E") @@ -40,8 +45,8 @@ record (calc, "$(P)$(R)RPump1-Pressure") field(CALC, "(A*0.001)*10.0**(B-20)") field(PREC, "3") field(EGU, "mBar") -# field(HIHI,"1.0e-1") -# field(HIGH,"5.0e-3") + field(HIHI,"1.0e-1") + field(HIGH,"5.0e-2") # field(LOW, "20.0") # field(LOLO,"0.0") field(HHSV,"MAJOR") @@ -55,7 +60,7 @@ record (longin, "$(P)$(R)P003:M") field (DESC, "getPressure003 Mantissa $(bus)") field (DTYP, "stream") field (INP, "@pfeiffer.proto getPressure003($(P)$(R)P003:E) $(bus)") - field (SCAN, "1 second") +# field (SCAN, "1 second") # field (SCAN, "I/O Intr") field (FLNK, "$(P)$(R)TMPump1-PressureAdmission") } @@ -72,6 +77,14 @@ record (calc, "$(P)$(R)TMPump1-PressureAdmission") field(CALC, "(A*0.001)* 10.0**(B-20)") field(PREC, "3") field(EGU, "mBar") + field(HIHI,"1.0e-2") + field(HIGH,"1.0e-3") +# field(LOW, "20.0") +# field(LOLO,"0.0") + field(HHSV,"MAJOR") + field(HSV, "MINOR") +# field(LSV, "MINOR") +# field(LLSV,"MAJOR") } @@ -80,7 +93,7 @@ record (longin, "$(P)$(R)P004:M") field (DESC, "getPressure004 Mantissa $(bus)") field (DTYP, "stream") field (INP, "@pfeiffer.proto getPressure004($(P)$(R)P004:E) $(bus)") - field (SCAN, "1 second") +# field (SCAN, "1 second") field (FLNK, "$(P)$(R)RPump2-Pressure") } record (longin, "$(P)$(R)P004:E") @@ -100,8 +113,8 @@ record (calc, "$(P)$(R)RPump2-Pressure") # field(HIGH,"5.0e-3") # field(LOW, "20.0") # field(LOLO,"0.0") - field(HHSV,"MAJOR") - field(HSV, "MINOR") +# field(HHSV,"MAJOR") +# field(HSV, "MINOR") # field(LSV, "MINOR") # field(LLSV,"MAJOR") } diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto index 527ef03..bcb4149 100644 --- a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto +++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto @@ -1,17 +1,17 @@ Terminator=CR; -MaxInput = 20; +#MaxInput = 20; # in millisecond -#ReadTimeout = 2000; -ReplyTimeout = 250; +ReadTimeout = 1500; +#ReplyTimeout = 250; # Using redirection to read 2 records, mantissa and exponent getPressure001 { out "0010074002=?106"; in "0011074006%4u%(\$1)2u%+"; } +# out "0020074002=?107"; getPressure002 { - out "0020074002=?107"; in "0021074006%4u%(\$1)2u%+"; } getPressure003 { diff --git a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd index c553ca0..0f263a6 100755 --- a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd +++ b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd @@ -26,7 +26,11 @@ asynSetOption("RS0", 0, "clocal", "Y") asynSetOption("RS0", 0, "crtscts", "N") dbLoadRecords("db/ISTTOKpfeiffer.db","P=ISTTOK:,R=vacuum:,bus=RS0") - +# Uncomment to Debug STREAM serial activity +var streamError 1 +var streamDebug 1 +streamSetLogfile("stream_logfile.txt") + cd "${TOP}/iocBoot/${IOC}" iocInit From de3d81fe07d297b172bc3e2db3c633b586829a93 Mon Sep 17 00:00:00 2001 From: bernardo carvalho Date: Tue, 11 May 2021 11:28:32 +0100 Subject: [PATCH 2/7] pre- autosave --- epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd index 0f263a6..6b41ec0 100755 --- a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd +++ b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd @@ -27,9 +27,9 @@ asynSetOption("RS0", 0, "crtscts", "N") dbLoadRecords("db/ISTTOKpfeiffer.db","P=ISTTOK:,R=vacuum:,bus=RS0") # Uncomment to Debug STREAM serial activity -var streamError 1 -var streamDebug 1 -streamSetLogfile("stream_logfile.txt") +#var streamError 1 +#var streamDebug 1 +#streamSetLogfile("stream_logfile.txt") cd "${TOP}/iocBoot/${IOC}" iocInit From 9bd8504ec2753d5b9cce135acc11e7103872e8da Mon Sep 17 00:00:00 2001 From: bernardo carvalho Date: Tue, 11 May 2021 11:45:16 +0100 Subject: [PATCH 3/7] added autosave for alarm limits --- epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile | 2 ++ .../ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths | 7 +++++++ .../iocBoot/iocISTTOKrpi2/iocISTTOKrpi2.req | 4 ++++ .../iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd | 15 +++++++++++++++ epics/iocs/RELEASE.local | 2 +- 5 files changed, 29 insertions(+), 1 deletion(-) create mode 100644 epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths create mode 100644 epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/iocISTTOKrpi2.req diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile index 13b302e..2dbf9be 100644 --- a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile +++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile @@ -20,10 +20,12 @@ ISTTOKrpi2_DBD += base.dbd ISTTOKrpi2_DBD += asyn.dbd ISTTOKrpi2_DBD += stream.dbd ISTTOKrpi2_DBD += drvAsynSerialPort.dbd +ISTTOKrpi2_DBD += asSupport.dbd # Add all the support libraries needed by this IOC ISTTOKrpi2_LIBS += asyn ISTTOKrpi2_LIBS += stream +ISTTOKrpi2_LIBS += autosave # ISTTOKrpi2_registerRecordDeviceDriver.cpp derives from ISTTOKrpi2.dbd ISTTOKrpi2_SRCS += ISTTOKrpi2_registerRecordDeviceDriver.cpp diff --git a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths new file mode 100644 index 0000000..81e5e03 --- /dev/null +++ b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths @@ -0,0 +1,7 @@ +epicsEnvSet("IOC","iocISTTOKrpi2") +epicsEnvSet("TOP","/home/pi/ISTTOK/epics/iocs/ISTTOKrpi2") +epicsEnvSet("EPICS_BASE","/home/pi/Apps/epics7/epics-base") +epicsEnvSet("HOME","/home/pi") +epicsEnvSet("SUPPORT","/home/pi/Apps/epics7/support") +epicsEnvSet("ASYN","/home/pi/Apps/epics7/support/asyn") +epicsEnvSet("STREAM","/home/pi/Apps/epics7/support/StreamDevice") diff --git a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/iocISTTOKrpi2.req b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/iocISTTOKrpi2.req new file mode 100644 index 0000000..9c5542e --- /dev/null +++ b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/iocISTTOKrpi2.req @@ -0,0 +1,4 @@ +#ALARM Limits +ISTTOK:vacuum:RPump1-Pressure.HIGH +ISTTOK:vacuum:RPump1-Pressure.HIHI + diff --git a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd index 6b41ec0..6c0c55d 100755 --- a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd +++ b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/st.cmd @@ -5,6 +5,7 @@ < envPaths epicsEnvSet( "STREAM_PROTOCOL_PATH", "$(TOP)/db" ) +epicsEnvSet( "SAVE_DIR", "$(TOP)/iocBoot/$(IOC)" ) cd "${TOP}" @@ -30,9 +31,23 @@ dbLoadRecords("db/ISTTOKpfeiffer.db","P=ISTTOK:,R=vacuum:,bus=RS0") #var streamError 1 #var streamDebug 1 #streamSetLogfile("stream_logfile.txt") + +#save_restoreSet_status_prefix("$(IOC):") +save_restoreSet_status_prefix("ISTTOK:") +set_requestfile_path("$(SAVE_DIR)") +set_savefile_path("$(SAVE_DIR)/save") +save_restoreSet_NumSeqFiles(3) +save_restoreSet_SeqPeriodInSeconds(600) +set_pass0_restoreFile("$(IOC).sav") +set_pass1_restoreFile("$(IOC).sav") +#dbLoadRecords("$(AUTOSAVE)/asApp/Db/save_restoreStatus.db", "P=ISTTOK:") cd "${TOP}/iocBoot/${IOC}" iocInit +# Create request file and start periodic 'save’ +# makeAutosaveFileFromDbInfo("$(SAVE_DIR)/$(IOC).req", "autosaveFields") +create_monitor_set("$(IOC).req", 30) + ## Start any sequence programs #seq sncxxx,"user=pi" diff --git a/epics/iocs/RELEASE.local b/epics/iocs/RELEASE.local index d1d65cb..b82440a 100644 --- a/epics/iocs/RELEASE.local +++ b/epics/iocs/RELEASE.local @@ -8,7 +8,7 @@ STREAM=$(SUPPORT)/StreamDevice #CALC=$(SUPPORT)/calc AUTOSAVE = $(SUPPORT)/autosave DRVASYNI2C =$(SUPPORT)/drvAsynI2C -SNCSEQ=$(SUPPORT)/seq-2-2 +#SNCSEQ=$(SUPPORT)/seq-2-2 # IPAC release V2-7 or later is required. #IPAC= From 4c48cd3848c5b99d46e21e718891bf04dc7d05f8 Mon Sep 17 00:00:00 2001 From: bernardo carvalho Date: Sun, 10 Oct 2021 21:52:32 +0100 Subject: [PATCH 4/7] changed RS485 addreses Signed-off-by: bernardo carvalho --- .../ISTTOKrpi2App/Db/ISTTOKpfeiffer.db | 47 ++++++++++--------- .../ISTTOKrpi2App/Db/pfeiffer.proto | 6 +-- 2 files changed, 28 insertions(+), 25 deletions(-) diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/ISTTOKpfeiffer.db b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/ISTTOKpfeiffer.db index f2d6a7c..15d01fd 100644 --- a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/ISTTOKpfeiffer.db +++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/ISTTOKpfeiffer.db @@ -1,29 +1,35 @@ +# 8/5/2021 Only sensor 2 is working. Running with dspIC +# 20/9/2021 sensors 1,2,3 are working. Running with dspIC record (longin, "$(P)$(R)P001:M") { field (DESC, "getPressure001 $(bus)") field (DTYP, "stream") field (INP, "@pfeiffer.proto getPressure001($(P)$(R)P001:E) $(bus)") + field (SCAN, "I/O Intr") # field (SCAN, "1 second") - field (FLNK, "$(P)$(R)VVessel-Pressure") + field (FLNK, "$(P)$(R)TMPump1-PressureAdmission") } record (longin, "$(P)$(R)P001:E") { field (DESC, "Pressure001 exponent $(bus)") } -record (calc, "$(P)$(R)VVessel-Pressure") +record (calc, "$(P)$(R)TMPump1-PressureAdmission") { - field (DESC, "ISTTOK:central:VVessel-Pressure") + field(DESC, "ISTTOK:central:TMPump1-PressureAdmission") field(INPA, "$(P)$(R)P001:M") field(INPB, "$(P)$(R)P001:E") - field(CALC, "(A*0.001)*10.0**(B-20)") + field(CALC, "(A*0.001)* 10.0**(B-20)") field(PREC, "3") field(EGU, "mBar") - field(HIHI,"1.0e-1") - field(HIGH,"1.0e-2") - field(HHSV,"MAJOR") - field(HSV, "MINOR") + field(HIHI,"1.0e-2") + field(HIGH,"1.0e-3") +# field(LOW, "20.0") +# field(LOLO,"0.0") + field(HHSV,"MAJOR") + field(HSV, "MINOR") +# field(LSV, "MINOR") +# field(LLSV,"MAJOR") } -# 8/5/2021 Only sensor 2 is working. Running with dspIC record (longin, "$(P)$(R)P002:M") { field (DESC, "getPressure002 $(bus)") @@ -61,30 +67,26 @@ record (longin, "$(P)$(R)P003:M") field (DTYP, "stream") field (INP, "@pfeiffer.proto getPressure003($(P)$(R)P003:E) $(bus)") # field (SCAN, "1 second") -# field (SCAN, "I/O Intr") - field (FLNK, "$(P)$(R)TMPump1-PressureAdmission") + field (SCAN, "I/O Intr") + field (FLNK, "$(P)$(R)VVessel-Pressure") } record (longin, "$(P)$(R)P003:E") { field (DESC, "Pressure003 Exponent $(bus)") } -record (calc, "$(P)$(R)TMPump1-PressureAdmission") +record (calc, "$(P)$(R)VVessel-Pressure") { - field(DESC, "ISTTOK:central:TMPump1-PressureAdmission") + field (DESC, "ISTTOK:central:VVessel-Pressure") field(INPA, "$(P)$(R)P003:M") field(INPB, "$(P)$(R)P003:E") - field(CALC, "(A*0.001)* 10.0**(B-20)") + field(CALC, "(A*0.001)*10.0**(B-20)") field(PREC, "3") field(EGU, "mBar") - field(HIHI,"1.0e-2") - field(HIGH,"1.0e-3") -# field(LOW, "20.0") -# field(LOLO,"0.0") - field(HHSV,"MAJOR") - field(HSV, "MINOR") -# field(LSV, "MINOR") -# field(LLSV,"MAJOR") + field(HIHI,"1.0e-1") + field(HIGH,"1.0e-2") + field(HHSV,"MAJOR") + field(HSV, "MINOR") } @@ -94,6 +96,7 @@ record (longin, "$(P)$(R)P004:M") field (DTYP, "stream") field (INP, "@pfeiffer.proto getPressure004($(P)$(R)P004:E) $(bus)") # field (SCAN, "1 second") +# field (SCAN, "I/O Intr") field (FLNK, "$(P)$(R)RPump2-Pressure") } record (longin, "$(P)$(R)P004:E") diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto index bcb4149..ff89182 100644 --- a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto +++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto @@ -7,7 +7,7 @@ ReadTimeout = 1500; # Using redirection to read 2 records, mantissa and exponent getPressure001 { - out "0010074002=?106"; +# out "0010074002=?106"; in "0011074006%4u%(\$1)2u%+"; } # out "0020074002=?107"; @@ -15,11 +15,11 @@ getPressure002 { in "0021074006%4u%(\$1)2u%+"; } getPressure003 { - out "0030074002=?108"; +# out "0030074002=?108"; in "0031074006%4u%(\$1)2u%+"; } getPressure004 { - out "0040074002=?109"; +# out "0040074002=?109"; in "0041074006%4u%(\$1)2u%+"; } # From fe811ce78400f6d1a95eb5cc5ade81079971afc5 Mon Sep 17 00:00:00 2001 From: Bernardo Carvalho Date: Sun, 10 Oct 2021 21:58:51 +0100 Subject: [PATCH 5/7] changed RPI Signed-off-by: Bernardo Carvalho --- .../iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/Makefile | 1 + .../ISTTOKrpi2/ISTTOKrpi2App/src/Makefile | 1 + .../ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths | 9 ++--- epics/iocs/RELEASE.local | 36 +++++++++++-------- 4 files changed, 28 insertions(+), 19 deletions(-) diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/Makefile b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/Makefile index af95e8b..9cb608e 100644 --- a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/Makefile +++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/Makefile @@ -6,6 +6,7 @@ include $(TOP)/configure/CONFIG #---------------------------------------------------- # Create and install (or just install) into /db # databases, templates, substitutions like this +#DB += xxx.db DB += ISTTOKpfeiffer.db DB += pfeiffer.proto diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile index 2dbf9be..d2ea8cb 100644 --- a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile +++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/Makefile @@ -23,6 +23,7 @@ ISTTOKrpi2_DBD += drvAsynSerialPort.dbd ISTTOKrpi2_DBD += asSupport.dbd # Add all the support libraries needed by this IOC +#ISTTOKrpi2_LIBS += xxx ISTTOKrpi2_LIBS += asyn ISTTOKrpi2_LIBS += stream ISTTOKrpi2_LIBS += autosave diff --git a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths index 81e5e03..9cb26c0 100644 --- a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths +++ b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/envPaths @@ -1,7 +1,8 @@ epicsEnvSet("IOC","iocISTTOKrpi2") epicsEnvSet("TOP","/home/pi/ISTTOK/epics/iocs/ISTTOKrpi2") -epicsEnvSet("EPICS_BASE","/home/pi/Apps/epics7/epics-base") +epicsEnvSet("EPICS_BASE","/home/pi/EPICS/epics-base") epicsEnvSet("HOME","/home/pi") -epicsEnvSet("SUPPORT","/home/pi/Apps/epics7/support") -epicsEnvSet("ASYN","/home/pi/Apps/epics7/support/asyn") -epicsEnvSet("STREAM","/home/pi/Apps/epics7/support/StreamDevice") +epicsEnvSet("SUPPORT","/home/pi/EPICS/support") +epicsEnvSet("ASYN","/home/pi/EPICS/support/asyn") +epicsEnvSet("STREAM","/home/pi/EPICS/support/stream") +epicsEnvSet("AUTOSAVE","/home/pi/EPICS/support/autosave") diff --git a/epics/iocs/RELEASE.local b/epics/iocs/RELEASE.local index b82440a..1386f4f 100644 --- a/epics/iocs/RELEASE.local +++ b/epics/iocs/RELEASE.local @@ -1,23 +1,29 @@ #RELEASE Location of external products HOME=/home/pi -SUPPORT=$(HOME)/Apps/epics7/support -# -# -ASYN=$(SUPPORT)/asyn -STREAM=$(SUPPORT)/StreamDevice -#CALC=$(SUPPORT)/calc -AUTOSAVE = $(SUPPORT)/autosave -DRVASYNI2C =$(SUPPORT)/drvAsynI2C -#SNCSEQ=$(SUPPORT)/seq-2-2 +SUPPORT=$(HOME)/EPICS/support + +# IPAC is only necessary if support for Greensprings IP488 is required # IPAC release V2-7 or later is required. +# IPAC=$(SUPPORT)/ipac-2-15 #IPAC= -#$(SUPPORT)/ipac-2-15 -# -# # SEQ is required for testIPServer -#$(SUPPORT)/seq-2-2-5 + +ASYN=$(SUPPORT)/asyn +STREAM=$(SUPPORT)/stream +AUTOSAVE = $(SUPPORT)/autosave # +# SEQ is required for testIPServer +#SNCSEQ=$(SUPPORT)/seq-2-2-5 +SNCSEQ= + +## For sCalcout support in asynOctet - applications include asynCalc.dbd +#CALC=$(SUPPORT)/calc-3-7-3 CALC= PCRE= -# -EPICS_BASE=$(HOME)/Apps/epics7/epics-base + +# If CALC was built with SSCAN support then SSCAN must be defined for testEpicsApp +#SSCAN=$(SUPPORT)/sscan-2-11-3 + +# EPICS_BASE 3.14.6 or later is required +EPICS_BASE=/home/pi/EPICS/epics-base + From 3d8c3428fc82f27dbda6ef7c9462cc64721a1025 Mon Sep 17 00:00:00 2001 From: Bernardo Carvalho Date: Mon, 11 Oct 2021 11:10:35 +0100 Subject: [PATCH 6/7] changed PollPeriod = ; param Signed-off-by: Bernardo Carvalho --- epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto index ff89182..9c118b7 100644 --- a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto +++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Db/pfeiffer.proto @@ -1,9 +1,14 @@ Terminator=CR; -#MaxInput = 20; +MaxInput = 30; +ExtraInput = Ignore; # in millisecond -ReadTimeout = 1500; -#ReplyTimeout = 250; +#ReadTimeout = 1500; +#ReplyTimeout = 100; +#PollPeriod = $ReplyTimeout; +#Integer. Affects first in command in I/O Intr mode (see chapter Record Processing). +PollPeriod = 250; + # Using redirection to read 2 records, mantissa and exponent getPressure001 { From 514eb82e224779361fbe0844aaaa5c63fd4fd03f Mon Sep 17 00:00:00 2001 From: Bernardo Carvalho Date: Mon, 11 Oct 2021 11:20:11 +0100 Subject: [PATCH 7/7] added .gitignore and project files Signed-off-by: Bernardo Carvalho --- epics/iocs/ISTTOKrpi2/.gitignore | 6 ++++ epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Makefile | 8 +++++ .../ISTTOKrpi2App/src/ISTTOKrpi2Main.cpp | 23 ++++++++++++++ epics/iocs/ISTTOKrpi2/Makefile | 31 +++++++++++++++++++ epics/iocs/ISTTOKrpi2/iocBoot/Makefile | 6 ++++ .../ISTTOKrpi2/iocBoot/iocISTTOKrpi2/Makefile | 5 +++ .../iocISTTOKrpi2/save/iocISTTOKrpi2.sav | 4 +++ 7 files changed, 83 insertions(+) create mode 100644 epics/iocs/ISTTOKrpi2/.gitignore create mode 100644 epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Makefile create mode 100644 epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/ISTTOKrpi2Main.cpp create mode 100644 epics/iocs/ISTTOKrpi2/Makefile create mode 100644 epics/iocs/ISTTOKrpi2/iocBoot/Makefile create mode 100644 epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/Makefile create mode 100755 epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/save/iocISTTOKrpi2.sav diff --git a/epics/iocs/ISTTOKrpi2/.gitignore b/epics/iocs/ISTTOKrpi2/.gitignore new file mode 100644 index 0000000..c567f5c --- /dev/null +++ b/epics/iocs/ISTTOKrpi2/.gitignore @@ -0,0 +1,6 @@ +O.* +bin/* +iocBoot/iocISTTOKrpi2/save/* +db +dbd +configure diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Makefile b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Makefile new file mode 100644 index 0000000..10e0126 --- /dev/null +++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/Makefile @@ -0,0 +1,8 @@ +TOP = .. +include $(TOP)/configure/CONFIG +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*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/ISTTOKrpi2Main.cpp b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/ISTTOKrpi2Main.cpp new file mode 100644 index 0000000..8592f8d --- /dev/null +++ b/epics/iocs/ISTTOKrpi2/ISTTOKrpi2App/src/ISTTOKrpi2Main.cpp @@ -0,0 +1,23 @@ +/* ISTTOKrpi2Main.cpp */ +/* Author: Marty Kraimer Date: 17MAR2000 */ + +#include +#include +#include +#include +#include + +#include "epicsExit.h" +#include "epicsThread.h" +#include "iocsh.h" + +int main(int argc,char *argv[]) +{ + if(argc>=2) { + iocsh(argv[1]); + epicsThreadSleep(.2); + } + iocsh(NULL); + epicsExit(0); + return(0); +} diff --git a/epics/iocs/ISTTOKrpi2/Makefile b/epics/iocs/ISTTOKrpi2/Makefile new file mode 100644 index 0000000..19c9068 --- /dev/null +++ b/epics/iocs/ISTTOKrpi2/Makefile @@ -0,0 +1,31 @@ +# Makefile at top of application tree +TOP = . +include $(TOP)/configure/CONFIG + +# Directories to build, any order +DIRS += configure +DIRS += $(wildcard *Sup) +DIRS += $(wildcard *App) +DIRS += $(wildcard *Top) +DIRS += $(wildcard iocBoot) + +# The build order is controlled by these dependency rules: + +# All dirs except configure depend on configure +$(foreach dir, $(filter-out configure, $(DIRS)), \ + $(eval $(dir)_DEPEND_DIRS += configure)) + +# Any *App dirs depend on all *Sup dirs +$(foreach dir, $(filter %App, $(DIRS)), \ + $(eval $(dir)_DEPEND_DIRS += $(filter %Sup, $(DIRS)))) + +# Any *Top dirs depend on all *Sup and *App dirs +$(foreach dir, $(filter %Top, $(DIRS)), \ + $(eval $(dir)_DEPEND_DIRS += $(filter %Sup %App, $(DIRS)))) + +# iocBoot depends on all *App dirs +iocBoot_DEPEND_DIRS += $(filter %App,$(DIRS)) + +# Add any additional dependency rules here: + +include $(TOP)/configure/RULES_TOP diff --git a/epics/iocs/ISTTOKrpi2/iocBoot/Makefile b/epics/iocs/ISTTOKrpi2/iocBoot/Makefile new file mode 100644 index 0000000..91e47d0 --- /dev/null +++ b/epics/iocs/ISTTOKrpi2/iocBoot/Makefile @@ -0,0 +1,6 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS += $(wildcard *ioc*) +DIRS += $(wildcard as*) +include $(CONFIG)/RULES_DIRS + diff --git a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/Makefile b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/Makefile new file mode 100644 index 0000000..e1b9aa4 --- /dev/null +++ b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/Makefile @@ -0,0 +1,5 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths +include $(TOP)/configure/RULES.ioc diff --git a/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/save/iocISTTOKrpi2.sav b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/save/iocISTTOKrpi2.sav new file mode 100755 index 0000000..8a0fdb4 --- /dev/null +++ b/epics/iocs/ISTTOKrpi2/iocBoot/iocISTTOKrpi2/save/iocISTTOKrpi2.sav @@ -0,0 +1,4 @@ +# autosave R5.3 Automatically generated - DO NOT MODIFY - 211011-110712 +ISTTOK:vacuum:RPump1-Pressure.HIGH 0.05 +ISTTOK:vacuum:RPump1-Pressure.HIHI 0.1 +