Support '!=' in If() and Wait()

Author: kasemir

scan/commands/iff.py

@@ -10,7 +10,7 @@ class If(Command):
     :param device:     Device name
     :param value:      Desired value.
     :param comparison: How current value is compared to the desired value.
-                       Options: '=', '>', '>=', '<' , '<='.
+                       Options: '=', '!=', '>', '>=', '<' , '<='.
     :param body:       One or more commands
     :param tolerance:  Tolerance when checking numeric `readback`.
                        Defaults to 0.1
@@ -22,6 +22,7 @@ class If(Command):
     """
 
     __comparisons= {'=':'EQUALS',
+                    '!=':'UNEQUAL',
                     '>':'ABOVE',
                     '>=':'AT_LEAST',
                     '<':'BELOW',

scan/commands/wait.py

@@ -16,7 +16,7 @@ class Wait(Command):
     :param  value:       Desired value.
     :param  comparison:  How current value is compared to the desired value.
                          Defaults to '='.
-                         Other options: '>', '>=', '<' , '<=', 'increase by','decrease by'
+                         Other options: '!=', '>', '>=', '<' , '<=', 'increase by','decrease by'
     :param  tolerance:  Tolerance used for numeric comparison. Defaults to 0, not used for string values.
     :param  timeout:    Timeout in seconds. Default 0 to wait 'forever'.
     :param  errhandler: Default None.
@@ -31,6 +31,7 @@ class Wait(Command):
     """
 
     __comparisons= {'=':'EQUALS',
+                    '!=':'UNEQUAL',
                     '>':'ABOVE',
                     '>=':'AT_LEAST',
                     '<':'BELOW',

scan/version.py

@@ -1,7 +1,8 @@
 
-__version__ = '1.5.3'
+__version__ = '1.5.4'
 
 version_history = """
+1.5.4 - Add '!=' to If() and Wait()
 1.5.3 - Fix 'id' vs. 'scanID' in patch()
 1.5.2 - Try to use cElementTree
 1.5.1 - ScanInfo.finish