From 758d680a2b41c4b2396bd1b61e8894247a37cbb7 Mon Sep 17 00:00:00 2001 From: ebner Date: Fri, 21 Oct 2011 15:56:02 +0200 Subject: [PATCH] Cleaned up test ioc --- .../App/config/scripts/medm.sh} | 0 .../MTEST-PC-FDA/MTEST-PC-FDA_startup.script | 2 + .../MTEST-PC-FDA_test.subs} | 2 +- .../X/{MTEST-PC-X10 => MTEST-PC-FDA}/Makefile | 6 +- .../src/test/ioc/X/MTEST-PC-FDA/test.template | 42 ++++++++++++++ .../MTEST-PC-X10/MTEST-PC-X10_startup.script | 4 -- .../src/test/ioc/X/MTEST-PC-X10/test.template | 55 ------------------- .../test/java/ch/psi/fda/TestChannels.java | 12 ++-- 8 files changed, 53 insertions(+), 70 deletions(-) rename ch.psi.fda/src/test/ioc/X/{MTEST-PC-X10/App/config/scripts/testmedms.sh => MTEST-PC-FDA/App/config/scripts/medm.sh} (100%) create mode 100644 ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_startup.script rename ch.psi.fda/src/test/ioc/X/{MTEST-PC-X10/MTEST-PC-X10_test.subs => MTEST-PC-FDA/MTEST-PC-FDA_test.subs} (57%) rename ch.psi.fda/src/test/ioc/X/{MTEST-PC-X10 => MTEST-PC-FDA}/Makefile (61%) create mode 100644 ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/test.template delete mode 100644 ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/MTEST-PC-X10_startup.script delete mode 100644 ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/test.template diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/App/config/scripts/testmedms.sh b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/App/config/scripts/medm.sh similarity index 100% rename from ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/App/config/scripts/testmedms.sh rename to ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/App/config/scripts/medm.sh diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_startup.script b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_startup.script new file mode 100644 index 0000000..22df3e8 --- /dev/null +++ b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_startup.script @@ -0,0 +1,2 @@ +# Load test template +dbLoadTemplate("MTEST-PC-FDA_test.subs") diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/MTEST-PC-X10_test.subs b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_test.subs similarity index 57% rename from ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/MTEST-PC-X10_test.subs rename to ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_test.subs index fac1540..3e27546 100644 --- a/ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/MTEST-PC-X10_test.subs +++ b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/MTEST-PC-FDA_test.subs @@ -1,5 +1,5 @@ file test.template { { - P = MTEST-PC-X10: + P = MTEST-PC-FDA: } } diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/Makefile b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/Makefile similarity index 61% rename from ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/Makefile rename to ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/Makefile index 8cccfd6..ff9276a 100644 --- a/ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/Makefile +++ b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/Makefile @@ -1,6 +1,4 @@ -# $Header: /cvs/X/XASEC/ch.psi.x10/testioc/X/MTEST-PC-X10/Makefile,v 1.1 2010/08/20 11:54:13 ebner Exp $ - -MODULE = MTEST-PC-X10 +MODULE = MTEST-PC-FDA export MODULE build: @@ -8,7 +6,7 @@ build: clean: install: build - swit -V -ioc MTEST-PC-X10 + swit -V -ioc MTEST-PC-FDA help: @echo "The following targets are available with this Makefile:-" diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/test.template b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/test.template new file mode 100644 index 0000000..e4850fb --- /dev/null +++ b/ch.psi.fda/src/test/ioc/X/MTEST-PC-FDA/test.template @@ -0,0 +1,42 @@ +# Binary Output +record(bo, "$(P)BO") { + field(DESC, "Binary Output") +} + +# Binary Output +record(bo, "$(P)BO2") { + field(DESC, "Binary Output 2") + field(VAL, "0") +} + +# Analog Output +record(ao, "$(P)AO") { + field(PREC, "6") + field(DESC, "Analog Output") +} + +# String Output +record(stringout, "$(P)SOUT") { +} + +# Double Waveform (100 Elements) +record(waveform, "$(P)DWAVE") { + field(DESC, "Double Waveform") + field(PREC, "6") + field(NELM, "100") + field(FTVL, "DOUBLE") +} + +# Integer Waveform (100 Elements) +record(waveform, "$(P)LWAVE") { + field(DESC, "Long Waveform") + field(NELM, "100") + field(FTVL, "LONG") +} + +# Character Waveform (100 Elements) +record(waveform, "$(P):CWAVE") { + field(DESC, "Character Waveform") + field(NELM, "100") + field(FTVL, "CHAR") +} diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/MTEST-PC-X10_startup.script b/ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/MTEST-PC-X10_startup.script deleted file mode 100644 index 7853d60..0000000 --- a/ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/MTEST-PC-X10_startup.script +++ /dev/null @@ -1,4 +0,0 @@ -# Softioc for testing the XEC Java Code - -# Load test template -dbLoadTemplate("MTEST-PC-X10_test.subs") diff --git a/ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/test.template b/ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/test.template deleted file mode 100644 index b7107e6..0000000 --- a/ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/test.template +++ /dev/null @@ -1,55 +0,0 @@ -#! Generated by VisualDCT v2.6 -#! DBDSTART -#! DBDEND - - -record(bo, "$(P)BO") { - field(DESC, "Binary Out Record") -} - -# Test analog out record -record(ao, "$(P)AO") { - field(PREC, "6") - field(DESC, "Analog Out Record") -} - -# Double waveform with a precision of 6 -record(waveform, "$(P)DWF") { - field(DESC, "Double Waveform") - field(PREC, "6") - field(NELM, "100") - field(FTVL, "DOUBLE") -} - -# Integer (long) waveform -record(waveform, "$(P)LWF") { - field(DESC, "Long Waveform") - field(NELM, "100") - field(FTVL, "LONG") -} - -# Character waveform of the size 100 -record(waveform, "$(P):CWF") { - field(DESC, "Character Waveform") - field(NELM, "100") - field(FTVL, "CHAR") -} - -# Stringout test record -record(stringout, "$(P)SOUT") { -} - -record(bo, "$(P)BO2") { - field(DESC, "Binary Out Record") - field(VAL, "0") -} - -#! Further lines contain data used by VisualDCT -#! View(0,0,1.0) -#! Record("$(P)BO",20,10,0,1,"$(P)BO") -#! Record("$(P)AO",200,16,0,1,"$(P)AO") -#! Record("$(P)DWF",20,168,0,1,"$(P)DWF") -#! Record("$(P)LWF",220,162,0,1,"$(P)LWF") -#! Record("$(P):CWF",420,162,0,1,"$(P):CWF") -#! Record("$(P)SOUT",380,23,0,1,"$(P)SOUT") -#! Record("$(P)BO2",20,296,0,1,"$(P)BO2") diff --git a/ch.psi.fda/src/test/java/ch/psi/fda/TestChannels.java b/ch.psi.fda/src/test/java/ch/psi/fda/TestChannels.java index fca5fda..c8cf942 100644 --- a/ch.psi.fda/src/test/java/ch/psi/fda/TestChannels.java +++ b/ch.psi.fda/src/test/java/ch/psi/fda/TestChannels.java @@ -23,12 +23,12 @@ package ch.psi.fda; * */ public class TestChannels { - public static final String BINARY_OUT = "MTEST-PC-X10:BO"; - public static final String BINARY_OUT_TWO = "MTEST-PC-X10:BO2"; - public static final String ANALOG_OUT = "MTEST-PC-X10:AO"; - public static final String STRING_OUT = "MTEST-PC-X10:SOUT"; - public static final String DOUBLE_WAVEFORM = "MTEST-PC-X10:DWF"; - public static final String STRING_OUT_NOT_EXIST = "MTEST-PC-X10:SOUT-NOT-EXIST"; + public static final String BINARY_OUT = "MTEST-PC-FDA:BO"; + public static final String BINARY_OUT_TWO = "MTEST-PC-FDA:BO2"; + public static final String ANALOG_OUT = "MTEST-PC-FDA:AO"; + public static final String STRING_OUT = "MTEST-PC-FDA:SOUT"; + public static final String DOUBLE_WAVEFORM = "MTEST-PC-FDA:DWAVE"; + public static final String STRING_OUT_NOT_EXIST = "MTEST-PC-FDA:SOUT-NOT-EXIST"; public static final String MOTOR_ONE = "MTEST-HW3:MOT1";