Browse Source

Added _id to devices.

pyserial_fix
Scott Petersen 13 years ago
parent
commit
5e3d0ec252
2 changed files with 17 additions and 1 deletions
  1. +9
    -0
      pyad2usb/devices.py
  2. +8
    -1
      test.py

+ 9
- 0
pyad2usb/devices.py View File

@@ -107,6 +107,7 @@ class USBDevice(Device):
self._device = Ftdi() self._device = Ftdi()
self._running = False self._running = False
self._interface = interface self._interface = interface
self._id = ''


self._read_thread = Device.ReadThread(self) self._read_thread = Device.ReadThread(self)


@@ -137,6 +138,8 @@ class USBDevice(Device):
self._description) self._description)


self._device.set_baudrate(baudrate) 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: except (usb.core.USBError, FtdiError), err:
self.on_close() self.on_close()


@@ -266,6 +269,7 @@ class SerialDevice(Device):
self._buffer = '' self._buffer = ''
self._running = False self._running = False
self._interface = interface self._interface = interface
self._id = ''


def __del__(self): def __del__(self):
""" """
@@ -293,6 +297,8 @@ class SerialDevice(Device):
# Open the device and start up the reader thread. # Open the device and start up the reader thread.
try: try:
self._device.open() self._device.open()
self._id = '{0}'.format(self._interface)

except (serial.SerialException, ValueError), err: except (serial.SerialException, ValueError), err:
self.on_close() self.on_close()


@@ -403,6 +409,7 @@ class SocketDevice(Device):
self._device = None self._device = None
self._buffer = '' self._buffer = ''
self._running = False self._running = False
self._id = ''


self._read_thread = Device.ReadThread(self) self._read_thread = Device.ReadThread(self)


@@ -422,6 +429,8 @@ class SocketDevice(Device):
try: try:
self._device = socket.socket(socket.AF_INET, socket.SOCK_STREAM) self._device = socket.socket(socket.AF_INET, socket.SOCK_STREAM)
self._device.connect((self._host, self._port)) self._device.connect((self._host, self._port))
self._id = '{0}:{1}'.format(self._host, self._port)

except socket.error, err: except socket.error, err:
self.on_close() self.on_close()




+ 8
- 1
test.py View File

@@ -114,6 +114,8 @@ def test_usb():


a2u.open() a2u.open()


print dev._id

while running: while running:
time.sleep(0.1) time.sleep(0.1)


@@ -130,6 +132,8 @@ def test_serial():


a2u.open() a2u.open()


print dev._id

while running: while running:
time.sleep(0.1) time.sleep(0.1)


@@ -145,6 +149,7 @@ def test_usb_serial():
a2u.on_write += handle_write a2u.on_write += handle_write


a2u.open(baudrate=115200) a2u.open(baudrate=115200)
print dev._id


while running: while running:
time.sleep(0.1) time.sleep(0.1)
@@ -200,6 +205,8 @@ def test_socket():


a2u.open() a2u.open()


print dev._id

while running: while running:
time.sleep(0.1) time.sleep(0.1)


@@ -229,7 +236,7 @@ try:
#test_usb_serial() #test_usb_serial()
#test_factory() #test_factory()
#test_factory_watcher() #test_factory_watcher()
upload_usb()
#upload_usb()
#upload_usb_serial() #upload_usb_serial()


#test_socket() #test_socket()


Loading…
Cancel
Save