From ad2b41fef236eb889d91510a755a26f19117c999 Mon Sep 17 00:00:00 2001
From: Dan Bartlett <dbx@ansto.gov.au>
Date: Mon, 24 Sep 2007 11:10:59 +1000
Subject: [PATCH] no message

r2149 | dbx | 2007-09-24 11:10:59 +1000 (Mon, 24 Sep 2007) | 2 lines
---
 .../instrument/sans/DMC2280/controller1.txt   | 26 +++----
 .../instrument/sans/DMC2280/controller2.txt   | 58 ++++++++--------
 .../instrument/sans/DMC2280/controller3.txt   | 68 ++++++++++---------
 .../instrument/sans/DMC2280/controller4.txt   | 37 +++++-----
 4 files changed, 97 insertions(+), 92 deletions(-)

diff --git a/site_ansto/instrument/sans/DMC2280/controller1.txt b/site_ansto/instrument/sans/DMC2280/controller1.txt
index fd45618f..fe77d5c1 100644
--- a/site_ansto/instrument/sans/DMC2280/controller1.txt
+++ b/site_ansto/instrument/sans/DMC2280/controller1.txt
@@ -1,17 +1,17 @@
 NO TE: QUOKKA - CONTROLLER 1
 NO TE:
-NO TE: $Revision: 1.7 $
-NO TE: $Date: 2007-08-23 05:47:30 $
+NO TE: $Revision: 1.8 $
+NO TE: $Date: 2007-09-24 01:10:59 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
 NO TE: A-SAMPLE UPPER TILT
 NO TE: B-SAMPLE LOWER TILT
-NO TE: C-SAMPLE TRANSLATION Y (ALONG BEAM)
-NO TE: D-SAMPLE TRANSLATION X (ACROSS BEAM)
+NO TE: C-SAMPLE TRANSLATION X (ACROSS BEAM)
+NO TE: D-SAMPLE TRANSLATION Y (ALONG BEAM)
 NO TE: E-SAMPLE RAISE
 NO TE: F-SAMPLE ROTATE
-NO TE: G-DETECTOR Y (ALONG BEAM)
+NO TE: G-DETECTOR Y (ALONG BEAM) PRG=25000*70/377*mm
 NO TE: H-DETECTOR X (ACCROSS BEAM)
 NO ----------------------------------------
 #AUTO
@@ -22,9 +22,9 @@ CN 1;' CONFIGURES LIMIT SWITCHES TO ACCEPT NC CONTACTS
 II 8,,,0;' CONFIGURES THE 8TH INPUT TO ACTIVATE THE #ININT ROUTINE
 OP 65280;' SETS OUTPUTS 9-16 ON = RELAYS OFF
 IA 137,157,202,67;' CONFIGURES IP ADDRESS
-AC 25000,25000,25000,25000,100000,25000,25000,25000;' SET ACELERATION
-DC 25000,25000,25000,25000,100000,25000,25000,25000;' SET DECELERATION
-SP 25000,25000,25000,50000,200000,25000,25000,25000;' SET SPEED
+AC 25000,25000,25000,25000,100000,25000,50000,25000;' SET ACELERATION
+DC 25000,25000,25000,25000,100000,25000,50000,25000;' SET DECELERATION
+SP 25000,25000,25000,50000,200000,25000,200000,25000;' SET SPEED
 SIA=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIB=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIC=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
@@ -57,11 +57,11 @@ ENDIF
 IF (_SPF>50000)
 SPF=50000
 ENDIF
-IF (_SPG>50000)
-SPG=50000
+IF (_SPG>200000)
+SPG=200000
 ENDIF
-IF (_SPH>50000)
-SPH=50000
+IF (_SPH>100000)
+SPH=100000
 ENDIF
 NO TE: CONTROLS THE SAMPLE RAISE ELECTRO-MECHANICAL BRAKE
 IF (_MOE=0)
@@ -148,7 +148,7 @@ DCF=100000;' DECEL FOR LIMIT HIT OCCURENCE
 STF
 ENDIF
 IF (_LFG = 0) | (_LRG = 0)
