From 4b72f07b8db2cc0abf78a13178761c9a52c605b8 Mon Sep 17 00:00:00 2001
From: Dan Bartlett <dbx@ansto.gov.au>
Date: Thu, 2 Nov 2006 13:49:04 +1100
Subject: [PATCH] HOMERUN VARIABLE PUT BACK IN

r1227 | dbx | 2006-11-02 13:49:04 +1100 (Thu, 02 Nov 2006) | 2 lines
---
 site_ansto/instrument/hrpd/DMC2280/controller3.txt | 13 +++++++++----
 site_ansto/instrument/hrpd/DMC2280/controller4.txt | 13 +++++++++----
 2 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/site_ansto/instrument/hrpd/DMC2280/controller3.txt b/site_ansto/instrument/hrpd/DMC2280/controller3.txt
index 2439d4b4..51dddb6e 100644
--- a/site_ansto/instrument/hrpd/DMC2280/controller3.txt
+++ b/site_ansto/instrument/hrpd/DMC2280/controller3.txt
@@ -1,9 +1,9 @@
 #AUTO
-NO TE: $Revision: 1.4 $
-NO TE: $Date: 2006-11-01 06:04:09 $
+NO TE: $Revision: 1.5 $
+NO TE: $Date: 2006-11-02 02:49:04 $
 NO TE: Author: Dan Bartlett
 NO TE: Limit switch HOME routine added by Ferdi Franceschini
-NO TE: Last revision by: $Author: ffr $
+NO TE: Last revision by: $Author: dbx $
 NO TE:
 NO TE: A-MONOCHROMATOR FOCUS
 NO TE: B-SPARE
@@ -21,7 +21,7 @@ IA 137,157,201,5;' CONFIGURES IP ADDRESS
 AC 12500,,,,60000,60000,60000,60000;' SET ACELERATION
 DC 12500,,,,60000,60000,60000,60000;' SET DECELERATION
 SP 25000,,,,30000,30000,30000,30000;' SET SPEED
-JS #HOME;' RUNS SLIT HOMING PROCEDURE AFTER CONTROLLER RESTART
+HOMERUN=0;' HOMING PROCEDURE HAS NOT BEEN RUN
 JS #LOOPER;' RUNS THE LOOPING PROCEDURE
 EN
 #LOOPER
@@ -52,6 +52,9 @@ AM
 MO
 RI
 #HOME
+IF (HOMERUN = 1)
+JP #ENDHOME
+ENDIF
 NO TE: MOVE SLIT FORWARD 10MM IF IT IS AGAINST THE REVERSE LIMIT SWITCH
 IF ((_TSE & 4) = 0)
 SHE
@@ -95,6 +98,8 @@ BGEFGH
 AMEFGH
 DP ,,,,0,0,0,0
 SP ,,,,30000,30000,30000,30000
+HOMERUN=1;'HOMING PROCEDURE HAS BEEN RUN
+#ENDHOME
 EN
 
 
diff --git a/site_ansto/instrument/hrpd/DMC2280/controller4.txt b/site_ansto/instrument/hrpd/DMC2280/controller4.txt
index 50535d28..5e9b9d0c 100644
--- a/site_ansto/instrument/hrpd/DMC2280/controller4.txt
+++ b/site_ansto/instrument/hrpd/DMC2280/controller4.txt
@@ -1,9 +1,9 @@
 #AUTO
-NO TE: $Revision: 1.5 $
-NO TE: $Date: 2006-11-01 06:04:09 $
+NO TE: $Revision: 1.6 $
+NO TE: $Date: 2006-11-02 02:49:04 $
 NO TE: Author: Dan Bartlett
 NO TE: Limit switch HOME routine added by Ferdi Franceschini
-NO TE: Last revision by: $Author: ffr $
+NO TE: Last revision by: $Author: dbx $
 NO TE:
 NO TE: A-SPARE
 NO TE: B-SPARE
@@ -21,7 +21,7 @@ IA 137,157,201,6;' CONFIGURES IP ADDRESS
 AC ,,,,60000,60000,60000,60000;' SET ACELERATION
 DC ,,,,60000,60000,60000,60000;' SET DECELERATION
 SP ,,,,30000,30000,30000,30000;' SET SPEED
-JS #HOME;' RUNS SLIT HOMING PROCEDURE AFTER CONTROLLER RESTART
+HOMERUN=0;' HOMING PROCEDURE HAS NOT BEEN RUN
 JS #LOOPER;'RUNS THE LOOPING PROCEDURE
 EN
 #LOOPER
@@ -39,6 +39,9 @@ AM
 MO
 RI
 #HOME
+IF (HOMERUN = 1)
+JP #ENDHOME
+ENDIF
 NO TE: MOVE SLIT FORWARD 10MM IF IT IS AGAINST THE REVERSE LIMIT SWITCH
 IF ((_TSE & 4) = 0)
 SHE
@@ -82,6 +85,8 @@ BGEFGH
 AMEFGH
 DP ,,,,0,0,0,0
 SP ,,,,30000,30000,30000,30000
+HOMERUN=1
+#ENDHOME
 EN