From 7220f040efe2f4e8e3ca6c012358a74f0ba0d94b Mon Sep 17 00:00:00 2001
From: Douglas Clowes <dcl@ansto.gov.au>
Date: Mon, 14 Apr 2008 09:50:38 +1000
Subject: [PATCH] wait for motion to complete before turning air and motor off
 (was crashing thread 0)

r2430 | dcl | 2008-04-14 09:50:38 +1000 (Mon, 14 Apr 2008) | 2 lines
---
 site_ansto/instrument/hipd/DMC2280/controller1.txt | 6 +++---
 site_ansto/instrument/hrpd/DMC2280/controller1.txt | 6 +++---
 site_ansto/instrument/hrpd/DMC2280/controller2.txt | 6 +++---
 3 files changed, 9 insertions(+), 9 deletions(-)

diff --git a/site_ansto/instrument/hipd/DMC2280/controller1.txt b/site_ansto/instrument/hipd/DMC2280/controller1.txt
index 55e36345..c120d698 100644
--- a/site_ansto/instrument/hipd/DMC2280/controller1.txt
+++ b/site_ansto/instrument/hipd/DMC2280/controller1.txt
@@ -1,7 +1,7 @@
 ' WOMBAT - CONTROLLER 1
 '
-' $Revision: 1.9 $
-' $Date: 2008-03-07 05:12:47 $
+' $Revision: 1.10 $
+' $Date: 2008-04-13 23:50:38 $
 ' Author: Dan Bartlett
 ' Airpad control added by Doug Clowes
 ' Last revision by: $Author: dcl $
@@ -364,7 +364,7 @@ CB 9;' AIR PAD ON-SOLENOID ON
 WT1000;
 RSPF=1
 ENDIF
-IF (REQF=0)&(RSPF=1);'FLIGHT TUBE MOTION FINISHED
+IF (REQF=0)&(RSPF=1)&(_BGF=0);'FLIGHT TUBE MOTION FINISHED
 WT1000;' WAIT FOR FLIGHT TUBE TO SETTLE
 SB 9;' AIR PAD ON-SOLENOID OFF
 CB 10;' AIR PAD OFF-SOLENOID ON
diff --git a/site_ansto/instrument/hrpd/DMC2280/controller1.txt b/site_ansto/instrument/hrpd/DMC2280/controller1.txt
index be571f9a..33da414a 100644
--- a/site_ansto/instrument/hrpd/DMC2280/controller1.txt
+++ b/site_ansto/instrument/hrpd/DMC2280/controller1.txt
@@ -1,7 +1,7 @@
 ' ECHIDNA - CONTROLLER 1
 '
-' $Revision: 1.7 $
-' $Date: 2008-03-07 05:12:47 $
+' $Revision: 1.8 $
+' $Date: 2008-04-13 23:50:38 $
 ' Author: Dan Bartlett
 ' Airpad control added by Doug Clowes
 ' Last revision by: $Author: dcl $
@@ -364,7 +364,7 @@ CB 9;' AIR PAD ON-SOLENOID ON
 WT1000;
 RSPF=1
 ENDIF
-IF (REQF=0)&(RSPF=1);'FLIGHT TUBE MOTION FINISHED
+IF (REQF=0)&(RSPF=1)&(_BGF=0);'FLIGHT TUBE MOTION FINISHED
 WT1000;' WAIT FOR FLIGHT TUBE TO SETTLE
 SB 9;' AIR PAD ON-SOLENOID OFF
 CB 10;' AIR PAD OFF-SOLENOID ON
diff --git a/site_ansto/instrument/hrpd/DMC2280/controller2.txt b/site_ansto/instrument/hrpd/DMC2280/controller2.txt
index d5db83bb..fcf98b5e 100644
--- a/site_ansto/instrument/hrpd/DMC2280/controller2.txt
+++ b/site_ansto/instrument/hrpd/DMC2280/controller2.txt
@@ -1,7 +1,7 @@
 ' ECHIDNA - CONTROLLER 2
 '
-' $Revision: 1.5 $
-' $Date: 2008-03-07 05:12:47 $
+' $Revision: 1.6 $
+' $Date: 2008-04-13 23:50:38 $
 ' Author: Dan Bartlett
 ' Airpad control added by Doug Clowes
 ' Last revision by: $Author: dcl $
@@ -361,7 +361,7 @@ CB 9;' AIR PAD ON-SOLENOID ON
 WT1000;
 RSPF=1
 ENDIF
-IF (REQF=0)&(RSPF=1);'FLIGHT TUBE MOTION FINISHED
+IF (REQF=0)&(RSPF=1)&(_BGF=0);'FLIGHT TUBE MOTION FINISHED
 WT1000;' WAIT FOR FLIGHT TUBE TO SETTLE
 SB 9;' AIR PAD ON-SOLENOID OFF
 CB 10;' AIR PAD OFF-SOLENOID ON