-DCG=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCG=200000;' DECEL FOR LIMIT HIT OCCURENCE
 STG
 ENDIF
 IF (_LFH = 0) | (_LRH = 0)
diff --git a/site_ansto/instrument/sans/DMC2280/controller2.txt b/site_ansto/instrument/sans/DMC2280/controller2.txt
index 1c5cb04a..1c6df2d5 100644
--- a/site_ansto/instrument/sans/DMC2280/controller2.txt
+++ b/site_ansto/instrument/sans/DMC2280/controller2.txt
@@ -1,7 +1,7 @@
 NO TE: QUOKKA - CONTROLLER 2
 NO TE:
-NO TE: $Revision: 1.4 $
-NO TE: $Date: 2007-08-16 04:31:07 $
+NO TE: $Revision: 1.5 $
+NO TE: $Date: 2007-09-24 01:10:59 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
@@ -13,6 +13,8 @@ NO TE: E-COLLIMATION OPTICS - CHAMBER 5
 NO TE: F-COLLIMATION OPTICS - CHAMBER 6
 NO TE: G-COLLIMATION OPTICS - CHAMBER 7
 NO TE: H-COLLIMATION OPTICS - CHAMBER 8
+NO TE:
+NO TE: +VE MOTOR MOVES ALL IN A WESTERLY DIRECTION
 NO ----------------------------------------
 #AUTO
 NO TE: THIS IS THE PROGRAM THAT RUNS AUTOMATICALLY ON CONTROLLER STARTUP
@@ -22,8 +24,8 @@ CN 1;' CONFIGURES LIMIT SWITCHES TO ACCEPT NC CONTACTS
 II 8,,,0;' CONFIGURES THE 8TH INPUT TO ACTIVATE THE #ININT ROUTINE
 OP 65280;' SETS OUTPUTS 9-16 ON = RELAYS OFF
 IA 137,157,202,68;' CONFIGURES IP ADDRESS
-AC 25000,25000,25000,25000,25000,25000,25000,25000;' SET ACELERATION
-DC 25000,25000,25000,25000,25000,25000,25000,25000;' SET DECELERATION
+AC 12500,12500,12500,12500,12500,12500,12500,12500;' SET ACELERATION
+DC 12500,12500,12500,12500,12500,12500,12500,12500;' SET DECELERATION
 SP 25000,25000,25000,25000,25000,25000,25000,25000;' SET SPEED
 SIA=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIB=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
@@ -39,29 +41,29 @@ NO ----------------------------------------
 #THREAD0
 NO TE: THERE MUST BE A THREAD RUNNING FOR #LIMSWI, #TCPERR AND #ININT TO WORK
 NO TE: CHECKS IF SPEEDS ARE ABOVE MAXIMUM ALLOWED
-IF (_SPA>50000)
-SPA=50000
+IF (_SPA>25000)
+SPA=25000
 ENDIF
-IF (_SPB>50000)
-SPB=50000
+IF (_SPB>25000)
+SPB=25000
 ENDIF
-IF (_SPC>50000)
-SPC=50000
+IF (_SPC>25000)
+SPC=25000
 ENDIF
-IF (_SPD>50000)
-SPD=50000
+IF (_SPD>25000)
+SPD=25000
 ENDIF
-IF (_SPE>50000)
-SPE=50000
+IF (_SPE>25000)
+SPE=25000
 ENDIF
-IF (_SPF>50000)
-SPF=50000
+IF (_SPF>25000)
+SPF=25000
 ENDIF
-IF (_SPG>50000)
-SPG=50000
+IF (_SPG>25000)
+SPG=25000
 ENDIF
-IF (_SPH>50000)
-SPH=50000
+IF (_SPH>25000)
+SPH=25000
 ENDIF
 JP #THREAD0
 EN
@@ -94,35 +96,35 @@ OLDDCF=_DCF
 OLDDCG=_DCG
 OLDDCH=_DCH
 IF (_LFA = 0) | (_LRA = 0)
