diff --git a/iocBoot/iocvxWorks/asynRecord.substitutions b/iocBoot/iocvxWorks/asynRecord.substitutions
index 7b753b1ea147ca76dcee82933c3f46c4f0346488..f9cc4e0636750ccbf8b6941c5422ec6a6269a746 100644
--- a/iocBoot/iocvxWorks/asynRecord.substitutions
+++ b/iocBoot/iocvxWorks/asynRecord.substitutions
@@ -19,6 +19,4 @@ pattern
{xxx: asyn_15 serial15 0 256 256}
{xxx: asyn_16 serial16 0 256 256}
{xxx: gpib1 gpib1 1 2600 2600}
-{xxx: asyn_20 serial20 0 256 256}
-{xxx: asyn_21 serial21 0 256 256}
}
diff --git a/iocBoot/iocvxWorks/canberra_1.cmd b/iocBoot/iocvxWorks/canberra_1.cmd
index 7cb536819c5ee105832b9b3156ac9a3fae95f8c7..090a08b2fc63aa358e059ce035ac890a99060b0e 100644
--- a/iocBoot/iocvxWorks/canberra_1.cmd
+++ b/iocBoot/iocvxWorks/canberra_1.cmd
@@ -1,3 +1,5 @@
+
+# BEGIN canberra_1.cmd --------------------------------------------------------
# Commands to load a single Canberra detector with ICB electronics
#mcaRecordDebug=1
#aimDebug=1
@@ -12,9 +14,9 @@
# maxSignals, # Maximum signals for this input (>1 for MCS or multiplexor)
# maxSequences, # Maximum sequences for time resolved applications
# ethernetDevice) # Ethernet device name on IOC
-# # Typically ei0 for Motorola 68K, dc0 for ppc, eth0 for Linux
-AIMConfig("AIM1/1", 0x59e, 1, 2048, 1, 1, "dc0")
-AIMConfig("AIM1/2", 0x59e, 2, 2048, 8, 1, "dc0")
+# # Typically ei0 for Motorola 68K, dc0 for ppc, fei0 for 5100, eth0 for Linux
+AIMConfig("AIM1/1", 0x9aa, 1, 2048, 1, 1, "dc0")
+AIMConfig("AIM1/2", 0x9aa, 2, 2048, 8, 1, "dc0")
dbLoadRecords("$(MCA)/mcaApp/Db/mca.db", "P=xxx:,M=aim_adc1,DTYP=asynMCA,INP=@asyn(AIM1/1 0),NCHAN=2048")
dbLoadRecords("$(MCA)/mcaApp/Db/mca.db", "P=xxx:,M=aim_adc2,DTYP=asynMCA,INP=@asyn(AIM1/2 0),NCHAN=2048")
dbLoadRecords("$(MCA)/mcaApp/Db/mca.db", "P=xxx:,M=aim_adc3,DTYP=asynMCA,INP=@asyn(AIM1/2 2),NCHAN=2048")
@@ -31,14 +33,15 @@ dbLoadRecords("$(MCA)/mcaApp/Db/mca.db", "P=xxx:,M=aim_adc5,DTYP=asynMCA,INP=@as
# 2 = HVPS
# 3 = TCA
# 4 = DSP
-icbConfig("icbAdc1", 0x59e, 5, 0)
-dbLoadRecords("$(MCA)/mcaApp/Db/icb_adc.db", "P=xxx:,ADC=adc1,PORT=icbAdc1")
-icbConfig("icbAmp1", 0x59e, 3, 1)
-dbLoadRecords("$(MCA)/mcaApp/Db/icb_amp.db", "P=xxx:,AMP=amp1,PORT=icbAmp1")
-icbConfig("icbHvps1", 0x59e, 2, 2)
-dbLoadRecords("$(MCA)/mcaApp/Db/icb_hvps.db", "P=xxx:,HVPS=hvps1,PORT=icbHvps1,LIMIT=1000")
-icbConfig("icbTca1", 0x59e, 8, 3)
-dbLoadRecords("$(MCA)/mcaApp/Db/icb_tca.db", "P=xxx:,TCA=tca1,MCA=aim_adc2,PORT=icbTca1")
+#icbConfig("icbAdc1", 0x9aa, 5, 0)
+#dbLoadRecords("$(MCA)/mcaApp/Db/icb_adc.db", "P=xxx:,ADC=adc1,PORT=icbAdc1")
+#icbConfig("icbAmp1", 0x9aa, 3, 1)
+#dbLoadRecords("$(MCA)/mcaApp/Db/icb_amp.db", "P=xxx:,AMP=amp1,PORT=icbAmp1")
+#icbConfig("icbHvps1", 0x9aa, 2, 2)
+#dbLoadRecords("$(MCA)/mcaApp/Db/icb_hvps.db", "P=xxx:,HVPS=hvps1,PORT=icbHvps1,LIMIT=1000")
+#icbConfig("icbTca1", 0x9aa, 8, 3)
+#dbLoadRecords("$(MCA)/mcaApp/Db/icb_tca.db", "P=xxx:,TCA=tca1,MCA=aim_adc2,PORT=icbTca1")
#icbConfig("icbDsp1", 0x8058, 0, 4)
#dbLoadRecords("$(MCA)/mcaApp/Db/icbDsp.db", "P=xxx:,DSP=dsp1,PORT=icbDsp1")
+# END canberra_1.cmd ----------------------------------------------------------
diff --git a/iocBoot/iocvxWorks/canberra_13.cmd b/iocBoot/iocvxWorks/canberra_13.cmd
index f026ee9cc505247a91cf310c00c4b7e3bc218ce6..cd46c1995024323f02c2775aa9d76f7c088a8057 100644
--- a/iocBoot/iocvxWorks/canberra_13.cmd
+++ b/iocBoot/iocvxWorks/canberra_13.cmd
@@ -1,3 +1,6 @@
+
+# BEGIN canberra_13.cmd -------------------------------------------------------
+
# AIMConfig(portName, ethernet_address, portNumber, maxChans,
# maxSignals, maxSequences, ethernetDevice)
# portName, # asyn port name to be created
@@ -15,3 +18,5 @@ AIMConfig("AIM3/2", 0x903, 2, 4000, 4, 1, "ei0")
dbLoadRecords("$(MCA)/mcaApp/Db/13element.db","P=xxx:med:")
dbLoadTemplate("canberra_13Element.substitutions")
+
+# END canberra_13.cmd ---------------------------------------------------------
diff --git a/iocBoot/iocvxWorks/st.cmd b/iocBoot/iocvxWorks/st.cmd
index 14b1b154a11c6bb60a50baa2ab9da602bed20026..7b17abd511cf8abcbe73e2c8edecb11c688b5a93 100644
--- a/iocBoot/iocvxWorks/st.cmd
+++ b/iocBoot/iocvxWorks/st.cmd
@@ -76,6 +76,9 @@ dbLoadRecords("$(STD)/stdApp/Db/all_com_16.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.)
@@ -111,7 +114,8 @@ dbLoadRecords("$(OPTICS)/opticsApp/Db/2slit.db","P=xxx:,SLIT=Slit1H,mXp=m5,mXn=m
### Optical tables
#tableRecordDebug=1
-dbLoadRecords("$(OPTICS)/opticsApp/Db/table.db","P=xxx:,Q=Table1,T=table1,M0X=m1,M0Y=m2,M1Y=m3,M2X=m4,M2Y=m5,M2Z=m6,GEOM=SRI")
+putenv "DIR=$(OPTICS)/opticsApp/Db"
+dbLoadRecords("$(DIR)/table.db","P=xxx:,Q=Table1,T=table1,M0X=m1,M0Y=m2,M1Y=m3,M2X=m4,M2Y=m5,M2Z=m6,GEOM=SRI")
### Monochromator support ###
# Kohzu and PSL monochromators: Bragg and theta/Y/Z motors
@@ -178,15 +182,6 @@ dbLoadTemplate("vxStats.substitutions")
### Queensgate Nano2k piezo controller
#dbLoadRecords("$(STD)/stdApp/Db/Nano2k.db","P=xxx:,S=s1")
-### Bit Bus configuration
-# BBConfig(Link, LinkType, BaseAddr, IrqVector, IrqLevel)
-# Link: ?
-# LinkType: 0:hosed; 1:xycom; 2:pep
-#BBConfig(3,1,0x2400,0xac,5)
-
-# Slow feedback
-#dbLoadTemplate("pid_slow.substitutions")
-
###############################################################################
# Set shell prompt (otherwise it is left at mv167 or mv162)
shellPromptSet "iocvxWorks> "
@@ -221,16 +216,7 @@ create_monitor_set("auto_positions.req",5,"P=xxx:")
create_monitor_set("auto_settings.req",30,"P=xxx:")
### Start the saveData task.
-# saveData_MessagePolicy
-# 0: wait forever for space in message queue, then send message
-# 1: send message only if queue is not full
-# 2: send message only if queue is not full and specified time has passed (SetCptWait()
-# sets this time.)
-# 3: if specified time has passed, wait for space in queue, then send message
-# else: don't send message
-#debug_saveData = 20
saveData_Init("saveData.req", "P=xxx:")
-#saveData_PrintScanInfo("xxx:scan1")
# If memory allocated at beginning free it now
free(mem)