From 2fac33f011ca7dfd6c43516cbc19587708ff44c1 Mon Sep 17 00:00:00 2001
From: kpetersn <kmpeters@anl.gov>
Date: Tue, 9 Apr 2019 11:42:21 -0500
Subject: [PATCH] Improved the example IOC

---
 iocs/acsIOC/acsApp/src/Makefile               |  6 ++++--
 .../iocBoot/iocAcs/motor.substitutions.mcb4b  |  2 +-
 iocs/acsIOC/iocBoot/iocAcs/st.cmd             | 19 +++++++++++--------
 iocs/acsIOC/iocBoot/iocAcs/st.cmd.mcb4b       | 13 ++++++++-----
 4 files changed, 24 insertions(+), 16 deletions(-)

diff --git a/iocs/acsIOC/acsApp/src/Makefile b/iocs/acsIOC/acsApp/src/Makefile
index 4feaf3c..08f5d2b 100644
--- a/iocs/acsIOC/acsApp/src/Makefile
+++ b/iocs/acsIOC/acsApp/src/Makefile
@@ -21,12 +21,14 @@ acs_DBD += base.dbd
 # Include dbd files from all support applications:
 #ifdef ASYN
 acs_DBD += asyn.dbd
+acs_DBD += drvAsynSerialPort.dbd
+acs_DBD += drvAsynIPPort.dbd
 #endif
 acs_DBD += motorSupport.dbd
-acs_DBD += devAcs.dbd
+acs_DBD += devAcsMotor.dbd
 
 # Add all the support libraries needed by this IOC
-acs_LIBS += acs
+acs_LIBS += Acs
 acs_LIBS += motor
 #ifdef ASYN
 acs_LIBS += asyn
diff --git a/iocs/acsIOC/iocBoot/iocAcs/motor.substitutions.mcb4b b/iocs/acsIOC/iocBoot/iocAcs/motor.substitutions.mcb4b
index efb3f85..de1d732 100644
--- a/iocs/acsIOC/iocBoot/iocAcs/motor.substitutions.mcb4b
+++ b/iocs/acsIOC/iocBoot/iocAcs/motor.substitutions.mcb4b
@@ -1,4 +1,4 @@
-file "$(TOP)/db/basic_asyn_motor.db"
+file "$(MOTOR)/db/basic_asyn_motor.db"
 {
 pattern
 {P,    N,   M,         DTYP,     PORT, ADDR,  DESC,     EGU,   DIR,   VELO,  VBAS, ACCL, BDST, BVEL, BACC,    MRES, PREC,   DHLM, DLLM, INIT}
diff --git a/iocs/acsIOC/iocBoot/iocAcs/st.cmd b/iocs/acsIOC/iocBoot/iocAcs/st.cmd
index b3bb6d2..af417e4 100644
--- a/iocs/acsIOC/iocBoot/iocAcs/st.cmd
+++ b/iocs/acsIOC/iocBoot/iocAcs/st.cmd
@@ -1,8 +1,5 @@
 #!../../bin/linux-x86_64/acs
 
-## You may have to change acs to something else
-## everywhere it appears in this file
-
 < envPaths
 
 cd "${TOP}"
@@ -11,11 +8,17 @@ cd "${TOP}"
 dbLoadDatabase "dbd/acs.dbd"
 acs_registerRecordDeviceDriver pdbbase
 
-## Load record instances
-#dbLoadRecords("db/xxx.db","user=kpetersn")
-
 cd "${TOP}/iocBoot/${IOC}"
+
+
+## motorUtil (allstop & alldone)
+dbLoadRecords("$(MOTOR)/db/motorUtil.db", "P=acs:")
+
+##
+
 iocInit
 
-## Start any sequence programs
-#seq sncxxx,"user=kpetersn"
+## motorUtil (allstop & alldone)
+motorUtilInit("acs:")
+
+# Boot complete
diff --git a/iocs/acsIOC/iocBoot/iocAcs/st.cmd.mcb4b b/iocs/acsIOC/iocBoot/iocAcs/st.cmd.mcb4b
index 7c18b1b..d072557 100644
--- a/iocs/acsIOC/iocBoot/iocAcs/st.cmd.mcb4b
+++ b/iocs/acsIOC/iocBoot/iocAcs/st.cmd.mcb4b
@@ -1,11 +1,14 @@
 #errlogInit(5000)
 < envPaths
-# Tell EPICS all about the record types, device-support modules, drivers,
-# etc. in this build from CARS
-dbLoadDatabase("../../dbd/WithAsyn.dbd")
-WithAsyn_registerRecordDeviceDriver(pdbbase)
 
-drvAsynIPPortConfigure("serial1", "164.54.160.36:4002",0,0,0)
+# Tell EPICS all about the record types, device-support modules, drivers, etc.
+dbLoadDatabase("../../dbd/acs.dbd")
+acs_registerRecordDeviceDriver(pdbbase)
+
+# Port 2 on a Moxa
+drvAsynIPPortConfigure("serial1", "192.168.1.16:4002",0,0,0)
+# Local serial port
+#!drvAsynSerialPortConfigure("serial1", "/dev/ttyS0", 0, 0, 0)
 asynOctetSetInputEos("serial1",0,"\r")
 asynOctetSetOutputEos("serial1",0,"\r")
 asynSetTraceIOMask("serial1", 0, 2)