diff --git a/pyad2usb/ad2usb.py b/pyad2usb/ad2usb.py index 743e2fe..f800c64 100644 --- a/pyad2usb/ad2usb.py +++ b/pyad2usb/ad2usb.py @@ -22,6 +22,8 @@ class Overseer(object): @classmethod def create(cls, device=None): + cls.find_all() + if len(cls.__devices) == 0: raise util.NoDeviceError('No AD2USB devices present.') @@ -53,7 +55,8 @@ class Overseer(object): self.stop() def start(self): - self._detect_thread.start() + if not self._detect_thread.is_alive(): + self._detect_thread.start() def stop(self): self._detect_thread.stop() diff --git a/test.py b/test.py index 551f130..fecd048 100755 --- a/test.py +++ b/test.py @@ -39,19 +39,22 @@ try: #print pyad2usb.ad2usb.devices.SerialDevice.find_all() - #dev = overseer.get_device() + #a2u = overseer.get_device() + + a2u = pyad2usb.ad2usb.Overseer.create() - #dev = pyad2usb.ad2usb.Overseer.create() #dev = pyad2usb.ad2usb.devices.SerialDevice(interface='/dev/ttyUSB0') - dev = pyad2usb.ad2usb.devices.USBDevice()#serial='A101A429', description='FT232R USB UART') + #dev = pyad2usb.ad2usb.devices.USBDevice()#serial='A101A429', description='FT232R USB UART') - a2u = pyad2usb.ad2usb.AD2USB(dev) + #a2u = pyad2usb.ad2usb.AD2USB(dev) a2u.on_open += handle_open a2u.on_close += handle_close a2u.on_read += handle_read a2u.on_write += handle_write - #a2u.open(baudrate=19200, interface='/dev/ttyUSB0') + a2u.open() + #a2u.open(baudrate=19200, interface='/dev/ttyUSB0') + #dev.open(baudrate=115200, interface='/dev/ttyUSB5') #dev.open(baudrate=19200, interface='/dev/ttyUSB0') #dev.open() @@ -63,7 +66,6 @@ try: #dev.close() #overseer.close() - #wut.close() except Exception, err: #print 'Error: {0}'.format(str(err)) traceback.print_exc(err)