From 6edda36bfc6c5f6bc1b2d7ccf4c53e914bf3301c Mon Sep 17 00:00:00 2001
From: MarkRivers <rivers@cars.uchicago.edu>
Date: Wed, 18 Feb 2004 02:16:09 +0000
Subject: [PATCH] Update from 3.13 tree
---
iocBoot/iocvxWorks/auto_settings.req | 104 +++++++++++-------------
iocBoot/iocvxWorks/bootParms | 34 ++++++--
iocBoot/iocvxWorks/picMot.substitutions | 28 +++++++
3 files changed, 101 insertions(+), 65 deletions(-)
diff --git a/iocBoot/iocvxWorks/auto_settings.req b/iocBoot/iocvxWorks/auto_settings.req
index 1473d39..c886d0b 100644
--- a/iocBoot/iocvxWorks/auto_settings.req
+++ b/iocBoot/iocvxWorks/auto_settings.req
@@ -1,5 +1,8 @@
# Note: the macro P must have been supplied to the routine that parses
-# this file. This requires save_restore v2.8 or later.
+# this file. Normally, this means a command like the following is in st.cmd
+# create_monitor_set("auto_settings.req",30,"P=xxx:")
+# This requires save_restore v2.8 or later.
+
file motor_settings.req P=$(P),M=m1
file motor_settings.req P=$(P),M=m2
file motor_settings.req P=$(P),M=m3
@@ -45,65 +48,46 @@ file scan_settings.req P=$(P),S=scan4
file scan_settings.req P=$(P),S=scanH
# Kohzu monochromator
-#$(P)BraggHAO.VAL
-#$(P)BraggKAO.VAL
-#$(P)BraggLAO.VAL
-#$(P)BraggAAO.VAL
-#$(P)BraggTypeMO.VAL
-#$(P)KohzuMode2MO.VAL
-#$(P)Kohzu_yOffsetAO.VAL
+file kohzuSeq_settings.req P=$(P)
# High resolution monochromator
-#$(P)HR1_A1AO.VAL
-#$(P)HR1_H1AO.VAL
-#$(P)HR1_K1AO.VAL
-#$(P)HR1_L1AO.VAL
-#$(P)HR1_A2AO.VAL
-#$(P)HR1_H2AO.VAL
-#$(P)HR1_K2AO.VAL
-#$(P)HR1_L2AO.VAL
-#$(P)HR1_EAO.VAL
-#$(P)HR1_Mode2MO.VAL
-#$(P)HR1_phi1OffAO
-#$(P)HR1_phi2OffAO
-#$(P)HR1_ETweakAI
-#$(P)HR1_LambdaTweakAI
-#$(P)HR1_Theta1TweakAI
-#$(P)HR1_Theta2TweakAI
-#$(P)HR1_worldTweakAI
+file hrSeq_settings.req P=$(P),N=1
file userCalcs10_settings.req P=$(P)
file userCalcN_settings.req P=$(P),N=I_Detector
-#$(P)fltr1:name5.VAL
-#$(P)fltr1:name4.VAL
-#$(P)fltr1:name3.VAL
-#$(P)fltr1:name2.VAL
-#$(P)fltr1:name1.VAL
-#$(P)fltr1:nameHome.VAL
-#$(P)fltr1:pos5.VAL
-#$(P)fltr1:pos4.VAL
-#$(P)fltr1:pos3.VAL
-#$(P)fltr1:pos2.VAL
-#$(P)fltr1:pos1.VAL
-#$(P)fltr1:posHome.VAL
-#$(P)fltr1:motorOut.OUTN
-#$(P)fltr2:name5.VAL
-#$(P)fltr2:name4.VAL
-#$(P)fltr2:name3.VAL
-#$(P)fltr2:name2.VAL
-#$(P)fltr2:name1.VAL
-#$(P)fltr2:nameHome.VAL
-#$(P)fltr2:pos5.VAL
-#$(P)fltr2:pos4.VAL
-#$(P)fltr2:pos3.VAL
-#$(P)fltr2:pos2.VAL
-#$(P)fltr2:pos1.VAL
-#$(P)fltr2:posHome.VAL
-#$(P)fltr2:motorOut.OUTN
-#$(P)fltr_1_2:lockOut.OUTN
-
-file saveData_settings.req P=$(P)
+$(P)fltr1:name5.VAL
+$(P)fltr1:name4.VAL
+$(P)fltr1:name3.VAL
+$(P)fltr1:name2.VAL
+$(P)fltr1:name1.VAL
+$(P)fltr1:nameHome.VAL
+$(P)fltr1:pos5.VAL
+$(P)fltr1:pos4.VAL
+$(P)fltr1:pos3.VAL
+$(P)fltr1:pos2.VAL
+$(P)fltr1:pos1.VAL
+$(P)fltr1:posHome.VAL
+$(P)fltr1:motorOut.OUTN
+$(P)fltr2:name5.VAL
+$(P)fltr2:name4.VAL
+$(P)fltr2:name3.VAL
+$(P)fltr2:name2.VAL
+$(P)fltr2:name1.VAL
+$(P)fltr2:nameHome.VAL
+$(P)fltr2:pos5.VAL
+$(P)fltr2:pos4.VAL
+$(P)fltr2:pos3.VAL
+$(P)fltr2:pos2.VAL
+$(P)fltr2:pos1.VAL
+$(P)fltr2:posHome.VAL
+$(P)fltr2:motorOut.OUTN
+$(P)fltr_1_2:lockOut.OUTN
+
+$(P)saveData_fileSystem
+$(P)saveData_subDir
+$(P)saveData_scanNumber
+$(P)saveData_realTime1D
file userTransforms10_settings.req P=$(P)
@@ -120,7 +104,11 @@ file auto_4step_settings.req P=$(P),Q=4step
file userAve10_settings.req P=$(P)
-$(P):R_CA
-$(P):R_FD
-$(P):R_Load
-$(P):R_Mem
+# MCA
+file mca_settings.req P=$(P),M=mca1
+file icb_adc_settings.req P=$(P),ADC=icbAdc1
+#file icb_amp_settings.req P=$(P),ADC=adcMP=amp1
+#file icb_hvps_settings.req P=$(P),HVPS=icbHvps1
+#file icb_tca_settings.req P=$(P),TCA=icbTca1
+#file icbDsp_settings.req P=$(P),DSP=icbDsp1
+#file simple_mca_settings.req P=$(P),M=mca1
diff --git a/iocBoot/iocvxWorks/bootParms b/iocBoot/iocvxWorks/bootParms
index 89703a3..cf3c725 100644
--- a/iocBoot/iocvxWorks/bootParms
+++ b/iocBoot/iocvxWorks/bootParms
@@ -1,14 +1,34 @@
-boot device : dc0
+EPICS processor
+===============
+
+boot device : ei
processor number : 0
+host name : oxygen
+file name : /usr/local/vxWorks/T202/mv162-asd1
+inet on ethernet (e) : 164.54.53.99:fffffc00
+inet on backplane (b): 164.54.53.226
+host inet (h) : 164.54.52.4
+user (u) : <user>
+ftp password (pw) : <password>
+flags (f) : 0x0
+target name (tn) : iocxxx
+startup script (s) : /home/oxygen4/MOONEY/epics/synApps_4_6/support/xxx/iocBoot/iocxxx_162/st.cmd
+
+
+MPF processor
+=============
+
+boot device : sm=0x800006000
+processor number : 1
host name : oxygen
-file name : /usr/local/vxWorks/T202/mv2700-asd6
-inet on ethernet (e) : 164.54.53.99:fffffc00
-inet on backplane (b):
+file name :
+inet on ethernet (e) :
+inet on backplane (b): 164.54.53.183
host inet (h) : 164.54.52.4
-gateway inet (g) :
+gateway inet (g) : 164.54.53.226
user (u) : <user>
ftp password (pw) (blank = use rsh): <password>
flags (f) : 0x0
-target name (tn) : ioctmm
-startup script (s) : /home/oxygen/MOONEY/epics/synApps_4_6/ioc/tmm/iocBoot/ioctmm/st.cmd
+target name (tn) : ioctim1
+startup script (s) : /home/oxygen/MOONEY/epics/synApps_4_6/support/xxx/iocBoot/iocxxx_162/st1.cmd
other (o) :
diff --git a/iocBoot/iocvxWorks/picMot.substitutions b/iocBoot/iocvxWorks/picMot.substitutions
index 6bd85f0..fd76a50 100644
--- a/iocBoot/iocvxWorks/picMot.substitutions
+++ b/iocBoot/iocvxWorks/picMot.substitutions
@@ -5,5 +5,33 @@ pattern
{xxx:, 111, pMotor111, 1 }
{xxx:, 112, pMotor112, 1 }
{xxx:, 113, pMotor113, 1 }
+
+{xxx:, 121, pMotor121, 1 }
+{xxx:, 122, pMotor122, 1 }
+{xxx:, 123, pMotor123, 1 }
+
+{xxx:, 131, pMotor131, 1 }
+{xxx:, 132, pMotor132, 1 }
+{xxx:, 133, pMotor133, 1 }
+
+{xxx:, 141, pMotor141, 1 }
+{xxx:, 142, pMotor142, 1 }
+{xxx:, 143, pMotor143, 1 }
+
+{xxx:, 211, pMotor211, 1 }
+{xxx:, 212, pMotor212, 1 }
+{xxx:, 213, pMotor213, 1 }
+
+{xxx:, 221, pMotor221, 1 }
+{xxx:, 222, pMotor222, 1 }
+{xxx:, 223, pMotor223, 1 }
+
+{xxx:, 231, pMotor231, 1 }
+{xxx:, 232, pMotor232, 1 }
+{xxx:, 233, pMotor233, 1 }
+
+{xxx:, 241, pMotor241, 1 }
+{xxx:, 242, pMotor242, 1 }
+{xxx:, 243, pMotor243, 1 }
}
--
GitLab