merge refactoring with EMU2

.gitignore

@@ -2,4 +2,5 @@
 *\#
 .\#*
 *.swp
-builddir\*
+builddir/*
+*.lock*

db/EMU_VME.substitutions

@@ -512,5 +512,3 @@ file ecat2slave.template
 		{"LNS-ISRC-010:PBI-EM","EL4104","EL4104",2,""}
 		{"LNS-ISRC-010:PBI-EM","ES3164","ES3164",1,""}
 }
-
-

opi/Scripts/PlcOpi.js

@@ -4,16 +4,16 @@ var pv0 = PVUtil.getString(pvs[0]);
 
 if (pv0 == "home") {
 	widget.setPropertyValue("opi_file", "");
-	widget.setPropertyValue("opi_file", "/CSS/emu-plc-test/1-Home.opi");
+	widget.setPropertyValue("opi_file", "/CSS/emu-plc/1-Home.opi");
 } else if (pv0 == "fm123") {
 	widget.setPropertyValue("opi_file", "");
-	widget.setPropertyValue("opi_file", "/CSS/emu-plc-test/2-FM1,2,3.opi");
+	widget.setPropertyValue("opi_file", "/CSS/emu-plc/2-FM1,2,3.opi");
 } else if (pv0 == "fm45") {
 	widget.setPropertyValue("opi_file", "");
-	widget.setPropertyValue("opi_file", "/CSS/emu-plc-test/3-FM4,5.opi");
+	widget.setPropertyValue("opi_file", "/CSS/emu-plc/3-FM4,5.opi");
 } else if (pv0 == "InOut") {
 	widget.setPropertyValue("opi_file", "");
-	widget.setPropertyValue("opi_file", "/CSS/emu-plc-test/4-Inout_value.opi");
+	widget.setPropertyValue("opi_file", "/CSS/emu-plc/4-Inout_value.opi");
 } else {
 	pv0 = "home";
 }
\ No newline at end of file

startup/EMU-IPC.cmd

+require emu-plc, 0.1.0
+require emu-motor, 0.1.0
+
+
+# Set environmental variables
+epicsEnvSet("ASYN_PORT",        "GEOBRICK_ASYN")
+epicsEnvSet("PMAC_IP", 	        "10.2.76.225") 
+# Catnae: 10.10.3.42
+epicsEnvSet("PMAC_PORT",        "1025")
+
+
+# fonctions from TPMAC
+# Connection to GEOBRICK, create a asyn port
+pmacAsynIPConfigure($(ASYN_PORT), $(PMAC_IP):$(PMAC_PORT))
+
+# s7plcConfigure (PLCname, IPaddr, port, inSize, outSize, bigEndian, recvTimeout, sendIntervall)
+s7plcConfigure ("plc", "10.10.2.3", 2000, 40, 6, 1, 1000, 500)
+
+# load PLC database
+dbLoadRecords("input.db")
+dbLoadRecords("output.db")
+
+
+# load PMAC (geobrick) database
+dbLoadRecords("get_value_pmac.db")
+dbLoadRecords("set_value_pmac.db")
+dbLoadRecords("console.db")
+
+# communication between PLC and PMAC (Geobrick)
+dbLoadRecords("set_bo_PLC.db")
+dbLoadRecords("set_bo_pmac.db")
+
+