diff --git a/iocBoot/iocUnix/13element.cmd b/iocBoot/iocUnix/13element.cmd index 631f648514ff53805b25ef7bd6e119fe60de15e4..95ad588ce24abe9336980ba4b46be7231111e034 100644 --- a/iocBoot/iocUnix/13element.cmd +++ b/iocBoot/iocUnix/13element.cmd @@ -1,9 +1,9 @@ # AIMConfig(serverName, int etherAddr, int port, int maxChans, # int maxSignals, int maxSequences, etherDev, queueSize) -AIMConfig("AIM2/1", 0x98c, 1, 4000, 4, 1, "ei0", 100) -AIMConfig("AIM2/2", 0x98d, 2, 4000, 4, 1, "ei0", 100) -AIMConfig("AIM3/1", 0x98b, 1, 4000, 4, 1, "ei0", 100) -AIMConfig("AIM3/2", 0x903, 2, 4000, 4, 1, "ei0", 100) +AIMConfig("AIM2/1", 0x98c, 1, 4000, 4, 1, "eth0", 100) +AIMConfig("AIM2/2", 0x98d, 2, 4000, 4, 1, "eth0", 100) +AIMConfig("AIM3/1", 0x98b, 1, 4000, 4, 1, "eth0", 100) +AIMConfig("AIM3/2", 0x903, 2, 4000, 4, 1, "eth0", 100) -dbLoadRecords("mcaApp/Db/13element.db","P=xxx:med:,N=2000", mca) -dbLoadTemplate("13element.substitutions", mca) +dbLoadRecords("$(MCA)/mcaApp/Db/13element.db","P=xxx:med:,N=2000") +dbLoadTemplate("13element.substitutions") diff --git a/iocBoot/iocUnix/3element.cmd b/iocBoot/iocUnix/3element.cmd index 738afd8628a3302ce2d718059eeca0c86b81cc1e..26890ee040889e5578943e777ee67d4bfce1591c 100644 --- a/iocBoot/iocUnix/3element.cmd +++ b/iocBoot/iocUnix/3element.cmd @@ -1,8 +1,8 @@ # AIMConfig(serverName, int etherAddr, int port, int maxChans, # int maxSignals, int maxSequences, etherDev, queueSize) -AIMConfig("AIM1/1", 0xa78, 1, 2048, 1, 1, "ei0", 100) -AIMConfig("AIM1/2", 0xa78, 2, 2048, 1, 1, "ei0", 100) -AIMConfig("AIM2/1", 0xa79, 1, 2048, 1, 1, "ei0", 100) +AIMConfig("AIM1/1", 0xa78, 1, 2048, 1, 1, "eth0", 100) +AIMConfig("AIM1/2", 0xa78, 2, 2048, 1, 1, "eth0", 100) +AIMConfig("AIM2/1", 0xa79, 1, 2048, 1, 1, "eth0", 100) -dbLoadRecords("mcaApp/Db/3element.db","P=xxx:med:,N=2000", mca) -dbLoadTemplate("3element.substitutions", mca) +dbLoadRecords("$(MCA)/mcaApp/Db/3element.db","P=xxx:med:,N=2000") +dbLoadTemplate("3element.substitutions") diff --git a/iocBoot/iocUnix/scanParms.substitutions b/iocBoot/iocUnix/scanParms.substitutions index 8621589442266ded2b2dec8a170851978d99141a..cfe432b88291e917e8b9a8a6b493e024bf2a8d78 100644 --- a/iocBoot/iocUnix/scanParms.substitutions +++ b/iocBoot/iocUnix/scanParms.substitutions @@ -1,4 +1,4 @@ -file "$(STD)/db/scanParms.db" +file "$(SSCAN)/sscanApp/Db/scanParms.db" { {P=xxx:,SCANREC=xxx:scan1,Q=m1,POS=$(Q).VAL,RDBK=$(Q).RBV} {P=xxx:,SCANREC=xxx:scan1,Q=m2,POS=$(Q).VAL,RDBK=$(Q).RBV} @@ -8,14 +8,6 @@ file "$(STD)/db/scanParms.db" {P=xxx:,SCANREC=xxx:scan1,Q=m6,POS=$(Q).VAL,RDBK=$(Q).RBV} {P=xxx:,SCANREC=xxx:scan1,Q=m7,POS=$(Q).VAL,RDBK=$(Q).RBV} {P=xxx:,SCANREC=xxx:scan1,Q=m8,POS=$(Q).VAL,RDBK=$(Q).RBV} -{P=xxx:,SCANREC=xxx:scan1,Q=m9,POS=$(Q).VAL,RDBK=$(Q).RBV} -{P=xxx:,SCANREC=xxx:scan1,Q=m10,POS=$(Q).VAL,RDBK=$(Q).RBV} -{P=xxx:,SCANREC=xxx:scan1,Q=m11,POS=$(Q).VAL,RDBK=$(Q).RBV} -{P=xxx:,SCANREC=xxx:scan1,Q=m12,POS=$(Q).VAL,RDBK=$(Q).RBV} -{P=xxx:,SCANREC=xxx:scan1,Q=m13,POS=$(Q).VAL,RDBK=$(Q).RBV} -{P=xxx:,SCANREC=xxx:scan1,Q=m14,POS=$(Q).VAL,RDBK=$(Q).RBV} -{P=xxx:,SCANREC=xxx:scan1,Q=m15,POS=$(Q).VAL,RDBK=$(Q).RBV} -{P=xxx:,SCANREC=xxx:scan1,Q=m16,POS=$(Q).VAL,RDBK=$(Q).RBV} {P=xxx:,SCANREC=xxx:scan1,Q=Table1X,POS=table1.X,RDBK=table1.XRB} {P=xxx:,SCANREC=xxx:scan1,Q=Table1Y,POS=table1.Y,RDBK=table1.YRB}