diff --git a/pyad2usb/devices.py b/pyad2usb/devices.py index 183fa9e..f95fc8c 100644 --- a/pyad2usb/devices.py +++ b/pyad2usb/devices.py @@ -107,6 +107,7 @@ class USBDevice(Device): self._device = Ftdi() self._running = False self._interface = interface + self._id = '' self._read_thread = Device.ReadThread(self) @@ -137,6 +138,8 @@ class USBDevice(Device): self._description) self._device.set_baudrate(baudrate) + + self._id = 'USB {0}:{1}'.format(self._device.usb_dev.bus, self._device.usb_dev.address) except (usb.core.USBError, FtdiError), err: self.on_close() @@ -266,6 +269,7 @@ class SerialDevice(Device): self._buffer = '' self._running = False self._interface = interface + self._id = '' def __del__(self): """ @@ -293,6 +297,8 @@ class SerialDevice(Device): # Open the device and start up the reader thread. try: self._device.open() + self._id = '{0}'.format(self._interface) + except (serial.SerialException, ValueError), err: self.on_close() @@ -403,6 +409,7 @@ class SocketDevice(Device): self._device = None self._buffer = '' self._running = False + self._id = '' self._read_thread = Device.ReadThread(self) @@ -422,6 +429,8 @@ class SocketDevice(Device): try: self._device = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self._device.connect((self._host, self._port)) + self._id = '{0}:{1}'.format(self._host, self._port) + except socket.error, err: self.on_close() diff --git a/test.py b/test.py index a86c2ff..4087790 100755 --- a/test.py +++ b/test.py @@ -114,6 +114,8 @@ def test_usb(): a2u.open() + print dev._id + while running: time.sleep(0.1) @@ -130,6 +132,8 @@ def test_serial(): a2u.open() + print dev._id + while running: time.sleep(0.1) @@ -145,6 +149,7 @@ def test_usb_serial(): a2u.on_write += handle_write a2u.open(baudrate=115200) + print dev._id while running: time.sleep(0.1) @@ -200,6 +205,8 @@ def test_socket(): a2u.open() + print dev._id + while running: time.sleep(0.1) @@ -229,7 +236,7 @@ try: #test_usb_serial() #test_factory() #test_factory_watcher() - upload_usb() + #upload_usb() #upload_usb_serial() #test_socket()