Get fixes from master

Author: Myles Metzler

chamberconnectlibrary/espec.py

@@ -150,10 +150,13 @@ def set_loop(self, N, loop_type, param_list):
         if (spt1 or spt2 or spt3) and ('enable' in param_list or 'mode' in param_list):
             if 'enable' in param_list:
                 enable = param_list.pop('enable')
+                if isinstance(enable, dict):
+                    enable = enable['constant']
             else:
-                enable = param_list.pop('mode') in ['On', 'ON', 'on']
-            if isinstance(enable, dict):
-                enable = enable['constant']
+                my_mode = param_list.pop('mode')
+                if isinstance(my_mode, dict):
+                    my_mode = my_mode['constant']
+                enable = my_mode in ['On', 'ON', 'on']
             if spt1:
                 spv = param_list.pop('setpoint')
             elif spt2:
@@ -162,10 +165,7 @@ def set_loop(self, N, loop_type, param_list):
                 spv = param_list.pop('setValue')
             if isinstance(spv, dict):
                 spv = spv['constant']
-            params = {
-                'setpoint':spv,
-                'enable':enable['constant'] if isinstance(enable, dict) else enable
-            }
+            params = {'setpoint':spv, 'enable':enable}
             if range in param_list:
                 params.update(param_list.pop('range'))
             if self.lpd[N] == self.temp:

chamberconnectlibrary/p300.py

@@ -1033,10 +1033,10 @@ def write_humi(self, **kwargs):
         '''
         setpoint, maximum, minimum = kwargs.get('setpoint'), kwargs.get('max'), kwargs.get('min')
         enable = kwargs.get('enable')
-        if setpoint is not None:
-            spstr = ' S%0.1f' % setpoint
-        elif enable is False:
+        if enable is False:
             spstr = 'SOFF'
+        elif setpoint is not None:
+            spstr = ' S%0.1f' % setpoint
         else:
             spstr = None
         if spstr is not None and minimum is not None and maximum is not None: