Cleaned up test ioc

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")

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:
     }
 }

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:-"

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")
+}

ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/MTEST-PC-X10_startup.script

@@ -1,4 +0,0 @@
-# Softioc for testing the XEC Java Code
-
-# Load test template
-dbLoadTemplate("MTEST-PC-X10_test.subs")

ch.psi.fda/src/test/ioc/X/MTEST-PC-X10/test.template

@@ -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")

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";