-DCA=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCA=75000;' DECEL FOR LIMIT HIT OCCURENCE
 STA
 ENDIF
 IF (_LFB = 0) | (_LRB = 0)
-DCB=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCB=75000;' DECEL FOR LIMIT HIT OCCURENCE
 STB
 ENDIF
 IF (_LFC = 0) | (_LRC = 0)
-DCC=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCC=75000;' DECEL FOR LIMIT HIT OCCURENCE
 STC
 ENDIF
 IF (_LFD = 0) | (_LRD = 0)
-DCD=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCD=75000;' DECEL FOR LIMIT HIT OCCURENCE
 STD
 ENDIF
 IF (_LFE = 0) | (_LRE = 0)
-DCE=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCE=75000;' DECEL FOR LIMIT HIT OCCURENCE
 STE
 ENDIF
 IF (_LFF = 0) | (_LRF = 0)
-DCF=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCF=75000;' DECEL FOR LIMIT HIT OCCURENCE
 STF
 ENDIF
 IF (_LFG = 0) | (_LRG = 0)
-DCG=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCG=75000;' DECEL FOR LIMIT HIT OCCURENCE
 STG
 ENDIF
 IF (_LFH = 0) | (_LRH = 0)
-DCH=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCH=75000;' DECEL FOR LIMIT HIT OCCURENCE
 STH
 ENDIF
 AM ABCDEFGH;' AFTER ALL AXES STOPPED
diff --git a/site_ansto/instrument/sans/DMC2280/controller3.txt b/site_ansto/instrument/sans/DMC2280/controller3.txt
index 61f3ec8f..5a4958fa 100644
--- a/site_ansto/instrument/sans/DMC2280/controller3.txt
+++ b/site_ansto/instrument/sans/DMC2280/controller3.txt
@@ -1,7 +1,7 @@
 NO TE: QUOKKA - CONTROLLER 3
 NO TE:
-NO TE: $Revision: 1.4 $
-NO TE: $Date: 2007-08-16 04:31:07 $
+NO TE: $Revision: 1.5 $
+NO TE: $Date: 2007-09-24 01:10:59 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
@@ -9,10 +9,12 @@ NO TE: A-COLLIMATION OPTICS - CHAMBER 9
 NO TE: B-COLLIMATION OPTICS - CHAMBER 10
 NO TE: C-SOURCE END CHAMBER - PENTAPRISM
 NO TE: D-SOURCE END CHAMBER - SRC APERTURES
-NO TE: E-SAMPLE END CHAMBER - X APETURE
-NO TE: F-SAMPLE END CHAMBER - Y APETURE
+NO TE: E-SPARE WITH 8 AMP AMPLIFIER
+NO TE: F-SPARE WITH 8 AMP AMPLIFIER
 NO TE: G-ROTARY ATTENUATOR
 NO TE: H-SPARE
+NO TE:
+NO TE: +VE MOTOR MOVES COLL. 9&10 IN A WESTERLY DIRECTION
 NO ----------------------------------------
 #AUTO
 NO TE: THIS IS THE PROGRAM THAT RUNS AUTOMATICALLY ON CONTROLLER STARTUP
@@ -22,15 +24,15 @@ CN 1;' CONFIGURES LIMIT SWITCHES TO ACCEPT NC CONTACTS
 II 8,,,0;' CONFIGURES THE 8TH INPUT TO ACTIVATE THE #ININT ROUTINE
 OP 65280;' SETS OUTPUTS 9-16 ON = RELAYS OFF
 IA 137,157,202,69;' CONFIGURES IP ADDRESS
-AC 25000,25000,25000,25000,25000,25000,25000,;' SET ACELERATION
-DC 25000,25000,25000,25000,25000,25000,25000,;' SET DECELERATION
-SP 25000,25000,25000,25000,25000,25000,25000,;' SET SPEED
+AC 12500,12500,25000,25000,,,25000,;' SET ACELERATION
+DC 12500,12500,25000,25000,,,25000,;' SET DECELERATION
+SP 25000,25000,25000,25000,,,25000,;' SET SPEED
 SIA=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIB=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIC=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SID=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
