From cd971e411e13e2cbe8bb3d9299e84101e89be48e Mon Sep 17 00:00:00 2001
From: timmmooney <mooney@aps.anl.gov>
Date: Fri, 20 Mar 2009 21:19:45 +0000
Subject: [PATCH] *** empty log message ***
---
iocBoot/iocvxWorks/Makefile | 2 +-
iocBoot/iocvxWorks/bootParms | 23 +++++++++++-----------
iocBoot/iocvxWorks/scanParms.substitutions | 5 +++++
3 files changed, 18 insertions(+), 12 deletions(-)
diff --git a/iocBoot/iocvxWorks/Makefile b/iocBoot/iocvxWorks/Makefile
index 200ef04..4cccabb 100644
--- a/iocBoot/iocvxWorks/Makefile
+++ b/iocBoot/iocvxWorks/Makefile
@@ -1,5 +1,5 @@
TOP = ../..
include $(TOP)/configure/CONFIG
-ARCH = vxWorks-ppc604_long-debug
+ARCH = vxWorks-ppc604_long
TARGETS = cdCommands
include $(TOP)/configure/RULES.ioc
diff --git a/iocBoot/iocvxWorks/bootParms b/iocBoot/iocvxWorks/bootParms
index 1f13c8b..e951cc2 100644
--- a/iocBoot/iocvxWorks/bootParms
+++ b/iocBoot/iocvxWorks/bootParms
@@ -1,30 +1,31 @@
EPICS processor: mv2700
=======================
-
-boot device : dc
+boot device : dc0
processor number : 0
-host name : oxygen [wheaties, ozone]
-file name : /usr/local/vxWorks/T202/mv2700-asd7
-inet on ethernet (e) : 164.54.53.99:fffffc00
+host name : ozone
+file name : /usr/local/vxWorks/T222/mv2700-asd1
+inet on ethernet (e) : 164.54.53.99:fffffc00
inet on backplane (b):
-host inet (h) : 164.54.52.4 [164.54.53.101, 164.54.53.4]
+host inet (h) : 164.54.53.4
+gateway inet (g) :
user (u) : <user>
ftp password (pw) : <password>
flags (f) : 0x0
-target name (tn) : iocxxx
-startup script (s) : /home/oxygen4/MOONEY/epics/synApps/support/xxx/iocBoot/iocvxWorks/st.cmd
+target name (tn) : iocxxx
+startup script (s) : /home/oxygen4/MOONEY/epics/synApps/support/xxx/iocBoot/iocvxWorks/st.cmd
+other (o) :
EPICS processor: mv5100
=======================
boot device : fei0
processor number : 0
-host name : oxygen
-file name : /usr/local/vxWorks/T202/mv5100-asd7
+host name : ozone
+file name : /usr/local/vxWorks/T222/mv2700-asd1
inet on ethernet (e) : 164.54.53.99:fffffc00
inet on backplane (b):
-host inet (h) : 164.54.52.4
+host inet (h) : 164.54.53.4
user (u) : <user>
ftp password (pw) : <password>
flags (f) : 0x0
diff --git a/iocBoot/iocvxWorks/scanParms.substitutions b/iocBoot/iocvxWorks/scanParms.substitutions
index 8db1cc2..668888b 100644
--- a/iocBoot/iocvxWorks/scanParms.substitutions
+++ b/iocBoot/iocvxWorks/scanParms.substitutions
@@ -49,6 +49,11 @@ file "$(SSCAN)/sscanApp/Db/scanParms.db"
{P=xxx:SGM1:,SCANREC=xxx:scan1,Q=Lambda,POS=Lambda,RDBK=LambdaRBV}
{P=xxx:SGM1:,SCANREC=xxx:scan1,Q=phi,POS=phi,RDBK=phiRBV}
+# multilayer monochromator
+{P=xxx:,SCANREC=xxx:scan1,Q=ml_monoE,POS=ml_monoE.VAL,RDBK=ml_monoERdbk.VAL}
+{P=xxx:,SCANREC=xxx:scan1,Q=ml_monoLambda,POS=ml_monoLambda.VAL,RDBK=ml_monoLambdaRdbk.VAL}
+{P=xxx:,SCANREC=xxx:scan1,Q=ml_monoTheta,POS=ml_monoTheta.VAL,RDBK=ml_monoThetaRdbk.VAL}
+
# Mirror
{P=xxx:,SCANREC=xxx:scan1,Q=M1dn,POS=M1dn,RDBK=M1t2.A}
{P=xxx:,SCANREC=xxx:scan1,Q=M1up,POS=M1up,RDBK=M1t2.B}
--
GitLab