diff --git a/KICKER/KICKER-IOC-01App/Db/Makefile b/KICKER/KICKER-IOC-01App/Db/Makefile new file mode 100644 index 000000000..983981d40 --- /dev/null +++ b/KICKER/KICKER-IOC-01App/Db/Makefile @@ -0,0 +1,22 @@ +TOP=../.. +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE + +#---------------------------------------------------- +# Optimization of db files using dbst (DEFAULT: NO) +#DB_OPT = YES + +#---------------------------------------------------- +# Create and install (or just install) into /db +# databases, templates, substitutions like this +#DB += xxx.db + +#---------------------------------------------------- +# If .db template is not named *.template add +# _template = + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/KICKER/KICKER-IOC-01App/Makefile b/KICKER/KICKER-IOC-01App/Makefile new file mode 100644 index 000000000..373b86bfc --- /dev/null +++ b/KICKER/KICKER-IOC-01App/Makefile @@ -0,0 +1,9 @@ +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*)) +DIRS := $(DIRS) $(filter-out $(DIRS), $(wildcard *protocol*)) +include $(TOP)/configure/RULES_DIRS + diff --git a/KICKER/KICKER-IOC-01App/src/KICKER-IOC-01Main.cpp b/KICKER/KICKER-IOC-01App/src/KICKER-IOC-01Main.cpp new file mode 100644 index 000000000..4daf2f8e4 --- /dev/null +++ b/KICKER/KICKER-IOC-01App/src/KICKER-IOC-01Main.cpp @@ -0,0 +1,23 @@ +/* KICKER-IOC-01Main.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/KICKER/KICKER-IOC-01App/src/Makefile b/KICKER/KICKER-IOC-01App/src/Makefile new file mode 100644 index 000000000..0ee3565d0 --- /dev/null +++ b/KICKER/KICKER-IOC-01App/src/Makefile @@ -0,0 +1,9 @@ +TOP=../.. +# This file should do very little - it's purpose is to set the APPNAME and then load build.mak + +# this definition is used in build.mak +APPNAME=KICKER-IOC-01 + +# If we are ###-IOC-01 leave this as is, if we are ###-IOC-02 or higher change to ###-IOC-01 and delete build.mak from this directory +# there should only be a single build.mak for all IOCs of a given family and it is located in the ###-IOC-01 directory +include $(TOP)/KICKER-IOC-01App/src/build.mak diff --git a/KICKER/KICKER-IOC-01App/src/build.mak b/KICKER/KICKER-IOC-01App/src/build.mak new file mode 100644 index 000000000..cb46cd7d4 --- /dev/null +++ b/KICKER/KICKER-IOC-01App/src/build.mak @@ -0,0 +1,76 @@ +TOP=../.. + +include $(TOP)/configure/CONFIG +#---------------------------------------- +# ADD MACRO DEFINITIONS AFTER THIS LINE +#============================= + +### NOTE: there should only be one build.mak for a given IOC family and this should be located in the ###-IOC-01 directory + +#============================= +# Build the IOC application KICKER-IOC-01 +# We actually use $(APPNAME) below so this file can be included by multiple IOCs + +PROD_IOC = $(APPNAME) +# KICKER-IOC-01.dbd will be created and installed +DBD += $(APPNAME).dbd + +# KICKER-IOC-01.dbd will be made up from these files: +$(APPNAME)_DBD += base.dbd +## ISIS standard dbd ## +$(APPNAME)_DBD += devSequencer.dbd +$(APPNAME)_DBD += icpconfig.dbd +$(APPNAME)_DBD += pvdump.dbd +$(APPNAME)_DBD += asSupport.dbd +$(APPNAME)_DBD += devIocStats.dbd +$(APPNAME)_DBD += caPutLog.dbd +$(APPNAME)_DBD += utilities.dbd +## Stream device support ## +$(APPNAME)_DBD += stream.dbd +$(APPNAME)_DBD += asyn.dbd +$(APPNAME)_DBD += drvAsynSerialPort.dbd +$(APPNAME)_DBD += drvAsynIPPort.dbd +$(APPNAME)_DBD += calcSupport.dbd +$(APPNAME)_DBD += DAQmxSupport.dbd +$(APPNAME)_DBD += modbusSupport.dbd +## add other dbd here ## +#$(APPNAME)_DBD += xxx.dbd + +# Add all the support libraries needed by this IOC +## ISIS standard libraries ## +$(APPNAME)_LIBS += seqDev seq pv +$(APPNAME)_LIBS += devIocStats +$(APPNAME)_LIBS += pvdump $(MYSQLLIB) easySQLite sqlite +$(APPNAME)_LIBS += caPutLog +$(APPNAME)_LIBS += icpconfig pugixml +$(APPNAME)_LIBS += autosave +$(APPNAME)_LIBS += utilities pcre libjson zlib +## Stream device libraries ## +$(APPNAME)_LIBS += stream +$(APPNAME)_LIBS += pcre +$(APPNAME)_LIBS += asyn +## Add other libraries here ## +$(APPNAME)_LIBS += calc +#$(APPNAME)_LIBS += xxx +$(APPNAME)_LIBS += DAQmxSupport +$(APPNAME)_LIBS += modbus + +# KICKER-IOC-01_registerRecordDeviceDriver.cpp derives from KICKER-IOC-01.dbd +$(APPNAME)_SRCS += $(APPNAME)_registerRecordDeviceDriver.cpp + +# Build the main IOC entry point on workstation OSs. +$(APPNAME)_SRCS_DEFAULT += $(APPNAME)Main.cpp +$(APPNAME)_SRCS_vxWorks += -nil- + +# Add support from base/src/vxWorks if needed +#$(APPNAME)_OBJS_vxWorks += $(EPICS_BASE_BIN)/vxComLibrary + +# Finally link to the EPICS Base libraries +$(APPNAME)_LIBS += $(EPICS_BASE_IOC_LIBS) + +#=========================== + +include $(TOP)/configure/RULES +#---------------------------------------- +# ADD RULES AFTER THIS LINE + diff --git a/KICKER/Makefile b/KICKER/Makefile new file mode 100644 index 000000000..19c9068d1 --- /dev/null +++ b/KICKER/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/KICKER/configure/CONFIG b/KICKER/configure/CONFIG new file mode 100644 index 000000000..c1a470322 --- /dev/null +++ b/KICKER/configure/CONFIG @@ -0,0 +1,29 @@ +# CONFIG - Load build configuration data +# +# Do not make changes to this file! + +# Allow user to override where the build rules come from +RULES = $(EPICS_BASE) + +# RELEASE files point to other application tops +include $(TOP)/configure/RELEASE +-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).Common +ifdef T_A +-include $(TOP)/configure/RELEASE.Common.$(T_A) +-include $(TOP)/configure/RELEASE.$(EPICS_HOST_ARCH).$(T_A) +endif + +CONFIG = $(RULES)/configure +include $(CONFIG)/CONFIG + +# Override the Base definition: +INSTALL_LOCATION = $(TOP) + +# CONFIG_SITE files contain other build configuration settings +include $(TOP)/configure/CONFIG_SITE +-include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).Common +ifdef T_A + -include $(TOP)/configure/CONFIG_SITE.Common.$(T_A) + -include $(TOP)/configure/CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) +endif + diff --git a/KICKER/configure/CONFIG_SITE b/KICKER/configure/CONFIG_SITE new file mode 100644 index 000000000..212485ebe --- /dev/null +++ b/KICKER/configure/CONFIG_SITE @@ -0,0 +1,43 @@ +# CONFIG_SITE + +# Make any application-specific changes to the EPICS build +# configuration variables in this file. +# +# Host/target specific settings can be specified in files named +# CONFIG_SITE.$(EPICS_HOST_ARCH).Common +# CONFIG_SITE.Common.$(T_A) +# CONFIG_SITE.$(EPICS_HOST_ARCH).$(T_A) + +# CHECK_RELEASE controls the consistency checking of the support +# applications pointed to by the RELEASE* files. +# Normally CHECK_RELEASE should be set to YES. +# Set CHECK_RELEASE to NO to disable checking completely. +# Set CHECK_RELEASE to WARN to perform consistency checking but +# continue building even if conflicts are found. +CHECK_RELEASE = YES + +# Set this when you only want to compile this application +# for a subset of the cross-compiled target architectures +# that Base is built for. +#CROSS_COMPILER_TARGET_ARCHS = vxWorks-ppc32 + +# To install files into a location other than $(TOP) define +# INSTALL_LOCATION here. +#INSTALL_LOCATION= + +# Set this when the IOC and build host use different paths +# to the install location. This may be needed to boot from +# a Microsoft FTP server say, or on some NFS configurations. +#IOCS_APPL_TOP = + +# For application debugging purposes, override the HOST_OPT and/ +# or CROSS_OPT settings from base/configure/CONFIG_SITE +#HOST_OPT = NO +#CROSS_OPT = NO + +# These allow developers to override the CONFIG_SITE variable +# settings without having to modify the configure/CONFIG_SITE +# file itself. +-include $(TOP)/../CONFIG_SITE.local +-include $(TOP)/configure/CONFIG_SITE.local + diff --git a/KICKER/configure/Makefile b/KICKER/configure/Makefile new file mode 100644 index 000000000..925430940 --- /dev/null +++ b/KICKER/configure/Makefile @@ -0,0 +1,8 @@ +TOP=.. + +include $(TOP)/configure/CONFIG + +TARGETS = $(CONFIG_TARGETS) +CONFIGS += $(subst ../,,$(wildcard $(CONFIG_INSTALLS))) + +include $(TOP)/configure/RULES diff --git a/KICKER/configure/RELEASE b/KICKER/configure/RELEASE new file mode 100644 index 000000000..3561d97bc --- /dev/null +++ b/KICKER/configure/RELEASE @@ -0,0 +1,75 @@ +# RELEASE - Location of external support modules +# +# IF YOU MAKE ANY CHANGES to this file you must subsequently +# do a "gnumake rebuild" in this application's top level +# directory. +# +# The build process does not check dependencies against files +# that are outside this application, thus you should do a +# "gnumake rebuild" in the top level directory after EPICS_BASE +# or any other external module pointed to below is rebuilt. +# +# Host- or target-specific settings can be given in files named +# RELEASE.$(EPICS_HOST_ARCH).Common +# RELEASE.Common.$(T_A) +# RELEASE.$(EPICS_HOST_ARCH).$(T_A) +# +# This file is parsed by both GNUmake and an EPICS Perl script, +# so it can ONLY contain definitions of paths to other support +# modules, variable definitions that are used in module paths, +# and include statements that pull in other RELEASE files. +# Variables may be used before their values have been set. +# Build variables that are NOT used in paths should be set in +# the CONFIG_SITE file. + +# Variables and paths to dependent modules: +#MODULES = /path/to/modules +#MYMODULE = $(MODULES)/my-module + +# If using the sequencer, point SNCSEQ at its top directory: +#SNCSEQ = $(MODULES)/seq-ver + +# EPICS_BASE should appear last so earlier modules can override stuff: +EPICS_BASE = C:/Instrument/Apps/EPICS/base/master + +# Set RULES here if you want to use build rules from somewhere +# other than EPICS_BASE: +#RULES = $(MODULES)/build-rules + +# These allow developers to override the RELEASE variable settings +# without having to modify the configure/RELEASE file itself. +-include $(TOP)/../RELEASE.local +-include $(TOP)/configure/RELEASE.local + +# Macros required for basic ioc/stream device +ACCESSSECURITY=$(SUPPORT)/AccessSecurity/master +ASUBFUNCTIONS=$(SUPPORT)/asubFunctions/master +ASYN=$(SUPPORT)/asyn/master +AUTOSAVE=$(SUPPORT)/autosave/master +CALC=$(SUPPORT)/calc/master +CAPUTLOG=$(SUPPORT)/caPutLog/master +DAQMXBASE=$(SUPPORT)/DAQmxBase/master +DEVIOCSTATS=$(SUPPORT)/devIocStats/master +ICPCONFIG=$(SUPPORT)/icpconfig/master +LIBJSON=$(SUPPORT)/libjson/master +MODBUS=$(SUPPORT)/modbus/master +MYSQL=$(SUPPORT)/MySQL/master +ONCRPC=$(SUPPORT)/oncrpc/master +PCRE=$(SUPPORT)/pcre/master +PUGIXML=$(SUPPORT)/pugixml/master +PVDUMP=$(SUPPORT)/pvdump/master +SNCSEQ=$(SUPPORT)/seq/master +SQLITE=$(SUPPORT)/sqlite/master +SSCAN=$(SUPPORT)/sscan/master +STREAMDEVICE=$(SUPPORT)/StreamDevice/master +UTILITIES=$(SUPPORT)/utilities/master +ZLIB=$(SUPPORT)/zlib/master + +# optional extra local definitions here +-include $(TOP)/configure/RELEASE.private + +include $(TOP)/../../../ISIS_CONFIG +-include $(TOP)/../../../ISIS_CONFIG.$(EPICS_HOST_ARCH) + +# IOC-specific support module +KICKER=$(SUPPORT)/kicker/master diff --git a/KICKER/configure/RULES b/KICKER/configure/RULES new file mode 100644 index 000000000..6d56e14e8 --- /dev/null +++ b/KICKER/configure/RULES @@ -0,0 +1,6 @@ +# RULES + +include $(CONFIG)/RULES + +# Library should be rebuilt because LIBOBJS may have changed. +$(LIBNAME): ../Makefile diff --git a/KICKER/configure/RULES.ioc b/KICKER/configure/RULES.ioc new file mode 100644 index 000000000..901987c6c --- /dev/null +++ b/KICKER/configure/RULES.ioc @@ -0,0 +1,2 @@ +#RULES.ioc +include $(CONFIG)/RULES.ioc diff --git a/KICKER/configure/RULES_DIRS b/KICKER/configure/RULES_DIRS new file mode 100644 index 000000000..3ba269dcc --- /dev/null +++ b/KICKER/configure/RULES_DIRS @@ -0,0 +1,2 @@ +#RULES_DIRS +include $(CONFIG)/RULES_DIRS diff --git a/KICKER/configure/RULES_TOP b/KICKER/configure/RULES_TOP new file mode 100644 index 000000000..d09d668d5 --- /dev/null +++ b/KICKER/configure/RULES_TOP @@ -0,0 +1,3 @@ +#RULES_TOP +include $(CONFIG)/RULES_TOP + diff --git a/KICKER/iocBoot/Makefile b/KICKER/iocBoot/Makefile new file mode 100644 index 000000000..91e47d0b5 --- /dev/null +++ b/KICKER/iocBoot/Makefile @@ -0,0 +1,6 @@ +TOP = .. +include $(TOP)/configure/CONFIG +DIRS += $(wildcard *ioc*) +DIRS += $(wildcard as*) +include $(CONFIG)/RULES_DIRS + diff --git a/KICKER/iocBoot/iocKICKER-IOC-01/Makefile b/KICKER/iocBoot/iocKICKER-IOC-01/Makefile new file mode 100644 index 000000000..09b391227 --- /dev/null +++ b/KICKER/iocBoot/iocKICKER-IOC-01/Makefile @@ -0,0 +1,6 @@ +TOP = ../.. +include $(TOP)/configure/CONFIG +#ARCH = windows-x64 +ARCH = $(EPICS_HOST_ARCH) +TARGETS = envPaths dllPath.bat relPaths.sh runIOC.bat runIOC.sh +include $(TOP)/configure/RULES.ioc diff --git a/KICKER/iocBoot/iocKICKER-IOC-01/config.xml b/KICKER/iocBoot/iocKICKER-IOC-01/config.xml new file mode 100644 index 000000000..a2bb814a4 --- /dev/null +++ b/KICKER/iocBoot/iocKICKER-IOC-01/config.xml @@ -0,0 +1,13 @@ + + + + Kicker PSU + + + + + + + + + diff --git a/KICKER/iocBoot/iocKICKER-IOC-01/st-daq.cmd b/KICKER/iocBoot/iocKICKER-IOC-01/st-daq.cmd new file mode 100644 index 000000000..10afd2af5 --- /dev/null +++ b/KICKER/iocBoot/iocKICKER-IOC-01/st-daq.cmd @@ -0,0 +1,6 @@ +## NI cDAQ-9185 +$(IFNOTRECSIM) epicsEnvSet("CDAQAI", "$(DAQ_AI_PORT_NAME = cDAQ9185-MuonFEMod3)") + +## input +$(IFNOTRECSIM) DAQmxConfig("R0", "$(CDAQAI)/ai1", 1, "AI","N=$(NELM=1000), F=$(FREQ=1000)") ## Kicker Curr +$(IFNOTRECSIM) DAQmxConfig("R0", "$(CDAQAI)/ai0", 0, "AI","N=$(NELM=1000), F=$(FREQ=1000)") ## Kicker Volt diff --git a/KICKER/iocBoot/iocKICKER-IOC-01/st-schneider.cmd b/KICKER/iocBoot/iocKICKER-IOC-01/st-schneider.cmd new file mode 100644 index 000000000..0dee30890 --- /dev/null +++ b/KICKER/iocBoot/iocKICKER-IOC-01/st-schneider.cmd @@ -0,0 +1,53 @@ +## Modbus configuration +# drvModbusAsynConfigure("$(DEVICE)heartbeat", "$(DEVICE)", 1, 3, 649, 1, 0, 1000, "PLC") + +## RTU + +## For recsim: +$(IFRECSIM) drvAsynSerialPortConfigure("$(DEVICE):PLC", "$(PORT=NUL)", 0, 1, 0, 0) + +## For real devices +$(IFNOTRECSIM) drvAsynSerialPortConfigure("$(DEVICE):PLC","$(PORT=NO_PORT_MACRO)",0,0,0) # change this +$(IFNOTRECSIM) asynSetOption("$(DEVICE):PLC",0,"baud","9600") +$(IFNOTRECSIM) asynSetOption("$(DEVICE):PLC",0,"bits","8") +$(IFNOTRECSIM) asynSetOption("$(DEVICE):PLC",0,"parity","even") +$(IFNOTRECSIM) asynSetOption("$(DEVICE):PLC",0,"stop","1") + +# Hardware flow control +$(IFNOTRECSIM) asynSetOption("$(DEVICE):PLC",0,"clocal","N") # N enables DSR/DTR handshaking +$(IFNOTRECSIM) asynSetOption("$(DEVICE):PLC",0,"crtscts","N") + +# Softawre flow control on +$(IFNOTRECSIM) asynSetOption("$(DEVICE):PLC",0,"ixon","Y") +$(IFNOTRECSIM) asynSetOption("$(DEVICE):PLC",0,"ixoff","Y") + +## Add an asyn "interpose interface" driver. +####################################################################### +# modbusInterposeConfig(const char *portName, +# modbusLinkType linkType, .... Modbus link layer type: 0 = TCP/IP , 1 = RTU, 2 = ASCII +# int timeoutMsec, +# int writeDelayMsec) +####################################################################### +$(IFNOTRECSIM) modbusInterposeConfig($(DEVICE):PLC, 0, 0, 0) + +# Creates a modbus port driver +####################################################################### +# modbus port driver is created with the following command: +#drvModbusAsynConfigure(portName, +# tcpPortName, +# slaveAddress, +# modbusFunction, +# modbusStartAddress, +# modbusLength, +# dataType, +# pollMsec, +# plcType); +# Modbus functions: +# Read Holding Registers: 3 +####################################################################### + +$(IFNOTRECSIM) drvModbusAsynConfigure("$(DEVICE):POWER", "$(DEVICE):PLC", 1, 3, 0, 1, 0, 1000, "PLC") + + +# Load modbus record from template +dbLoadRecords("$(KICKER)/db/kicker_power.db","PVPREFIX=$(MYPVPREFIX),P=$(MYPVPREFIX)$(IOCNAME):,IFNOTRECSIM=$(IFNOTRECSIM),RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),PORT=$(DEVICE), DEVICE=$(DEVICE)") diff --git a/KICKER/iocBoot/iocKICKER-IOC-01/st.cmd b/KICKER/iocBoot/iocKICKER-IOC-01/st.cmd new file mode 100644 index 000000000..d37b70682 --- /dev/null +++ b/KICKER/iocBoot/iocKICKER-IOC-01/st.cmd @@ -0,0 +1,49 @@ +#!../../bin/windows-x64/KICKER-IOC-01 + +## You may have to change KICKER-IOC-01 to something else +## everywhere it appears in this file + +# Increase this if you get <> or discarded messages warnings in your errlog output +errlogInit2(65536, 256) + +< envPaths + +cd "${TOP}" + +## Register all support components +dbLoadDatabase "dbd/KICKER-IOC-01.dbd" +KICKER_IOC_01_registerRecordDeviceDriver pdbbase + +epicsEnvSet "STREAM_PROTOCOL_PATH" "$(KICKER)/data" +epicsEnvSet "DEVICE" "L0" + +##ISIS## Run IOC initialisation +< $(IOCSTARTUP)/init.cmd + +## Load record instances + +##ISIS## Load common DB records +< $(IOCSTARTUP)/dbload.cmd + +# Load up DB records for talking to the DAQ box +< iocBoot/iocKICKER-IOC-01/st-daq.cmd + +# Load up record for talking to the Schneider M580 PLC +< iocBoot/iocKICKER-IOC-01/st-schneider.cmd + +## Load our record instances +dbLoadRecords("$(KICKER)/db/kicker.db","PVPREFIX=$(MYPVPREFIX), ,P=$(MYPVPREFIX)$(IOCNAME):,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),PORT=$(DEVICE)") +dbLoadRecords("$(KICKER)/db/kicker_voltage.db","PVPREFIX=$(MYPVPREFIX),P=$(MYPVPREFIX)$(IOCNAME):,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),PORT=$(DEVICE),DAQMX=$(DAQMX = DAQ):,IFNOTRECSIM=$(IFNOTRECSIM),IFRECSIM=$(IFRECSIM),PSU_MAX_VOLT=$(PSU_MAX_VOLT=45),NELM=$(NELM=1000)") +dbLoadRecords("$(KICKER)/db/kicker_current.db","PVPREFIX=$(MYPVPREFIX),P=$(MYPVPREFIX)$(IOCNAME):,RECSIM=$(RECSIM=0),DISABLE=$(DISABLE=0),PORT=$(DEVICE),DAQMX=$(DAQMX = DAQ):,IFNOTRECSIM=$(IFNOTRECSIM),IFRECSIM=$(IFRECSIM),PSU_MAX_CURR=$(PSU_MAX_CURR=15),NELM=$(NELM=1000)") + +##ISIS## Stuff that needs to be done after all records are loaded but before iocInit is called +< $(IOCSTARTUP)/preiocinit.cmd + +cd "${TOP}/iocBoot/${IOC}" +iocInit + +## Start any sequence programs +#seq sncxxx,"user=olz75487" + +##ISIS## Stuff that needs to be done after iocInit is called e.g. sequence programs +< $(IOCSTARTUP)/postiocinit.cmd diff --git a/Makefile b/Makefile index 02c247d82..5432f713b 100644 --- a/Makefile +++ b/Makefile @@ -19,6 +19,7 @@ IOCDIRS += RKNDIO IOCDIRS += NGPSPSU IOCDIRS += KYNCTM3K IOCDIRS += MOXA1210 +IOCDIRS += KICKER ## check on missing directories IOCMAKES = $(wildcard */Makefile)