Merge branch 'ess'

This commit is contained in:
2017-05-17 11:23:50 +02:00
19 changed files with 498 additions and 54 deletions

View File

@@ -17,15 +17,15 @@ sinqEPICS_DBD += base.dbd
# Include dbd files from all support applications:
sinqEPICS_DBD += sinq.dbd
sinqEPICS_DBD += pmacAsynIPPort.dbd pmacAsynMotorPort.dbd
#sinqEPICS_DBD += pmacAsynIPPort.dbd pmacAsynMotorPort.dbd
# Add all the support libraries needed by this IOC
sinqEPICS_LIBS += motor asyn std anc350 anc350AsynMotor stream busy
sinqEPICS_LIBS += motor asyn busy synAppsStd streamdevice pcre
# sinqEPICS_registerRecordDeviceDriver.cpp derives from sinqEPICS.dbd
sinqEPICS_SRCS += sinqEPICS_registerRecordDeviceDriver.cpp
sinqEPICS_SRCS += EL734Driver.cpp devScalerEL737.c pmacAsynIPPort.c
sinqEPICS_SRCS += pmacController.cpp pmacAxis.cpp
sinqEPICS_SRCS += EL734Driver.cpp
sinqEPICS_SRCS += devScalerEL737.c
sinqEPICS_SRCS += NanotecDriver.cpp stptok.cpp
sinqEPICS_SRCS += PhytronDriver.cpp

View File

@@ -4,6 +4,6 @@ record(scaler,"")
field(NAME,"NZ:counter")
field(DESC,"NARZIS EL737 counter")
field(DTYP,"asynScalerEL737")
field(OUT,"INST_IO @asyn(cter1,0)"
field(OUT,"INST_IO @asyn(cter1,0)")
}

View File

@@ -4,21 +4,20 @@
registrar(EL734Register)
registrar(PhytronRegister)
registrar(NanotecRegister)
addpath "/usr/local/epics/support/asyn-4-18/dbd"
addpath "/usr/local/epics/dbd"
addpath "/usr/local/epics/support/motor-6-7/dbd"
addpath "/usr/local/epics/support/std-3-1/dbd"
addpath "/usr/local/epics/anc350v17/dbd"
include "drvAsynIPPort.dbd"
include "motorRecord.dbd"
include "motorSupport.dbd"
include "anc350AsynMotor.dbd"
addpath "/opt/epics/modules/asyn/4.27.0/3.14.12.5/dbd"
addpath "/opt/epics/bases/base-3.14.12.5/dbd"
addpath "/opt/epics/modules/motor/6.10.0/3.14.12.5/dbd"
#addpath "/usr/local/epics/support/std-3-1/dbd"
addpath "/opt/epics/modules/synAppsStd/3.4.1/3.14.12.5/dbd"
include "asyn.dbd"
include "motor.dbd"
#include "motorSupport.dbd"
include "scalerRecord.dbd"
include "synAppsStd.dbd"
device(scaler,INST_IO,devScalerEL737,"asynScalerEL737")
#--------- For lakeshore
addpath "/usr/local/epics/support/StreamDevice-2-6/dbd"
include "stream.dbd"
addpath "/usr/local/epics/support/busy-1-4/dbd"
include "busySupport.dbd"
addpath "/opt/epics/modules/streamdevice/2.6.0/3.14.12.5/dbd"
include "streamdevice.dbd"
addpath "/opt/epics/modules/busy/1.6.0/3.14.12.5/dbd"
include "busy.dbd"