Detector Y and analyser axes added

r2083 | dbx | 2007-07-20 10:37:05 +1000 (Fri, 20 Jul 2007) | 2 lines

site_ansto/instrument/reflectometer/DMC2280/controller1.txt

@@ -1,7 +1,7 @@
 NO TE: PLATYPUS - CONTROLLER 1
 NO TE:
-NO TE: $Revision: 1.8 $
-NO TE: $Date: 2007-05-16 07:04:01 $
+NO TE: $Revision: 1.9 $
+NO TE: $Date: 2007-07-20 00:37:05 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
@@ -11,7 +11,7 @@ NO TE: C-COLLIMATOR TILT, LEVEL=134660
 NO TE: D-BEAM ATTENUATOR, BEAM CENTRE=8375078
 NO TE: E-SLIT TOWER S3 RAISE
 NO TE: F-SLIT TOWER S4 RAISE
-NO TE: G-SPARE
+NO TE: G-DETECTOR TRANSLATION Y (ALONG BEAM)
 NO TE: H-SPARE
 NO ----------------------------------------
 #AUTO
@@ -22,16 +22,16 @@ 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,131;' CONFIGURES IP ADDRESS
-AC 25000,25000,25000,25000,25000,25000,,;' SET ACELERATION
-DC 25000,25000,25000,25000,25000,25000,,;' SET DECELERATION
-SP 50000,25000,25000,25000,75000,75000,,;' SET SPEED
+AC 25000,25000,25000,25000,25000,25000,12500,;' SET ACELERATION
+DC 25000,25000,25000,25000,25000,25000,12500,;' SET DECELERATION
+SP 50000,25000,25000,25000,75000,75000,12500,;' SET SPEED
 SIA=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIB=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIC=1,24,18,6<-2>2;'IVO
 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
-SIG=0,25,13,0<-2>2;'SPARE
+SIG=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIH=0,25,13,0<-2>2;'SPARE
 POS=0;' INITIAL BEAM ATTENUATOR FREQUENCY IS 0, PARKED IN THE BEAM
 XQ #ATTEN,1
@@ -59,9 +59,9 @@ ENDIF
 IF (_SPF>100000)
 SPF=100000
 ENDIF
-NO IF (_SPG>50000) AXES NOT USED, COMMENTED OUT
-NO SPG=50000
-NO ENDIF
+IF (_SPG>50000)
+SPG=50000
+ENDIF
 NO IF (_SPH>50000)
 NO SPH=50000
 NO ENDIF
@@ -95,7 +95,7 @@ OLDDCC=_DCC
 OLDDCD=_DCD
 OLDDCE=_DCE
 OLDDCF=_DCF
-NO OLDDCG=_DCG AXES NOT USED
+OLDDCG=_DCG
 NO OLDDCH=_DCH
 IF (_LFA = 0) | (_LRA = 0)
 DCA=100000;' DECEL FOR LIMIT HIT OCCURENCE
@@ -121,10 +121,10 @@ IF (_LFF = 0) | (_LRF = 0)
 DCF=150000;' DECEL FOR LIMIT HIT OCCURENCE
 STF
 ENDIF
-NO IF (_LFG = 0) | (_LRG = 0) AXES NOT USED, COMMENTED OUT
-NO DCG=100000;' DECEL FOR LIMIT HIT OCCURENCE
-NO STG
-NO ENDIF
+IF (_LFG = 0) | (_LRG = 0)
+DCG=100000;' DECEL FOR LIMIT HIT OCCURENCE
+STG
+ENDIF
 NO IF (_LFH = 0) | (_LRH = 0)
 NO DCH=100000;' DECEL FOR LIMIT HIT OCCURENCE
 NO STH
@@ -136,7 +136,7 @@ DCC=OLDDCC
 DCD=OLDDCD
 DCE=OLDDCE
 DCF=OLDDCF
-NO DCG=OLDDCG AXES NOT USED
+DCG=OLDDCG
 NO DCH=OLDDCH
 RE
 NO ----------------------------------------

site_ansto/instrument/reflectometer/DMC2280/controller2.txt

@@ -1,16 +1,16 @@
 NO TE: PLATYPUS - CONTROLLER 2
 NO TE:
-NO TE: $Revision: 1.2 $
-NO TE: $Date: 2007-02-13 00:44:17 $
+NO TE: $Revision: 1.3 $
+NO TE: $Date: 2007-07-20 00:37:05 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
 NO TE: A-SAMPLE TILT 1
 NO TE: B-SAMPLE TILT 2
 NO TE: C-SAMPLE TRANSLATION - LINEAR
