svn diff SUS2.py
Index: SUS2.py
===================================================================
--- SUS2.py	(revision 13677)
+++ SUS2.py	(working copy)
@@ -370,25 +370,25 @@
     def main(self):
         # for reporting trip status
         is_tripped()
-        reset_safe()
+        #reset_safe()
         self.done = False
 
     def run(self):
         # for reporting trip status
         is_tripped()
 
-        if is_aligning():
-            return
+        #if is_aligning():
+        #    return
 
-        if not self.done:
-            self.done = True
-            susobj.alignRampWrite(susconst.default_ramp_time)
-            log('Turning off Master Switch')
-            susobj.masterSwitchWrite('OFF')
+        #if not self.done:
+            #self.done = True
+            #susobj.alignRampWrite(susconst.default_ramp_time)
+            #log('Turning off Master Switch')
+            #susobj.masterSwitchWrite('OFF')
 
         # finish the state if we're no longer tripped
         if not is_tripped():
-            return 'SAFE'
+            return True
 
 
 class RESET(GuardState):
@@ -399,7 +399,6 @@
     @watchdog_check
     def main(self):
         reset_safe()
-
     @watchdog_check
     def run(self):
         if is_aligning():
@@ -500,7 +499,7 @@
 # ('FROM', 'TO')
 
 edges = [
-    ('TRIPPED','SAFE'),
+    ('TRIPPED', 'RESET'),
     ('INIT','SAFE'),
     ('RESET','SAFE'),
     ('SAFE','MASTERSWITCH_ON'),