-SIE=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
-SIF=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
+SIE=0,25,13,0<-2>2;'NOT USED
+SIF=0,25,13,0<-2>2;'NOT USED
 SIG=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIH=0,25,13,0<-2>2;'NOT USED
 JS #THREAD0
@@ -39,11 +41,11 @@ NO ----------------------------------------
 #THREAD0
 NO TE: THERE MUST BE A THREAD RUNNING FOR #LIMSWI, #TCPERR AND #ININT TO WORK
 NO TE: CHECKS IF SPEEDS ARE ABOVE MAXIMUM ALLOWED
-IF (_SPA>50000)
-SPA=50000
+IF (_SPA>25000)
+SPA=25000
 ENDIF
-IF (_SPB>50000)
-SPB=50000
+IF (_SPB>25000)
+SPB=25000
 ENDIF
 IF (_SPC>50000)
 SPC=50000
@@ -51,12 +53,12 @@ ENDIF
 IF (_SPD>50000)
 SPD=50000
 ENDIF
-IF (_SPE>50000)
-SPE=50000
-ENDIF
-IF (_SPF>50000)
-SPF=50000
-ENDIF
+NO IF (_SPE>50000)
+NO SPE=50000
+NO ENDIF
+NO IF (_SPF>50000)
+NO SPF=50000
+NO ENDIF
 IF (_SPG>50000)
 SPG=50000
 ENDIF
@@ -89,16 +91,16 @@ OLDDCA=_DCA;' REMEMBERS CURRENT DECEL
 OLDDCB=_DCB
 OLDDCC=_DCC
 OLDDCD=_DCD
-OLDDCE=_DCE
-OLDDCF=_DCF
+NO OLDDCE=_DCE
+NO OLDDCF=_DCF
 OLDDCG=_DCG
 NO OLDDCH=_DCH
 IF (_LFA = 0) | (_LRA = 0)
-DCA=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCA=75000;' DECEL FOR LIMIT HIT OCCURENCE
 STA
 ENDIF
 IF (_LFB = 0) | (_LRB = 0)
-DCB=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCB=75000;' DECEL FOR LIMIT HIT OCCURENCE
 STB
 ENDIF
 IF (_LFC = 0) | (_LRC = 0)
@@ -109,14 +111,14 @@ IF (_LFD = 0) | (_LRD = 0)
 DCD=100000;' DECEL FOR LIMIT HIT OCCURENCE
 STD
 ENDIF
-IF (_LFE = 0) | (_LRE = 0)
-DCE=100000;' DECEL FOR LIMIT HIT OCCURENCE
-STE
-ENDIF
-IF (_LFF = 0) | (_LRF = 0)
-DCF=100000;' DECEL FOR LIMIT HIT OCCURENCE
-STF
-ENDIF
+NO IF (_LFE = 0) | (_LRE = 0)
+NO DCE=100000;' DECEL FOR LIMIT HIT OCCURENCE
+NO STE
+NO ENDIF
+NO IF (_LFF = 0) | (_LRF = 0)
+NO DCF=100000;' DECEL FOR LIMIT HIT OCCURENCE
+NO STF
+NO ENDIF
 IF (_LFG = 0) | (_LRG = 0)
 DCG=100000;' DECEL FOR LIMIT HIT OCCURENCE
 STG
@@ -130,8 +132,8 @@ DCA=OLDDCA;' RESET DECEL TO OLD VALUE
 DCB=OLDDCB
 DCC=OLDDCC
 DCD=OLDDCD
-DCE=OLDDCE
-DCF=OLDDCF
+NO DCE=OLDDCE
+NO DCF=OLDDCF
 DCG=OLDDCG
 NO DCH=OLDDCH
 RE
