minor tweaks

This commit is contained in:
ewall
2010-09-03 14:22:49 -04:00
parent c6e6e0c440
commit 8fa4f865c1

View File

@@ -14,6 +14,7 @@
import logging import logging
from time import sleep from time import sleep
from sys import exit
import usb import usb
### Global Configuration ### Global Configuration
@@ -41,7 +42,7 @@ class UsbDevice:
if dev.idVendor==vendor_id and dev.idProduct==product_id: if dev.idVendor==vendor_id and dev.idProduct==product_id:
if count==skip: if count==skip:
log.info("iBuddy device found (vend: %s, prod: %s)." % (dev.idVendor, dev.idProduct)) log.info("USB device found (vend: %s, prod: %s)." % (dev.idVendor, dev.idProduct))
self.dev = dev self.dev = dev
self.conf = self.dev.configurations[0] self.conf = self.dev.configurations[0]
@@ -49,7 +50,7 @@ class UsbDevice:
self.endpoints = [] self.endpoints = []
for endpoint in self.intf.endpoints: for endpoint in self.intf.endpoints:
self.endpoints.append(endpoint) self.endpoints.append(endpoint)
log.info("Endpoint found.") log.info("USB endpoint found.")
return return
else: else:
count=count+1 count=count+1
@@ -117,7 +118,8 @@ class iBuddyDevice:
self.dev.handle.controlMsg(0x21, 0x09, self.MESS+(inp,), 0x02, 0x01) self.dev.handle.controlMsg(0x21, 0x09, self.MESS+(inp,), 0x02, 0x01)
except usb.USBError: except usb.USBError:
if DEBUG: if DEBUG:
raise self.__init__()
#raise
else: else:
self.__init__() self.__init__()
@@ -251,7 +253,7 @@ if __name__ == '__main__':
buddy = iBuddyDevice() buddy = iBuddyDevice()
except NoBuddyException, e: except NoBuddyException, e:
log.exception("No iBuddy device found!") log.exception("No iBuddy device found!")
sys.exit(1) exit(1)
# demo command macros # demo command macros
buddy.doColorName(iBuddyDevice.PURPLE, 0.5) buddy.doColorName(iBuddyDevice.PURPLE, 0.5)