From: Jacob Alexander Date: Tue, 29 Sep 2015 03:00:22 +0000 (-0700) Subject: Adding layer rotation (next/prev) support X-Git-Url: https://git.donarmstrong.com/?p=kiibohd-kll.git;a=commitdiff_plain;h=57d01ed8725f2d06bd157d2355bb149172708b3b Adding layer rotation (next/prev) support - Includes symbolic names --- diff --git a/kll_lib/hid_dict.py b/kll_lib/hid_dict.py index a0bfc5b..18d0547 100644 --- a/kll_lib/hid_dict.py +++ b/kll_lib/hid_dict.py @@ -262,7 +262,7 @@ hid_lookup_dictionary = dict([ ( ('USB', 0xFD), 'KEY_FUN14' ), ( ('USB', 0xFE), 'KEY_FUN15' ), ( ('USB', 0xFF), 'KEY_FUN16' ), -# ('USB', 0x100) to ('USB', 0x11F) for function key placeholders, not valid usb codes (must use a translation .kll file before firmware compilation) +# ('USB', 0x100) to ('USB', 0x121) for function key placeholders, not valid usb codes (must use a translation .kll file before firmware compilation) ( ('USB', 0x100), 'KEY_LCK1' ), ( ('USB', 0x101), 'KEY_LCK2' ), ( ('USB', 0x102), 'KEY_LCK3' ), @@ -295,6 +295,8 @@ hid_lookup_dictionary = dict([ ( ('USB', 0x11D), 'KEY_LAT14' ), ( ('USB', 0x11E), 'KEY_LAT15' ), ( ('USB', 0x11F), 'KEY_LAT16' ), + ( ('USB', 0x120), 'KEY_NEXT_LAYER' ), + ( ('USB', 0x121), 'KEY_PREV_LAYER' ), # USB HID Consumer Control Codes # List of Consumer Codes - USB HID 1.12v2 @@ -1057,6 +1059,8 @@ kll_hid_lookup_dictionary['USBCode'] = dict([ ( 'LAT14', ('USB', 0x11D) ), ( 'LATCH14', ('USB', 0x11D) ), ( 'LAT15', ('USB', 0x11E) ), ( 'LATCH15', ('USB', 0x11E) ), ( 'LAT16', ('USB', 0x11F) ), ( 'LATCH16', ('USB', 0x11F) ), + ( 'NLAYER', ('USB', 0x120) ), ( 'NEXT LAYER', ('USB', 0x120) ), + ( 'PLAYER', ('USB', 0x121) ), ( 'PREV LAYER', ('USB', 0x121) ), ]) diff --git a/layouts/lcdFuncMap.kll b/layouts/lcdFuncMap.kll index b9d979c..5b89b3e 100644 --- a/layouts/lcdFuncMap.kll +++ b/layouts/lcdFuncMap.kll @@ -4,7 +4,7 @@ Author = "HaaTa (Jacob Alexander) 2015"; KLL = 0.3c; # Modified Date -Date = 2015-09-20; +Date = 2015-09-24; # Maps each Function key incrementally to each layer # Unused layers and functions are ignored @@ -60,6 +60,10 @@ U"Latch14" : layerLatch( 14 ) + LCDLayerDisplay(); U"Latch15" : layerLatch( 15 ) + LCDLayerDisplay(); U"Latch16" : layerLatch( 16 ) + LCDLayerDisplay(); +# Layer rotation +U"Next Layer" : layerRotate( 0 ) + LCDLayerDisplay(); # 0 is Next +U"Prev Layer" : layerRotate( 1 ) + LCDLayerDisplay(); # 1 is Previous + # Colours assigned to each of the LCD numbers # The "top of stack" layer is the colour used diff --git a/layouts/stdFuncMap.kll b/layouts/stdFuncMap.kll index 7d1e6c8..cba6fb0 100644 --- a/layouts/stdFuncMap.kll +++ b/layouts/stdFuncMap.kll @@ -4,7 +4,7 @@ Author = "HaaTa (Jacob Alexander) 2014-2015"; KLL = 0.3; # Modified Date -Date = 2015-09-20; +Date = 2015-09-24; # Maps each Function key incrementally to each layer # Unused layers and functions are ignored @@ -60,3 +60,7 @@ U"Latch14" : layerLatch( 14 ); U"Latch15" : layerLatch( 15 ); U"Latch16" : layerLatch( 16 ); +# Layer rotation +U"Next Layer" : layerRotate( 0 ); # 0 is Next +U"Prev Layer" : layerRotate( 1 ); # 1 is Previous +