Merge branch 'el737' into amorsim

Port the fix to the el737 driver into this branch

sinqEPICSApp/src/sinq.dbd

@@ -2,21 +2,21 @@
 # SINQ specific DB definitions
 #---------------------------------------------
 registrar(EL734Register) 
-registrar(PhytronRegister) 
 registrar(NanotecRegister) 
-registrar(pmacControllerRegister) 
-
-#--------------------------------------------------------
-# With the PSI module build system, including these items actually 
-# hurts. It causes missing symbols when loading the shared lib. 
-#------------------------------------------------------------------ 
-#include "/ioc/modules/asyn/427.0.1/R3.14.12/dbd/asyn.dbd"
-#include "/ioc/modules/motorBase/6.9.12/R3.14.12/dbd/motorBase.dbd"
-#include "/ioc/modules/SynApps/1.13.0/R3.14.12/dbd/SynApps.dbd"
-#include "/ioc/modules/scaler/koennecke/R3.14.12/dbd/scaler.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 "synAppsStd.dbd"
 device(scaler,INST_IO,devScalerEL737,"asynScalerEL737")
 
-#--------- For lakeshore and magnets
-#include "/ioc/modules/stream/2.7.9/R3.14.12/dbd/stream.dbd"
-#include "busy.dbd"
+#--------- For lakeshore
+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"