From 911c0d8450300891cf334664e6ba5797f8d101fd Mon Sep 17 00:00:00 2001
From: Dan Bartlett <dbx@ansto.gov.au>
Date: Thu, 3 May 2007 16:53:56 +1000
Subject: [PATCH] no message

r1937 | dbx | 2007-05-03 16:53:56 +1000 (Thu, 03 May 2007) | 2 lines
---
 .../instrument/hipd/DMC2280/controller1.txt   | 16 +++----
 .../instrument/rsd/DMC2280/controller2.txt    | 34 +++++++-------
 .../instrument/rsd/DMC2280/controller3.txt    | 44 ++++++++++++-------
 3 files changed, 52 insertions(+), 42 deletions(-)

diff --git a/site_ansto/instrument/hipd/DMC2280/controller1.txt b/site_ansto/instrument/hipd/DMC2280/controller1.txt
index 39e6bbd0..76b32c01 100644
--- a/site_ansto/instrument/hipd/DMC2280/controller1.txt
+++ b/site_ansto/instrument/hipd/DMC2280/controller1.txt
@@ -1,7 +1,7 @@
 NO TE: WOMBAT - CONTROLLER 1
 NO TE:
-NO TE: $Revision: 1.6 $
-NO TE: $Date: 2007-02-16 23:40:39 $
+NO TE: $Revision: 1.7 $
+NO TE: $Date: 2007-05-03 06:52:51 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
@@ -24,7 +24,7 @@ OP 65280;' SETS OUTPUTS 9-16 ON = RELAYS OFF
 IA 137,157,201,67;' CONFIGURES IP ADDRESS
 AC 25000,25000,25000,25000,50000,10000,25000,25000;' SET ACELERATION
 DC 25000,25000,25000,25000,50000,10000,25000,25000;' SET DECELERATION
-SP 25000,25000,25000,25000,25000,100000,25000,25000;' SET SPEED
+SP 25000,25000,25000,25000,25000,75000,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
@@ -56,8 +56,8 @@ ENDIF
 IF (_SPE>50000)
 SPE=50000
 ENDIF
-IF (_SPF>100000)
-SPF=100000
+IF (_SPF>75000)
+SPF=75000
 ENDIF
 NO IF (_SPG>50000) AXES NOT USED, COMMENTED OUT
 NO SPG=50000
@@ -71,7 +71,8 @@ NO TE: THE APDONE BIT IS USED SO THAT THE CODE ONLY RUNS WHEN THE
 NO TE: STATE OF FTUBE CHANGES - THE DELAYS ARENT RUNNING EVERY CYCLE
 NO TE: IN THE 2ND IF, THE OFF-SOLENOIDS ARENT HELD ENERGISED IN CASE THE
 NO TE: VALVE MANUAL OVER RIDE IS NEEDED.
-IF (_MOF=0)&(APDONE=0);'REQUESTING FLIGHT TUBE BE MOVABLE
+IF (FTUBE=1)&(APDONE=0);'REQUESTING FLIGHT TUBE BE MOVABLE
+SHF;' TURN MOTOR ON
 WT500;' WAIT FOR MOTOR TO STABILISE
 SB 12;' DRIVE WHEEL UP-SOLENOID OFF
 CB 11;' DRIVE WHEEL DOWN-SOLENOID ON
@@ -80,8 +81,7 @@ SB 10;' SAMPLE STAGE AIR PAD OFF-SOLENOID OFF
 CB 9;' SAMPLE STAGE AIR PAD ON-SOLENOID ON
 APDONE=1
 ENDIF
-IF (_MOF=1)&(APDONE=1);'FLIGHT TUBE MOTION FINISHED
-SHF;' FOLLOWING STEPS MUST BE RUN BEFORE MOTOR CAN BE TURNED OFF
+IF (FTUBE=0)&(APDONE=1);'FLIGHT TUBE MOTION FINISHED
 WT1000;' WAIT FOR FLIGHT TUBE TO SETTLE
 SB 9;' SAMPLE STAGE AIR PAD ON-SOLENOID OFF
 CB 10;' SAMPLE STAGE AIR PAD OFF-SOLENOID ON
diff --git a/site_ansto/instrument/rsd/DMC2280/controller2.txt b/site_ansto/instrument/rsd/DMC2280/controller2.txt
index 6e81c075..f48de328 100644
--- a/site_ansto/instrument/rsd/DMC2280/controller2.txt
+++ b/site_ansto/instrument/rsd/DMC2280/controller2.txt
@@ -1,12 +1,12 @@
 NO TE: KOWARI - CONTROLLER 2
 NO TE: 
