# HG changeset patch # User Jacob Alexander # Date 1425192667 28800 # Node ID 8ab422c330f743dd8e0a0d6bfd11173f3e2263b0 # Parent b0a3c0d44fe91b2fdf5df1645cb327fb8925a1b1# Parent 679e724d1ed6058a444bf09af21bb3429b3b5643 Merge pull request #2 from mcmasterathl/master USB Codes not supported for trigger combinations/sequences diff -r b0a3c0d44fe9 -r 8ab422c330f7 kll_lib/containers.py --- 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