From bdab02588fdc356b1baa8b42df6ffeb3ac6e4a05 Mon Sep 17 00:00:00 2001
From: Keenan Lang <klang@aps.anl.gov>
Date: Mon, 18 Sep 2017 14:47:05 -0500
Subject: [PATCH] Update to take advantage of changes to ipUnidig and dac128v
---
iocBoot/iocxxx/examples/dac128V.cmd | 13 ---------
iocBoot/iocxxx/examples/industryPack.cmd | 9 +++---
iocBoot/iocxxx/examples/ipUnidig.cmd | 28 -------------------
.../substitutions/dac128V.substitutions | 18 ++++++------
4 files changed, 13 insertions(+), 55 deletions(-)
delete mode 100644 iocBoot/iocxxx/examples/dac128V.cmd
delete mode 100644 iocBoot/iocxxx/examples/ipUnidig.cmd
diff --git a/iocBoot/iocxxx/examples/dac128V.cmd b/iocBoot/iocxxx/examples/dac128V.cmd
deleted file mode 100644
index 538d69d..0000000
--- a/iocBoot/iocxxx/examples/dac128V.cmd
+++ /dev/null
@@ -1,13 +0,0 @@
-
-# BEGIN dac128V.cmd -----------------------------------------------------------
-
-# Initialize Systran DAC
-# initDAC128V(char *portName, int carrier, int slot)
-# portName = name to give this asyn port
-# carrier = IPAC carrier number (0, 1, etc.)
-# slot = IPAC slot (0,1,2,3, etc.)
-initDAC128V("DAC1", 0, 3)
-
-dbLoadTemplate("substitutions/dac128V.substitutions", "P=$(PREFIX)")
-
-# END dac128V.cmd -------------------------------------------------------------
diff --git a/iocBoot/iocxxx/examples/industryPack.cmd b/iocBoot/iocxxx/examples/industryPack.cmd
index 9a8b211..3cd4f2c 100644
--- a/iocBoot/iocxxx/examples/industryPack.cmd
+++ b/iocBoot/iocxxx/examples/industryPack.cmd
@@ -70,18 +70,17 @@ iocshLoad("$(IP)/iocsh/loadSerialComm.iocsh", "PREFIX=$(PREFIX), PORT=serial0:,
#Loads asyn records for serial2:0 through serial2:7, calls them asyn_9 through asyn_16 for user compatibility
#iocshLoad("$(IP)/iocsh/loadSerialComm.iocsh", "PREFIX=$(PREFIX), PORT=serial1:, INSTANCE0=asyn_9, INSTANCE1=asyn_10, INSTANCE2=asyn_11, INSTANCE3=asyn_12, INSTANCE4=asyn_13, INSTANCE5=asyn_14, INSTANCE6=asyn_15, INSTANCE7=asyn_16")
+# SBS IpUnidig digital I/O
+#iocshLoad("$(IPUNIDIG)/iocsh/ipUnidig.iocsh", "PREFIX=$(PREFIX), PORT=Unidig1, CARRIER=0, SLOT=1, INT_VEC=116, RISE_MASK=0xfffffb, FALL_MASK=0xfffffb, SCAN_POLL=2000, SUB=substitutions/ipUnidig.substitutions")
# user programmable glue electronics (requires Acromag IP-EP20x)
#< softGlue.iocsh
-# Systran DAC128V
-#< dac128V.cmd
-
# Analog I/O (Acromag IP330 ADC)
#< ip330.cmd
-# SBS IpUnidig digital I/O
-#< ipUnidig.cmd
+# Systran DAC128V
+#iocshLoad("$(DAC128V)/iocsh/dac128V.iocsh", "PREFIX=$(PREFIX), PORT=DAC1, CARRIER=0, SLOT=3, SUB=substitutions/dac128V.substitutions")
# gpib support
#< gpib.cmd
diff --git a/iocBoot/iocxxx/examples/ipUnidig.cmd b/iocBoot/iocxxx/examples/ipUnidig.cmd
deleted file mode 100644
index 90b2230..0000000
--- a/iocBoot/iocxxx/examples/ipUnidig.cmd
+++ /dev/null
@@ -1,28 +0,0 @@
-
-# BEGIN ipUnidig.cmd ----------------------------------------------------------
-
-# Initialize Greenspring IP-Unidig
-# initIpUnidig(char *portName,
-# int carrier,
-# int slot,
-# int msecPoll,
-# int intVec,
-# int risingMask,
-# int fallingMask)
-# portName = name to give this asyn port
-# carrier = IPAC carrier number (0, 1, etc.)
-# slot = IPAC slot (0,1,2,3, etc.)
-# msecPoll = polling time for input bits that don't use interrupts in msec.
-# intVec = interrupt vector
-# risingMask = mask of bits to generate interrupts on low to high (24 bits)
-# fallingMask = mask of bits to generate interrupts on high to low (24 bits)
-
-# Note: We have the quadEM connected to channel 3 (starting from 1). Its driver will
-# enable interrupts on one edge of the pulses, so we don't need to do it here. All other
-# inputs generate interrupts on both rising and falling edge
-initIpUnidig("Unidig1", 0, 1, 2000, 116, 0xfffffb, 0xfffffb)
-
-# IP-Unidig binary I/O
-dbLoadTemplate("substitutions/ipUnidig.substitutions", "P=$(PREFIX), PORT=Unidig1")
-
-# END ipUnidig.cmd ------------------------------------------------------------
diff --git a/iocBoot/iocxxx/substitutions/dac128V.substitutions b/iocBoot/iocxxx/substitutions/dac128V.substitutions
index 0c7d51a..e12f562 100644
--- a/iocBoot/iocxxx/substitutions/dac128V.substitutions
+++ b/iocBoot/iocxxx/substitutions/dac128V.substitutions
@@ -1,16 +1,16 @@
file "$(DAC128V)/dac128VApp/Db/singleDAC.db"
{pattern
-{D, N, S, PORT, EGUL, EGUF, DRVL, DRVH, LOPR, HOPR, PREC, LINR, VAL}
+{N, S, EGUL, EGUF, DRVL, DRVH, LOPR, HOPR, PREC, LINR, VAL}
# Channel 1 is in volts, -10 to 10, with drive limits full range
-{3, 1, 0, DAC1, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
+{1, 0, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
# Channel 2 is in volts, -10 to 10, but only allow driving 0 to 10
-{3, 2, 1, DAC1, -10, 10, 0, 10, 0, 10, 3, "LINEAR", 0}
+{2, 1, -10, 10, 0, 10, 0, 10, 3, "LINEAR", 0}
# Channel 3 is in percent of full scale, only allow driving 0 to 100%
-{3, 3, 2, DAC1, -100, 100, 0, 100, 0, 100, 3, "LINEAR", 0}
+{3, 2, -100, 100, 0, 100, 0, 100, 3, "LINEAR", 0}
# Remaing channels are in volts
-{3, 4, 3, DAC1, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
-{3, 5, 4, DAC1, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
-{3, 6, 5, DAC1, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
-{3, 7, 6, DAC1, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
-{3, 8, 7, DAC1, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
+{4, 3, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
+{5, 4, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
+{6, 5, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
+{7, 6, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
+{8, 7, -10, 10, -10, 10, -10, 10, 3, "LINEAR", 0}
}
--
GitLab