From c3cb7a61bbf1e6b776bc919a0fdd8584ee422614 Mon Sep 17 00:00:00 2001 From: Donal McMullan Date: Wed, 18 Jan 2012 00:25:57 +1300 Subject: [PATCH 1/3] Added missing import of usb.control --- src/ant/core/driver.py | 1 + 1 file changed, 1 insertion(+) diff --git a/src/ant/core/driver.py b/src/ant/core/driver.py index a091d68..236cd9f 100644 --- a/src/ant/core/driver.py +++ b/src/ant/core/driver.py @@ -30,6 +30,7 @@ # USB2 driver uses direct USB connection. Requires PyUSB import usb.core import usb.util +import usb.control from ant.core.exceptions import DriverError From c1bea8fb6818aa983edea7576a8cbb06c41a9cce Mon Sep 17 00:00:00 2001 From: Donal McMullan Date: Wed, 18 Jan 2012 00:26:30 +1300 Subject: [PATCH 2/3] Fix for "AttributeError: 'Interface' object has no attribute 'AlternateSetting'" --- src/ant/core/driver.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/ant/core/driver.py b/src/ant/core/driver.py index 236cd9f..bd39220 100644 --- a/src/ant/core/driver.py +++ b/src/ant/core/driver.py @@ -195,7 +195,7 @@ def _open(self): alternate_setting = usb.control.get_interface(dev, interface_number) intf = usb.util.find_descriptor( cfg, bInterfaceNumber = interface_number, - AlternateSetting = alternate_setting + bAlternateSetting = alternate_setting ) usb.util.claim_interface(dev, interface_number) ep_out = usb.util.find_descriptor( From bdec46abacc5a363beede59ad2c040bb0ae91dfc Mon Sep 17 00:00:00 2001 From: Tom Wardill Date: Sat, 8 Sep 2012 09:47:28 +0100 Subject: [PATCH 3/3] Make processevents work with a Suunto MovestickMini --- demos/ant.core/04-processevents.py | 2 +- src/ant/core/event.py | 5 +++-- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/demos/ant.core/04-processevents.py b/demos/ant.core/04-processevents.py index aab09cd..815dd7b 100644 --- a/demos/ant.core/04-processevents.py +++ b/demos/ant.core/04-processevents.py @@ -24,7 +24,7 @@ def process(self, msg): print 'Heart Rate:', ord(msg.payload[-1]) # Initialize -stick = driver.USB1Driver(SERIAL, log=LOG, debug=DEBUG) +stick = driver.USB2Driver(SERIAL, log=LOG, debug=DEBUG) antnode = node.Node(stick) antnode.start() diff --git a/src/ant/core/event.py b/src/ant/core/event.py index ddb85da..848f7d5 100644 --- a/src/ant/core/event.py +++ b/src/ant/core/event.py @@ -41,7 +41,7 @@ def ProcessBuffer(buffer_): messages = [] - + while True: hf = Message() try: @@ -63,8 +63,9 @@ def EventPump(evm): evm.pump_lock.release() go = True - buffer_ = '' + while go: + buffer_ = '' evm.running_lock.acquire() if not evm.running: go = False