From 708b7ffeb3963f95319a467fdb824afb6459962d Mon Sep 17 00:00:00 2001
From: timmmooney <mooney@aps.anl.gov>
Date: Thu, 15 Jan 2009 21:56:10 +0000
Subject: [PATCH] *** empty log message ***
---
iocBoot/iocvxWorks/Makefile | 2 +-
iocBoot/iocvxWorks/asynRecord.substitutions | 2 +-
iocBoot/iocvxWorks/auto_settings.req | 2 +-
iocBoot/iocvxWorks/st.cmd | 29 +++-------
iocBoot/iocvxWorks/vme.cmd | 12 ++--
xxxApp/op/adl/xxx.adl | 64 +++------------------
6 files changed, 25 insertions(+), 86 deletions(-)
diff --git a/iocBoot/iocvxWorks/Makefile b/iocBoot/iocvxWorks/Makefile
index 509badf..4cccabb 100644
--- a/iocBoot/iocvxWorks/Makefile
+++ b/iocBoot/iocvxWorks/Makefile
@@ -1,5 +1,5 @@
TOP = ../..
include $(TOP)/configure/CONFIG
-ARCH = vxWorks-ppc604
+ARCH = vxWorks-ppc604_long
TARGETS = cdCommands
include $(TOP)/configure/RULES.ioc
diff --git a/iocBoot/iocvxWorks/asynRecord.substitutions b/iocBoot/iocvxWorks/asynRecord.substitutions
index 1b36e05..163e119 100644
--- a/iocBoot/iocvxWorks/asynRecord.substitutions
+++ b/iocBoot/iocvxWorks/asynRecord.substitutions
@@ -10,5 +10,5 @@ pattern
{xxx: asyn_6 serial6 0 2600 2600}
{xxx: asyn_7 serial7 0 256 256}
{xxx: asyn_8 serial8 0 256 256}
-{xxx: gpib1 gpib1 1 2600 2600}
+#{xxx: gpib1 gpib1 1 2600 2600}
}
diff --git a/iocBoot/iocvxWorks/auto_settings.req b/iocBoot/iocvxWorks/auto_settings.req
index b6ce197..2c1fda0 100644
--- a/iocBoot/iocvxWorks/auto_settings.req
+++ b/iocBoot/iocvxWorks/auto_settings.req
@@ -61,7 +61,7 @@ file scanParms_settings.req P=$(P),M=SM10
file table_settings.req P=$(P),T=table1,Q=Table1
-file scaler_16ch_settings.req P=$(P),S=scaler1
+file scaler16m_settings.req P=$(P),S=scaler1
#file scaler_8ch_settings.req P=$(P),S=scaler2
#file scaler_64ch_settings.req P=$(P),S=scaler3
diff --git a/iocBoot/iocvxWorks/st.cmd b/iocBoot/iocvxWorks/st.cmd
index a3d21a6..c686333 100644
--- a/iocBoot/iocvxWorks/st.cmd
+++ b/iocBoot/iocvxWorks/st.cmd
@@ -28,8 +28,8 @@ sysCplusEnable=1
##mem = malloc(1024*1024*96)
### Load synApps EPICS software
-ld < xxx.munch
-
+### doesn't work for tornado 2.2.2 ### ld < xxx.munch
+ld(0,0,"xxx.munch")
cd startup
# Increase size of buffer for error logging from default 1256
@@ -52,29 +52,22 @@ recDynLinkQsize = 1024
################################################################################
# Tell EPICS all about the record types, device-support modules, drivers,
# etc. in the software we just loaded (xxx.munch)
-dbLoadDatabase("../../dbd/iocxxxVX.dbd")
+dbLoadDatabase("$(TOP)/dbd/iocxxxVX.dbd")
iocxxxVX_registerRecordDeviceDriver(pdbbase)
-# test ramp output
-dbLoadRecords("$(STD)/stdApp/Db/ramp_tweak.db","P=xxx:,Q=LaserDelay")
+# user-assignable ramp/tweak
dbLoadRecords("$(STD)/stdApp/Db/ramp_tweak.db","P=xxx:,Q=rt1")
-# ASRP table
-#dbLoadRecords("$(OPTICS)/opticsApp/Db/ASRPmirrorTable.db","P=xxx:,TBL=mt1,VERT=xxx:m7,PITCH=xxx:m8")
-
-# Spare busy record
-#dbLoadRecords("$(TOP)/xxxApp/Db/busy.db","P=xxx:")
-
### save_restore setup
# We presume a suitable initHook routine was compiled into xxx.munch.
# See also create_monitor_set(), after iocInit() .
< save_restore.cmd
# Industry Pack support
-#< industryPack.cmd
+< industryPack.cmd
# serial support
-#< serial.cmd
+< serial.cmd
# gpib support
#< gpib.cmd
@@ -100,14 +93,10 @@ dbLoadRecords("$(MOTOR)/db/motorUtil.db", "P=xxx:")
### Insertion-device control
#dbLoadRecords("$(STD)/stdApp/Db/IDctrl.db","P=xxx:,xx=02us")
-# sample-wheel
-#dbLoadRecords("$(STD)/stdApp/Db/sampleWheel.db", "P=xxx:,ROWMOTOR=xxx:m7,ANGLEMOTOR=xxx:m8")
-
### Scan-support software
# crate-resident scan. This executes 1D, 2D, 3D, and 4D scans, and caches
# 1D data, but it doesn't store anything to disk. (See 'saveData' below for that.)
-putenv "MP=MAXPTS"
-dbLoadRecords("$(SSCAN)/sscanApp/Db/standardScans.db","P=xxx:,$(MP)1=8000,$(MP)2=1000,$(MP)3=1000,$(MP)4=1000,$(MP)H=8000")
+dbLoadTemplate("standardScans.substitutions")
dbLoadRecords("$(SSCAN)/sscanApp/Db/saveData.db","P=xxx:")
# A set of scan parameters for each positioner. This is a convenience
@@ -178,10 +167,6 @@ dbLoadRecords("$(CALC)/calcApp/Db/userStringCalcs10.db","P=xxx:")
aCalcArraySize=2000
dbLoadRecords("$(CALC)/calcApp/Db/userArrayCalcs10.db","P=xxx:,N=2000")
dbLoadRecords("$(CALC)/calcApp/Db/userTransforms10.db","P=xxx:")
-# individually disabled transforms
-dbLoadRecords("$(CALC)/calcApp/Db/transforms10.db","P=xxx:,N=1")
-# extra userCalcs (must also load userCalcs10.db for the enable switch)
-#dbLoadRecords("$(CALC)/calcApp/Db/userCalcN.db","P=xxx:,N=I_Detector")
dbLoadRecords("$(CALC)/calcApp/Db/userAve10.db","P=xxx:")
# string sequence (sseq) records
dbLoadRecords("$(STD)/stdApp/Db/userStringSeqs10.db","P=xxx:")
diff --git a/iocBoot/iocvxWorks/vme.cmd b/iocBoot/iocvxWorks/vme.cmd
index c9d3bb1..ef2b43a 100644
--- a/iocBoot/iocvxWorks/vme.cmd
+++ b/iocBoot/iocvxWorks/vme.cmd
@@ -7,13 +7,13 @@
# (1)cards, (2)base address(short, 16-byte boundary),
# (3)interrupt vector (0=disable or 64 - 255), (4)interrupt level (1 - 6),
# (5)motor task polling rate (min=1Hz,max=60Hz)
-#!omsSetup(2, 0xFC00, 180, 5, 10)
+omsSetup(2, 0xFC00, 180, 5, 10)
# OMS VME58 driver setup parameters:
# (1)cards, (2)base address(short, 4k boundary),
# (3)interrupt vector (0=disable or 64 - 255), (4)interrupt level (1 - 6),
# (5)motor task polling rate (min=1Hz,max=60Hz)
-#!oms58Setup(2, 0x4000, 190, 5, 10)
+oms58Setup(2, 0x4000, 190, 5, 10)
# OMS MAXv driver setup parameters:
# (1)number of cards in array.
@@ -40,9 +40,9 @@
#!MAXvConfig(0, config0)
### Scalers: Joerger VSC8/16
-dbLoadRecords("$(STD)/stdApp/Db/scaler16.db","P=xxx:,S=scaler1,OUT=#C0 S0 @,DTYP=Joerger VSC8/16,FREQ=10000000")
+#dbLoadRecords("$(STD)/stdApp/Db/scaler.db","P=xxx:,S=scaler1,OUT=#C1 S0 @,DTYP=Joerger VSC8/16,FREQ=10000000")
# scaler database with modified calcs (user calcs for all 16 channels)
-dbLoadRecords("$(STD)/stdApp/Db/scaler16m.db","P=xxx:,S=scaler2,OUT=#C1 S0 @,DTYP=Joerger VSC8/16,FREQ=10000000")
+dbLoadRecords("$(STD)/stdApp/Db/scaler16m.db","P=xxx:,S=scaler1,OUT=#C0 S0 @,DTYP=Joerger VSC8/16,FREQ=10000000")
# Joerger VSC setup parameters:
# (1)cards, (2)base address(ext, 256-byte boundary),
# (3)interrupt vector (0=disable or 64 - 255)
@@ -53,9 +53,9 @@ VSCSetup(2, 0xB0000000, 200)
# char *addrs, /* address (0x800-0xf800, 2048-byte (0x800) boundary) */
# unsigned vector, /* valid vectors(64-255) */
# int intlevel)
-scalerVS_Setup(1, 0x2000, 205, 5)
+#scalerVS_Setup(1, 0x2000, 205, 5)
#devScaler_VSDebug=0
-dbLoadRecords("$(STD)/stdApp/Db/scaler16m.db","P=xxx:,S=scaler3,OUT=#C0 S0 @, DTYP=Joerger VS, FREQ=10000000")
+#dbLoadRecords("$(STD)/stdApp/Db/scaler16m.db","P=xxx:,S=scaler3,OUT=#C0 S0 @, DTYP=Joerger VS, FREQ=10000000")
# Heidenhain IK320 VME encoder interpolator
#dbLoadRecords("$(VME)/vmeApp/Db/IK320card.db","P=xxx:,sw2=card0:,axis=1,switches=41344,irq=3")
diff --git a/xxxApp/op/adl/xxx.adl b/xxxApp/op/adl/xxx.adl
index 5508529..f298aa1 100644
--- a/xxxApp/op/adl/xxx.adl
+++ b/xxxApp/op/adl/xxx.adl
@@ -5,8 +5,8 @@ file {
}
display {
object {
- x=522
- y=25
+ x=551
+ y=57
width=470
height=156
}
@@ -386,7 +386,7 @@ display {
}
display[0] {
label="Scaler 1"
- name="scaler16.adl"
+ name="scaler16m.adl"
args="P=xxx:,S=scaler1"
}
display[1] {
@@ -1417,7 +1417,12 @@ composite {
display[2] {
label="Slit 1 Graphic"
name="4slitGraphic.adl"
- args="P=xxx:,SLIT=Slit_1,H=Slit1H,V=Slit1V"
+ args="P=xxx:,SLIT=Slit_1,H=Slit1H,mXp=m3,mXn=m4,V=Slit1V,mYp=m5,mYn=m6"
+ }
+ display[3] {
+ label="Slit Motors"
+ name="motor4x.adl"
+ args="P=xxx:,M1=m3,M2=m4,M3=m5,M4=m6"
}
display[4] {
label="Slit 2 (H) (soft)"
@@ -1573,54 +1578,3 @@ composite {
bclr=17
label="-TempCtrl"
}
-"related display" {
- object {
- x=350
- y=0
- width=50
- height=20
- }
- display[0] {
- label="dig delay GigaBaudics"
- name="digDelay.adl"
- args="P=xxx:,Q=digDly1:,T=GigaBaudics"
- }
- display[1] {
- label="dig delay PPS100"
- name="digDelay.adl"
- args="P=xxx:,Q=digDlyPPS:,T=PPS_0"
- }
- clr=0
- bclr=17
- label="-digDelay"
-}
-"related display" {
- object {
- x=400
- y=0
- width=50
- height=20
- }
- display[0] {
- label="test"
- name="test.adl"
- args="P=xxx:"
- }
- display[1] {
- label="test Composite"
- name="testC.adl"
- args="P=xxx:"
- }
- display[2] {
- label="test_grabbag"
- name="newDisplay.adl"
- args="P=xxx:"
- }
- display[3] {
- label="llnl_slit"
- name="llnl_slit.adl"
- }
- clr=0
- bclr=17
- label="-test"
-}
--
GitLab