-NO TE: $Revision: 1.2 $
-NO TE: $Date: 2007-03-21 22:52:42 $
+NO TE: $Revision: 1.3 $
+NO TE: $Date: 2007-05-03 06:53:01 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
-NO TE: A-SAMPLE RAISE FIRST SECTION
-NO TE: B-SAMPLE RAISE SECOND SECTION
+NO TE: A-SAMPLE RAISE INNER SECTIONS
+NO TE: B-SAMPLE RAISE OUTER SECTIONS
 NO TE: C-SAMPLE UPPER TRANSLATION
 NO TE: D-SAMPLE LOWER TRANSLATION
 NO TE: E-SAMPLE ROTATE
@@ -24,15 +24,15 @@ OP 65280;' SETS OUTPUTS 9-16 ON = RELAYS OFF
 IA 137,157,201,196;' CONFIGURES IP ADDRESS
 AC 25000,25000,25000,25000,25000,25000,,;' SET ACELERATION
 DC 25000,25000,25000,25000,25000,25000,,;' SET DECELERATION
-SP 25000,25000,25000,25000,25000,25000,,;' SET SPEED
-NO SIA=1,31,18,0<-2>2;'IVO xxxx, FIRMWARE UPGRADE NEEDED FOR 31 BIT ENCODER
-SIB=0,25,13,0<-2>2;'NOT USED, ONE CORD PULL FOR BOTH RAISE SECTIONS
-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
-SIG=O,25,13,0<-2>2;'NOT USED
-SIH=O,25,13,0<-2>2;'NOT USED
+SP 225000,225000,25000,25000,25000,25000,,;' SET SPEED
+SIA=1,31,18,0<13>2;'IVO, SSI2 FIRMWARE NEEDED FOR 31 BIT ENCODER
+SIB=1,25,13,0<13>2;'NOT USED, ONE CORD PULL FOR BOTH RAISE SECTIONS
+SIC=1,25,13,0<13>2;'HEIDENHAIN ROQ425
+SID=1,25,13,0<13>2;'HEIDENHAIN ROQ425
+SIE=1,25,13,0<13>2;'HEIDENHAIN ROQ425
+SIF=1,25,13,0<13>2;'HEIDENHAIN ROQ425
+SIG=0,25,13,0<13>2;'NOT USED
+SIH=0,25,13,0<13>2;'NOT USED
 APDONE=0;' FIRST TIME THROUGH AIRPAD CONTROL NOT DONE
 JS #THREAD0
 EN
@@ -40,10 +40,10 @@ 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)
+IF (_SPA>225000)
 SPA=50000
 ENDIF
-IF (_SPB>50000)
+IF (_SPB>225000)
 SPB=50000
 ENDIF
 IF (_SPC>50000)
@@ -103,11 +103,11 @@ OLDDCF=_DCF
 NO OLDDCG=_DCG COMMENTED OUT, AXIS NOT IN USE
 NO OLDDCH=_DCH COMMENTED OUT, AXIS NOT IN USE
 IF (_LFA = 0) | (_LRA = 0)
-DCA=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCA=450000;' DECEL FOR LIMIT HIT OCCURENCE
 STA
 ENDIF
 IF (_LFB = 0) | (_LRB = 0)
-DCB=100000;' DECEL FOR LIMIT HIT OCCURENCE
+DCB=450000;' DECEL FOR LIMIT HIT OCCURENCE
 STB
 ENDIF
 IF (_LFC = 0) | (_LRC = 0)
diff --git a/site_ansto/instrument/rsd/DMC2280/controller3.txt b/site_ansto/instrument/rsd/DMC2280/controller3.txt
index 23dafe97..baa4f393 100644
--- a/site_ansto/instrument/rsd/DMC2280/controller3.txt
+++ b/site_ansto/instrument/rsd/DMC2280/controller3.txt
@@ -1,12 +1,12 @@
 NO TE: KOWARI - CONTROLLER 3
 NO TE:
-NO TE: $Revision: 1.1 $
-NO TE: $Date: 2007-03-20 03:10:55 $
+NO TE: $Revision: 1.2 $
+NO TE: $Date: 2007-05-03 06:53:56 $
 NO TE: Author: Dan Bartlett
 NO TE: Last revision by: $Author: dbx $
 NO TE:
 NO TE: A-MONOCHROMATOR FOCUS 1
-NO TE: B-MONOCHROMATOR FOCUS 1
+NO TE: B-MONOCHROMATOR FOCUS 2
 NO TE: C-SPARE
 NO TE: D-SPARE
 NO TE: E-SPARE
