Merge remote-tracking branch 'ledger/master'

zakurai · Mar 21, 2018 · 7e19420 · 7e19420
2 parents e44d6f5 + 6e985b5
commit 7e19420
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 5 deletions.
diff --git a/btchip/btchip.py b/btchip/btchip.py
@@ -79,8 +79,8 @@ def __init__(self, dongle):
 		self.dongle = dongle
 		self.needKeyCache = False
 		try:
-			firmware = self.getFirmwareVersion()['version'].split(".")
-			self.multiOutputSupported = int(firmware[0]) >= 1 and int(firmware[1]) >= 1 and int(firmware[2]) >= 4
+			firmware = self.getFirmwareVersion()['version']
+			self.multiOutputSupported = tuple(map(int, (firmware.split(".")))) >= (1, 1, 4)
 			if self.multiOutputSupported:
 				self.scriptBlockLength = 50
 			else:

diff --git a/btchip/btchipComm.py b/btchip/btchipComm.py
@@ -220,8 +220,9 @@ def getDongle(debug=False):
 				hidDevicePath = hidDevice['path']
 				ledger = True
 			if hidDevice['vendor_id'] == 0x2c97:
-				hidDevicePath = hidDevice['path']
-				ledger = True
+				if ('interface_number' in hidDevice and hidDevice['interface_number'] == 0) or ('usage_page' in hidDevice and hidDevice['usage_page'] == 0xffa0):
+					hidDevicePath = hidDevice['path']
+					ledger = True
 			if hidDevice['vendor_id'] == 0x2581 and hidDevice['product_id'] == 0x1807:
 				hidDevicePath = hidDevice['path']
 	if hidDevicePath is not None:

diff --git a/setup.py b/setup.py
@@ -7,7 +7,7 @@
 here = dirname(__file__)
 setup(
     name='btchip-python',
-    version='0.1.24',
+    version='0.1.26',
     author='BTChip',
     author_email='[email protected]',
     description='Python library to communicate with Ledger Nano dongle',