updates

dual_flowmeter/Channel.py

@@ -33,7 +33,7 @@ def read_tag(addr, tag, plc_type="CLX"):
                 log.error("Data Error during readTag({}, {}): {}".format(addr, tag, err))
     except CommError:
         # err = c.get_status()
-        clx.close()
+        #clx.close()
         log.error("Could not connect during readTag({}, {})".format(addr, tag))
     except AttributeError as err:
         clx.close()
@@ -87,7 +87,7 @@ def write_tag(addr, tag, val, plc_type="CLX"):
     except CommError as err:
         clx_err = clx.get_status()
         log.error("--\nCommError during write_tag({}, {}, {}, plc_type={})\n{}\n--".format(addr, tag, val, plc_type, err))
-        clx.close()
+        #clx.close()
     return False
 
 
@@ -114,6 +114,8 @@ class Channel(object):
         """Check to see if the new_value needs to be stored."""
         send_needed = False
         send_reason = ""
+        if new_value is None:
+            new_value = self.value
         if self.data_type == 'BOOL' or self.data_type == 'STRING':
             if self.last_send_time == 0:
                 send_needed = True
@@ -121,17 +123,17 @@ class Channel(object):
             elif self.value is None:
                 send_needed = True
                 send_reason = "no value"
+            elif (time.time() - self.last_send_time) > self.guarantee_sec:
+                send_needed = True
+                send_reason = "guarantee sec"
             elif self.value != new_value:
                 if self.map_:
-                    if not self.value == self.map_[new_value]:
+                    if (not self.value == self.map_[new_value]) or force_send:
                         send_needed = True
                         send_reason = "value change"
                 else:
                     send_needed = True
                     send_reason = "value change"
-            elif (time.time() - self.last_send_time) > self.guarantee_sec:
-                send_needed = True
-                send_reason = "guarantee sec"
             elif force_send:
                 send_needed = True
                 send_reason = "forced"