From 00593fc74d9f4ebc65ed09bd72f4efc4a63f72ea Mon Sep 17 00:00:00 2001
From: Keenan Lang <klang@aps.anl.gov>
Date: Thu, 25 Aug 2016 11:41:24 -0500
Subject: [PATCH] Changed softScaler support to softScaler.iocsh
---
iocBoot/iocxxx/common.iocsh | 3 +++
iocBoot/iocxxx/common/softScaler.cmd | 6 ------
iocBoot/iocxxx/st.cmd.Cygwin | 3 ---
iocBoot/iocxxx/st.cmd.Linux | 3 ---
iocBoot/iocxxx/st.cmd.Win32 | 3 ---
5 files changed, 3 insertions(+), 15 deletions(-)
delete mode 100644 iocBoot/iocxxx/common/softScaler.cmd
diff --git a/iocBoot/iocxxx/common.iocsh b/iocBoot/iocxxx/common.iocsh
index 1a4f21a..6b9b078 100644
--- a/iocBoot/iocxxx/common.iocsh
+++ b/iocBoot/iocxxx/common.iocsh
@@ -85,6 +85,9 @@ dbLoadTemplate("$(PLATFORM)/scanParms.substitutions")
< common/calc.iocsh
+# Soft scaler for testing
+#iocshLoad("$(STD)/iocsh/softScaler.iocsh", "P=$(PREFIX), INSTANCE=scaler1")
+
# Soft function generator
#dbLoadRecords("$(CALC)/calcApp/Db/FuncGen.db","P=$(PREFIX),Q=fgen,OUT=$(PREFIX)m7.VAL")
diff --git a/iocBoot/iocxxx/common/softScaler.cmd b/iocBoot/iocxxx/common/softScaler.cmd
deleted file mode 100644
index b5a1d9d..0000000
--- a/iocBoot/iocxxx/common/softScaler.cmd
+++ /dev/null
@@ -1,6 +0,0 @@
-# soft scaler
-dbLoadRecords("$(ASYN)/db/asynRecord.db","P=$(PREFIX),R=asynScaler,PORT=scaler1Port,ADDR=0,OMAX=0,IMAX=0")
-# drvScalerSoftConfigure(char *portName, int maxChans, char *pvTemplate)
-drvScalerSoftConfigure("scaler1Port", 8, "$(PREFIX)scaler1:s%d")
-dbLoadRecords("$(STD)/stdApp/Db/scaler.db","P=$(PREFIX),S=scaler1,OUT=@asyn(scaler1Port 0 0),DTYP=Asyn Scaler,FREQ=10000000")
-dbLoadRecords("$(STD)/stdApp/Db/scalerSoftCtrl.db","P=$(PREFIX),Q=scaler1:,SCALER=$(PREFIX)scaler1")
diff --git a/iocBoot/iocxxx/st.cmd.Cygwin b/iocBoot/iocxxx/st.cmd.Cygwin
index 395f9e5..fa19fed 100644
--- a/iocBoot/iocxxx/st.cmd.Cygwin
+++ b/iocBoot/iocxxx/st.cmd.Cygwin
@@ -18,9 +18,6 @@ epicsEnvSet("PLATFORM", "softioc")
# < $(PLATFORM)/areaDetector.cmd
# < $(PLATFORM)/serial.cmd
-# soft scaler for testing
-< common/softScaler.cmd
-
< common/motorSim.cmd
# devIocStats
diff --git a/iocBoot/iocxxx/st.cmd.Linux b/iocBoot/iocxxx/st.cmd.Linux
index 610e96c..12014b7 100644
--- a/iocBoot/iocxxx/st.cmd.Linux
+++ b/iocBoot/iocxxx/st.cmd.Linux
@@ -17,9 +17,6 @@ epicsEnvSet("PLATFORM", "softioc")
# < $(PLATFORM)/serial.cmd
-# soft scaler for testing
-< common/softScaler.cmd
-
< common/motorSim.cmd
# devIocStats
diff --git a/iocBoot/iocxxx/st.cmd.Win32 b/iocBoot/iocxxx/st.cmd.Win32
index 979ff51..001fddf 100644
--- a/iocBoot/iocxxx/st.cmd.Win32
+++ b/iocBoot/iocxxx/st.cmd.Win32
@@ -17,9 +17,6 @@ epicsEnvSet("PLATFORM", "softioc")
# < $(PLATFORM)/serial.cmd
-# soft scaler for testing
-< common/softScaler.cmd
-
< common/motorSim.cmd
# devIocStats
--
GitLab