-NO TE: D-SPARE
+NO TE: D-ANALYSER 1
 NO TE: E-SAMPLE RAISE
-NO TE: F-SPARE
+NO TE: F-ANALYSER 2
 NO TE: G-DETECTOR RAISE
 NO TE: H-SPARE
 NO ----------------------------------------
@@ -22,15 +22,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,132;' CONFIGURES IP ADDRESS
-AC 25000,25000,25000,,100000,,50000,;' SET ACELERATION
-DC 25000,25000,25000,,100000,,50000,;' SET DECELERATION
-SP 50000,50000,50000,,200000,,150000,;' SET SPEED
+AC 25000,25000,25000,25000,100000,25000,50000,;' SET ACELERATION
+DC 25000,25000,25000,25000,100000,25000,50000,;' SET DECELERATION
+SP 50000,50000,50000,25000,200000,25000,150000,;' 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=0,25,13,0<-2>2;'SPARE
+SID=0,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIE=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
-SIF=0,25,13,0<-2>2;'SPARE
+SIF=0,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIG=1,25,13,0<-2>2;'HEIDENHAIN ROQ425
 SIH=0,25,13,0<-2>2;'SPARE
 JS #THREAD0
@@ -48,15 +48,15 @@ ENDIF
 IF (_SPC>50000)
 SPC=50000
 ENDIF
-NO IF (_SPD>50000) AXIS NOT USED, COMMENTED OUT
-NO SPD=50000
-NO ENDIF
+IF (_SPD>50000)
+SPD=50000
+ENDIF
 IF (_SPE>200000)
 SPE=200000
 ENDIF
-NO IF (_SPF>100000) AXIS NOT USED, COMMENTED OUT
-NO SPF=100000
-NO ENDIF
+IF (_SPF>100000)
+SPF=100000
+ENDIF
 IF (_SPG>150000)
 SPG=150000
 ENDIF
@@ -90,9 +90,9 @@ NO TE: LIMIT SWITCH ROUTINE WHICH SHORTENS DECEL TIME WHEN A LIMIT IS HIT
 OLDDCA=_DCA;' REMEMBERS CURRENT DECEL
 OLDDCB=_DCB
 OLDDCC=_DCC
-NO OLDDCD=_DCD AXIS NOT USED
+OLDDCD=_DCD AXIS NOT USED
 OLDDCE=_DCE
-NO OLDDCF=_DCF AXIS NOT USED
+OLDDCF=_DCF AXIS NOT USED
 OLDDCG=_DCG
 NO OLDDCH=_DCH AXIS NOT USED
 IF (_LFA = 0) | (_LRA = 0)
@@ -107,20 +107,20 @@ IF (_LFC = 0) | (_LRC = 0)
 DCC=100000;' DECEL FOR LIMIT HIT OCCURENCE
 STC
 ENDIF
-NO IF (_LFD = 0) | (_LRD = 0) AXIS NOT USED, COMMENTED OUT
-NO DCD=100000;' DECEL FOR LIMIT HIT OCCURENCE
-NO STD
-NO ENDIF
+IF (_LFD = 0) | (_LRD = 0)
+DCD=100000;' DECEL FOR LIMIT HIT OCCURENCE
+STD
+ENDIF
 IF (_LFE = 0) | (_LRE = 0)
 DCE=150000;' DECEL FOR LIMIT HIT OCCURENCE
 STE
 ENDIF
-NO IF (_LFF = 0) | (_LRF = 0) AXIS NOT USED, COMMENTED OUT
-NO DCF=150000;' DECEL FOR LIMIT HIT OCCURENCE
-NO STF
-NO ENDIF
+IF (_LFF = 0) | (_LRF = 0)
+DCF=150000;' DECEL FOR LIMIT HIT OCCURENCE
+STF
+ENDIF
 IF (_LFG = 0) | (_LRG = 0)
-DCG=400000;' DECEL FOR LIMIT HIT OCCURENCE
+DCG=100000;' DECEL FOR LIMIT HIT OCCURENCE
 STG
 ENDIF
 NO IF (_LFH = 0) | (_LRH = 0) AXIS NOT USED, COMMENTED OUT
@@ -131,9 +131,9 @@ AM ABCDEFGH;' AFTER ALL AXES STOPPED
 DCA=OLDDCA;' RESET DECEL TO OLD VALUE
 DCB=OLDDCB
 DCC=OLDDCC
-NO DCD=OLDDCD AXIS NOT USED
+DCD=OLDDCD
 DCE=OLDDCE
-NO DCF=OLDDCF AXIS NOT USED
+DCF=OLDDCF
 DCG=OLDDCG
 NO DCH=OLDDCH AXIS NOT USED
 RE