di0ib
/
kll
Watch 1
Star 0
Fork 0
Code Releases 0 Activity
Browse Source

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
simple
Jacob Alexander 9 years ago
parent
3e85108acd
commit
25043fa0ee
3 changed files with 5 additions and 5 deletions
Split View Show Diff Stats
  1. 1
    1
      backends/kiibohd.py
  2. 1
    1
      kll.py
  3. 3
    3
      kll_lib/hid_dict.py

+ 1
- 1
backends/kiibohd.py View File

@@ -186,7 +186,7 @@ class Backend:

# 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

+ 1
- 1
kll.py View File

@@ -401,7 +401,7 @@ def usbCodeToCapability( items ):
# 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


+ 3
- 3
kll_lib/hid_dict.py View File

@@ -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 @@ hid_lookup_dictionary = dict([
( 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 @@ kll_hid_lookup_dictionary = dict([
( '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 ),