From 0f0bbdd0618d9c2e35e4e7713f0fef2e8840d57a Mon Sep 17 00:00:00 2001 From: Patrick McDonagh Date: Fri, 15 Jul 2016 17:00:22 -0500 Subject: [PATCH] Fixes ipp reading from Micro800 using class instances --- POCloud_Driver/ipp.py | 6 ++---- POCloud_Driver/micro800.py | 4 ++-- 2 files changed, 4 insertions(+), 6 deletions(-) diff --git a/POCloud_Driver/ipp.py b/POCloud_Driver/ipp.py index 4d43094..154b9a5 100644 --- a/POCloud_Driver/ipp.py +++ b/POCloud_Driver/ipp.py @@ -2,13 +2,13 @@ import threading import time -import pickle from device_base import deviceBase import micro800 as u800 addr = '10.20.4.5' channels = {} + class Channel(): def read(self): valData = u800.readMicroTag(self.device_addr, self.tag) @@ -54,13 +54,11 @@ class Channel(): self.e300_param = e300_param self.read() - - def write(self, val, handshake=None, handshake_val=None): if self.writeable: h = handshake hval = handshake_val - if h == None: + if h is None: if u800.writeMicroTag(self.device_addr, self.tag, val, handshake=self.tag, handshake_val=val): self.sendFn(self.name, val, time.time()) self.last_value = val diff --git a/POCloud_Driver/micro800.py b/POCloud_Driver/micro800.py index fe991a0..5c5311a 100644 --- a/POCloud_Driver/micro800.py +++ b/POCloud_Driver/micro800.py @@ -3,14 +3,14 @@ import sys def readMicroTag(addr, tag): + addr = str(addr) + tag = str(tag) c = u800Driver() - if c.open(addr, True): try: v = c.read_tag(tag) # print(v) return v - except Exception: err = c.get_status() c.close()