changeset 38:8ab422c330f7

Merge pull request #2 from mcmasterathl/master USB Codes not supported for trigger combinations/sequences
author Jacob Alexander <haata@kiibohd.com>
date Sat, 28 Feb 2015 22:51:07 -0800
parents b0a3c0d44fe9 (current diff) 679e724d1ed6 (diff)
children b242f1b264d6 7a1e4c2a4894
files
diffstat 1 files changed, 10 insertions(+), 0 deletions(-) [+]
line wrap: on
line diff
--- a/kll_lib/containers.py	Sat Feb 28 22:23:14 2015 -0800
+++ b/kll_lib/containers.py	Sat Feb 28 22:51:07 2015 -0800
@@ -159,6 +159,16 @@
 			if usbCode in self.macros[ self.layer ][ macro ]:
 				scanCodeList.append( macro )
 
+		if len(scanCodeList) == 0:
+			if len(usbCode) > 1 or len(usbCode[0]) > 1:
+				for combo in usbCode:
+					comboCodes = list()
+					for key in combo:
+						scanCode = self.lookupUSBCodes(((key,),))
+						comboCodes.append(scanCode[0][0][0])
+					scanCodeList.append(tuple(code for code in comboCodes))
+				scanCodeList = [tuple(scanCodeList)]
+
 		return scanCodeList
 
 	# Cache USBCode Assignment