From: Jacob Alexander Date: Sun, 1 Mar 2015 06:51:07 +0000 (-0800) Subject: Merge pull request #2 from mcmasterathl/master X-Git-Url: https://git.donarmstrong.com/?p=kiibohd-kll.git;a=commitdiff_plain;h=1c983492d765bf66e833c00941a079ead02ae8d6;hp=431b17ca4f47265d5dc534bacd32564b425af64a 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 fe00f84..2436c7e 100644 --- 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