Cleaned up ANSTO code to merge with sinqdev.sics

This is our new RELEASE-4_0 branch which was taken from ansto/93d9a7c
Conflicts:
	.gitignore
	SICSmain.c
	asynnet.c
	confvirtualmot.c
	counter.c
	devexec.c
	drive.c
	event.h
	exebuf.c
	exeman.c
	histmem.c
	interface.h
	motor.c
	motorlist.c
	motorsec.c
	multicounter.c
	napi.c
	napi.h
	napi4.c
	network.c
	nwatch.c
	nxscript.c
	nxxml.c
	nxxml.h
	ofac.c
	reflist.c
	scan.c
	sicshipadaba.c
	sicsobj.c
	site_ansto/docs/Copyright.txt
	site_ansto/instrument/lyrebird/config/tasmad/sicscommon/nxsupport.tcl
	site_ansto/instrument/lyrebird/config/tasmad/taspub_sics/tasscript.tcl
	statusfile.c
	tasdrive.c
	tasub.c
	tasub.h
	tasublib.c
	tasublib.h

test/testini.tcl

@@ -213,6 +213,12 @@ hfactory /target plain spy none
 hfactory /target/ta3 plain internal float
 hattach target a3 /target/ta3
 
+proc upsctest {} {
+    broadcast "An update script has been called"
+    set txt [hval /instrument/title]
+    broadcast "Update to $txt"
+}
+
 restore
 
 #==================================================
@@ -387,11 +393,12 @@ hsetprop /sics/farm/schneggecon readCommand   schget
 hsetprop /sics/farm/schneggecon replyCommand  schreply
 }
 
-set farm 1
+set farm 0
 
 if {$farm == 1} {
 #-------------- Test new async protocol controller
-makesctcontroller farmser std localhost:7070
+makesctcontroller farmser std localhost:8080 
+makesctcomtask farmcom farmser
 MakeSICSObj farm TestObj
 #---------------------------
 proc farmparcom {par} {
@@ -474,7 +481,7 @@ farmser poll /sics/farm/schneggerunning
 hfactory /sics/farm/stone plain spy int  
 hsetprop /sics/farm/stone read farmparcom stone
 hsetprop /sics/farm/stone parread farmparread
-farmser poll /sics/farm/stone
+#farmser poll /sics/farm/stone
 
 farmser debug -1
 
@@ -570,7 +577,7 @@ amorhmsct poll /sics/amorhm/collapse 20
 
 #source ../sim/mars/julcho.tcl
 
-MakeSinqRedirect lnsl15 10500
+#MakeSinqRedirect lnsl15 10500
 
 MakeSingleX
 singlex configure stt a4
@@ -832,3 +839,21 @@ if {$secmot ==  1} {
     MakeSecSim eva -40 40 .3
 }
 
+
+set zwickroll 0
+
+if {$zwickroll == 1} {
+    source ../tcl/zwickroll.tcl
+#    makesctcontroller zwro std pc8977:50370 \r\n 5 \r\n
+    makesctcontroller zwro std localhost:8080 \r\n 5 \n
+    zwickroll::makezwickroll zwro
+}
+
+set sputter 0
+
+if {$sputter == 1} {
+    source ../sim/sicscommon/stddrive.tcl
+    source ../sim/amor_sics/sputter.tcl
+    SputterInit
+}
+