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/sicsstat.tcl

@@ -1,11 +1,12 @@
 
+
 exe batchpath ./
 exe syspath ./
 
 #--- BEGIN (commands producing errors on last restore)
 #--- END (commands producing errors on last restore)
 
-lotte UNKNOWN
+lotte bloerzx
 lotte setAccess 2
 # Motor brumm
 brumm sign 1.000000
@@ -45,12 +46,6 @@ lieselotte SetMode Timer
 # Counter multi
 multi SetPreset 0.000000
 multi SetMode Timer
-sicsdatapath ./
-sicsdatapath setAccess 1
-sicsdataprefix regression
-sicsdataprefix setAccess 1
-sicsdatapostfix .dat
-sicsdatapostfix setAccess 1
 # Motor a1
 a1 sign 1.000000
 a1 SoftZero 0.000000
@@ -212,7 +207,7 @@ tasub outofplane 1
 tasub const  ki
 tasub ss 1
  tasub setub 1.000000 0.000000 0.000000  0.000000 1.000000 0.000000  0.000000 0.000000 1.000000
- tasub setnormal 0.000000 0.000000 0.000000
+ tasub setnormal 0.000000 0.000000 1.000000
 tasub settarget 0.000000 0.000000 0.000000 0.000000  0.000000 0.000000
 tasub r1   0.00   0.00   0.00   0.00   0.00   0.00   0.00   0.00   0.00
 tasub r2   0.00   0.00   0.00   0.00   0.00   0.00   0.00   0.00   0.00
@@ -221,9 +216,6 @@ tasub update
 sa recovernampos noeff  a3 24 a4 48
 
 
-
-
-
 ref anglesheader stt,om,chi,phi
 ref clear
 singlex cell { 0 0 0 0 0 0}
@@ -270,11 +262,11 @@ simidx anglim 0.5
 simi preset 0
 simi mode monitor
 
-eva targetposition 5
-eva sign -1
-eva softzero -2
-eva softlowerlim -38
-eva softupperlim 38
+eva targetposition 0
+eva sign 1
+eva softzero 0
+eva softlowerlim -40
+eva softupperlim 40
 eva fixed -1
 eva interruptmode 0
 eva precision 0.01
@@ -283,5 +275,5 @@ eva failafter 3
 eva maxretry 3
 eva ignorefault 0
 eva movecount 10
-eva staticoffset -3
+eva staticoffset 0
 

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