@@ -19,21 +19,24 @@ NO TE: THIS IS THE PROGRAM THAT RUNS AUTOMATICALLY ON CONTROLLER STARTUP
 MT-2,-2,-2,-2,-2,-2,-2,-2;'CONFIGURES ALL AXES AS STEPPER
 MO;' FIRST TIME MOTOR OFF
 CN 1;' CONFIGURES LIMIT SWITCHES TO ACCEPT NC CONTACTS
+CO 0;' CONFIGURES EXTENDED IO AS INPUTS
 II 8,,,0;' CONFIGURES THE 8TH INPUT TO ACTIVATE THE #ININT ROUTINE
 IA 137,157,201,197;' CONFIGURES IP ADDRESS
-AC 12500,12500,,,,,,;' SET ACELERATION
-DC 12500,12500,,,,,,;' SET DECELERATION
-SP 25000,25000,,,,,,;' SET SPEED
+AC 6000,6000,,,,,,;' SET ACELERATION
+DC 6000,6000,,,,,,;' SET DECELERATION
+SP 12500,12500,,,,,,;' SET SPEED
 JS #THREAD0
 EN
 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
+CB1;' SET INHIBIT INPUT TO TRIGGER EMPIRE BOX 1
+CB2;' SET INHIBIT INPUT TO TRIGGER EMPIRE BOX 2
 IF (_SPA>25000)
 SPA=25000
 ENDIF
-IF (_SPB>25000) AXES NOT IN USE, COMMENTED OUT
+IF (_SPB>25000)
 SPB=25000
 ENDIF
 NO IF (_SPC>50000)
@@ -56,22 +59,21 @@ NO SPH=30000
 NO ENDIF
 NO TE: PROCEDURE TO UPDATE THE RESOLVER FEEDBACK.
 NO TE: RESOLVER NUMBER 1
-CB1;' OUTPUT WITH FALLING EDGE TO TRIGGER EMPIRE RESOLVER BOX
-AI31;' LOCK DATA
-IOBYTE1=_TI2;' LOAD FIRST WORD
-IOBYTE2=_TI3;' LOAD SECOND WORD
-IOBYTE2=(IOBYTE2&63);' MASK OUT XBUSY BIT
-IOBYTE2=(IOBYTE2*256);' SHIFT REMAINING BITS 8 POSITIONS TO RIGHT
-DEA=(IOBYTE1+IOBYTE2);' ADD WORDS TOGETHER, LOAD INTO DEA, USE TPA FOR VALUE
+NO AI31;' WAIT FOR XBUSY BIT
+NO IOBYTE1=_TI2;' LOAD FIRST WORD
+NO IOBYTE2=_TI3;' LOAD SECOND WORD
+NO IOBYTE2=(IOBYTE2&63);' MASK OUT XBUSY BIT
+NO IOBYTE2=(IOBYTE2*256);' SHIFT REMAINING BITS 8 POSITIONS TO RIGHT
+NO DEA=(IOBYTE1+IOBYTE2);' ADD WORDS TOGETHER, LOAD INTO DEA, USE TPA FOR VALUE
 NO TE: RESOLVER NUMBER 2
-CB2;' OUTPUT WITH FALLING EDGE TO TRIGGER EMPIRE RESOLVER BOX
-AI32;' LOCK DATA
+AI47;' WAIT FOR XBUSY BIT
 IOBYTE3=_TI4;' LOAD FIRST WORD
 IOBYTE4=_TI5;' LOAD SECOND WORD
 IOBYTE4=(IOBYTE4&63);' MASK OUT XBUSY BIT
 IOBYTE4=(IOBYTE4*256);' SHIFT REMAINING BITS 8 POSITIONS TO RIGHT
 DEB=(IOBYTE3+IOBYTE4);' ADD WORDS TOGETHER, LOAD INTO DEB, USE TPB FOR VALUE
-SB1
+SB1;' DRIVE INHIBIT HIGH - FINISHED DATA INPUT
+SB2;' DRIVE INHIBIT HIGH - FINISHED DATA INPUT
 JP#THREAD0
 EN
 NO ----------------------------------------
@@ -86,4 +88,12 @@ STA,B,C,D,E,F,G,H
 AM
 MO
 RI
+NO ----------------------------------------
+#LOOPIT
+BGB
+AMB
+WT 500
+MG _TPB {F5.0}{EA}
+JP #LOOPIT
+EN
 NO ----------------------------------------
\ No newline at end of file