Mercurial > louis > kiibohd-kll
changeset 28:bdcd737cddcb
Adding KEYPAD_ASTERISK (also internally renaming ASTERIX to ASTERISK)
- When possible, use the symbolic names for keys in generatedKeymap.h
e.g. KEY_A instead of 0x04
| author | Jacob Alexander <haata@kiibohd.com> |
|---|---|
| date | Fri, 20 Feb 2015 21:04:05 -0800 |
| parents | fabcd3621d25 |
| children | 53e68fe4b8fb |
| files | backends/kiibohd.py kll.py kll_lib/hid_dict.py |
| diffstat | 3 files changed, 5 insertions(+), 5 deletions(-) [+] |
line wrap: on
line diff
--- a/backends/kiibohd.py Mon Feb 16 13:48:01 2015 -0800 +++ b/backends/kiibohd.py Fri Feb 20 21:04:05 2015 -0800 @@ -186,7 +186,7 @@ # Add each of the arguments of the capability for arg in range( 0, len( resultItem[1] ) ): - self.fill_dict['ResultMacros'] += "0x{0:02X}, ".format( resultItem[1][ arg ] ) + self.fill_dict['ResultMacros'] += "{0}, ".format( resultItem[1][ arg ] ) # If sequence is longer than 1, append a sequence spacer at the end of the sequence # Required by USB to end at sequence without holding the key down
--- a/kll.py Mon Feb 16 13:48:01 2015 -0800 +++ b/kll.py Fri Feb 20 21:04:05 2015 -0800 @@ -401,7 +401,7 @@ # Only convert if an integer, otherwise USB Code doesn't need converting if isinstance( items[ variant ][ sequence ][ combo ], int ): # Use backend capability name and a single argument - items[ variant ][ sequence ][ combo ] = tuple( [ backend.usbCodeCapability(), tuple( [ items[ variant ][ sequence ][ combo ] ] ) ] ) + items[ variant ][ sequence ][ combo ] = tuple( [ backend.usbCodeCapability(), tuple( [ hid_lookup_dictionary[ items[ variant ][ sequence ][ combo ] ] ] ) ] ) return items
--- a/kll_lib/hid_dict.py Mon Feb 16 13:48:01 2015 -0800 +++ b/kll_lib/hid_dict.py Fri Feb 20 21:04:05 2015 -0800 @@ -3,7 +3,7 @@ # # USB Code Lookup Dictionary # -# Copyright (C) 2014 by Jacob Alexander +# Copyright (C) 2014-2015 by Jacob Alexander # # This file is free software: you can redistribute it and/or modify # it under the terms of the GNU General Public License as published by @@ -105,7 +105,7 @@ ( 0x52, 'KEY_UP' ), ( 0x53, 'KEY_NUM_LOCK' ), ( 0x54, 'KEYPAD_SLASH' ), - ( 0x55, 'KEYPAD_ASTERIX' ), + ( 0x55, 'KEYPAD_ASTERISK' ), ( 0x56, 'KEYPAD_MINUS' ), ( 0x57, 'KEYPAD_PLUS' ), ( 0x58, 'KEYPAD_ENTER' ), @@ -345,7 +345,7 @@ ( 'UP', 0x52 ), ( 'NUMLOCK', 0x53 ), ( 'P/', 0x54 ), ( 'KEYPAD SLASH', 0x54 ), - ( 'P*', 0x55 ), ( 'KEYPAD ASTERIX', 0x55 ), + ( 'P*', 0x55 ), ( 'KEYPAD ASTERIX', 0x55 ), ( 'KEYPAD ASTERISK', 0x55 ), ( 'P-', 0x56 ), ( 'KEYPAD MINUS', 0x56 ), ( 'P+', 0x57 ), ( 'KEYPAD PLUS', 0x57 ), ( 'PENTER', 0x58 ), ( 'KEYPAD ENTER', 0x58 ),