110_HOMF_-ProcHom, 100_HOMF: use HOMR when sitting on HLS

When the high limit switch is active, the motorRecord will block HOMF. Use HOMR instead
EuropeanSpallationSource · Jun 1, 2016 · 03adf26 · 03adf26
1 parent 6ad88b1
commit 03adf26
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 3 deletions.
diff --git a/epics/test/100_HOMF.py b/epics/test/100_HOMF.py
@@ -114,8 +114,12 @@ def tearDown(self):
     # Home the motor
     def test_TC_100(self):
         tc_no = "TC-100"
-        print '%s Home the motor forward' % tc_no
-        self.m1.put('HOMF', 1)
+        print '%s Home the motor' % tc_no
+	msta = int(self.m1.get('MSTA'))
+        if (msta & self.MSTA_BIT_PLUS_LS):
+            self.m1.put('HOMR', 1)
+        else:
+            self.m1.put('HOMF', 1)
         time_to_wait = 30
         if self.range_postion > 0 and self.homing_velocity > 0:
             time_to_wait = 1 + self.range_postion / self.homing_velocity + 2 * self.acceleration

diff --git a/epics/test/110_HOMF_-ProcHom.py b/epics/test/110_HOMF_-ProcHom.py
@@ -93,7 +93,8 @@ def homeTheMotor(tself, motor, tc_no, procHome, jogToLSBefore):
                      tself.moving_velocity, tself.acceleration)
 
     tself.pv_ProcHom.put(procHome)
-    if jogToLSBefore > 0:
+    msta = int(motor.get('MSTA'))
+    if (msta & tself.MSTA_BIT_PLUS_LS):
         motor.put('HOMR', 1)
     else:
         motor.put('HOMF', 1)