Merge pull request #2 from mcmasterathl/master

USB Codes not supported for trigger combinations/sequences

diff --git a/kll_lib/containers.py b/kll_lib/containers.py
index fe00f842369ca9bb9a82bdd4eb1e566b138baed8..2436c7ea930356fd8c00310fa3a938d9e96b9a5e 100644 (file)
--- a/kll_lib/containers.py
+++ b/kll_lib/containers.py
@@ -159,6 +159,16 @@ class Macros:
                        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