diff --git a/site_ansto/instrument/sans/DMC2280/controller4.txt b/site_ansto/instrument/sans/DMC2280/controller4.txt
index 02937740..2db8ce30 100644
--- a/site_ansto/instrument/sans/DMC2280/controller4.txt
+++ b/site_ansto/instrument/sans/DMC2280/controller4.txt
@@ -1,17 +1,17 @@
 NO TE: QUOKKA - CONTROLLER 4
 NO TE:
-NO TE: $Revision: 1.6 $
-NO TE: $Date: 2007-08-23 05:48:22 $
+NO TE: $Revision: 1.7 $
+NO TE: $Date: 2007-09-24 01:10:59 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
-NO TE: A-BEAM STOPS TRANSLATION - X (ACCROSS BEAM)
+NO TE: A-BEAM STOPS TRANS. X (ACCROSS BEAM) +VE=WEST
 NO TE: B-BEAM STOPS TRANSLATION - RAISE
-NO TE: C-BEAM STOP 1 (LARGEST DISK)
-NO TE: D-BEAM STOP 2
-NO TE: E-BEAM STOP 3
-NO TE: F-BEAM STOP 4
-NO TE: G-BEAM STOP 5 (SMALLEST DISK)
+NO TE: C-BEAM STOP 1 -VE=UP (LARGEST DISK)
+NO TE: D-BEAM STOP 2 -VE=UP
+NO TE: E-BEAM STOP 3 +VE=UP
+NO TE: F-BEAM STOP 4 -VE=UP
+NO TE: G-BEAM STOP 5 +VE=UP (SMALLEST DISK)
 NO TE: H-POLARISER
 NO ----------------------------------------
 #AUTO
@@ -22,9 +22,9 @@ CN 1;' CONFIGURES LIMIT SWITCHES TO ACCEPT NC CONTACTS
 II 8,,,0;' CONFIGURES THE 8TH INPUT TO ACTIVATE THE #ININT ROUTINE
 OP 65280;' SETS OUTPUTS 9-16 ON = RELAYS OFF
 IA 137,157,202,70;' CONFIGURES IP ADDRESS
-AC 25000,100000,15000,15000,15000,15000,15000,25000;' SET ACELERATION
-DC 25000,100000,15000,15000,15000,15000,15000,25000;' SET DECELERATION
-SP 25000,100000,30000,40000,40000,40000,40000,25000;' SET SPEED
+AC 25000,100000,5000,15000,15000,15000,15000,25000;' SET ACELERATION
+DC 25000,100000,5000,15000,15000,15000,15000,25000;' SET DECELERATION
+SP 100000,100000,30000,40000,40000,40000,40000,25000;' SET SPEED
 SIA=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIB=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIC=0,25,13,0<-2>2;'NO ENCODER
@@ -39,8 +39,8 @@ NO ----------------------------------------
 #THREAD0
 NO TE: THERE MUST BE A THREAD RUNNING FOR #LIMSWI, #TCPERR AND #ININT TO WORK
 NO TE: CHECKS IF SPEEDS ARE ABOVE MAXIMUM ALLOWED
-IF (_SPA>50000)
-SPA=50000
+IF (_SPA>100000)
+SPA=100000
 ENDIF
 IF (_SPB>100000)
 SPB=100000
@@ -71,11 +71,12 @@ SB 10;' MOTOR OFF = BRAKE DENERGISED = LOCKED
 ENDIF
 NO TE:  SETS AN OUTPUT IF ONE OR MORE BEAM STOPS ARE FULLY RAISED
 NO TE: OUTPUT 5 ON IF ONE OR MORE BEAMS TOPS RAISED
-IF (_LFC=0)|(_LFD=0)|(_LFE=0)|(_LFF=0)|(_LFG=0)
-SB1
-ELSE
-CB1
-ENDIF
+NO IF (_TSC&12=4)|(_TSD&12=4)|(_TSE&12=4)|(_TSF&12=4)|(_TSG&12=4)
+NO TE: IF ANY OF THE 5 BEAMSTOPS IS NOT DOWN AND UP THEN SET BIT 1 HIGH
+NO SB1
+NO ELSE
+NO CB1
+NO ENDIF
 JP #THREAD0
 EN
 NO ----------------------------------------