diff --git a/README.markdown b/README.markdown index 3b732ca..866f0b2 100644 --- a/README.markdown +++ b/README.markdown @@ -1,6 +1,12 @@ kll - keyboard layout language ============================== +[![https://travis-ci.org/kiibohd/kll](https://travis-ci.org/kiibohd/kll.svg?branch=master)](https://travis-ci.org/kiibohd/kll) + +[![Visit our IRC channel](https://kiwiirc.com/buttons/irc.freenode.net/input.club.png)](https://kiwiirc.com/client/irc.freenode.net/#input.club) + +## If you're trying to compile keyboard firmware, you want [THIS](https://github.com/kiibohd/controller/) + KLL Compiler ------------ @@ -31,11 +37,3 @@ Patches/Features/Backends ------------------------- Completely welcome :D - - -Spec Additions/Fixes --------------------- - -Contact HaaTa via IRC (#geekhack@irc.freenode.net or #deskthority). -Or by email -> haata@kiibohd.com - diff --git a/backends/kiibohd.py b/backends/kiibohd.py index d4f1e55..6bd333c 100644 --- a/backends/kiibohd.py +++ b/backends/kiibohd.py @@ -1,9 +1,10 @@ #!/usr/bin/env python3 -# KLL Compiler - Kiibohd Backend -# -# Backend code generator for the Kiibohd Controller firmware. -# -# Copyright (C) 2014-2015 by Jacob Alexander +''' +KLL Compiler - Kiibohd Backend + +Backend code generator for the Kiibohd Controller firmware. +''' +# Copyright (C) 2014-2016 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 @@ -37,6 +38,11 @@ from kll_lib.hid_dict import * ### Classes ### class Backend( BackendBase ): + ''' + Kiibohd Code-Generation Backend + + Kiibohd specific code generation. + ''' # Default templates and output files templatePaths = ["templates/kiibohdKeymap.h", "templates/kiibohdDefs.h"] outputPaths = ["generatedKeymap.h", "kll_defs.h"] @@ -119,11 +125,14 @@ class Backend( BackendBase ): ## Defines ## self.fill_dict['Defines'] = "" + stateWordSize = "" # Iterate through defines and lookup the variables for define in variables.defines.keys(): if define in variables.overallVariables.keys(): self.fill_dict['Defines'] += "\n#define {0} {1}".format( variables.defines[ define ], variables.overallVariables[ define ].replace( '\n', ' \\\n' ) ) + if define == "stateWordSize": + stateWordSize = variables.overallVariables[ define ] else: print( "{0} '{1}' not defined...".format( WARNING, define ) ) @@ -144,6 +153,9 @@ class Backend( BackendBase ): self.fill_dict['CapabilitiesList'] += "};" self.fill_dict['CapabilitiesIndices'] += "} CapabilityIndex;" + # Define for total number of capabilities + self.fill_dict['Defines'] += "\n#define CapabilitiesNum_KLL {0}".format( len( capabilities.keys() ) ) + ## Results Macros ## self.fill_dict['ResultMacros'] = "" @@ -215,15 +227,21 @@ class Backend( BackendBase ): self.fill_dict['ResultMacroList'] += "\tDefine_RM( {0} ),\n".format( result ) self.fill_dict['ResultMacroList'] += "};" + results_count = len( macros.resultsIndexSorted ) + ## Result Macro Record ## self.fill_dict['ResultMacroRecord'] = "ResultMacroRecord ResultMacroRecordList[ ResultMacroNum ];" + # Define for total number of Result Macros + self.fill_dict['Defines'] += "\n#define ResultMacroNum_KLL {0}".format( len( macros.resultsIndexSorted ) ) + ## Trigger Macros ## self.fill_dict['TriggerMacros'] = "" # Iterate through each of the trigger macros + triggers_count = len( macros.triggersIndexSorted ); for trigger in range( 0, len( macros.triggersIndexSorted ) ): self.fill_dict['TriggerMacros'] += "Guide_TM( {0} ) = {{ ".format( trigger ) @@ -249,6 +267,13 @@ class Backend( BackendBase ): self.fill_dict['TriggerMacros'] += "0 };\n" self.fill_dict['TriggerMacros'] = self.fill_dict['TriggerMacros'][ :-1 ] # Remove last newline + # check for too small stateWordSize + if stateWordSize == "8" and (triggers_count > 255 or results_count > 255): + print ("{0} Over 255 trigger or result macros, changing stateWordSize from {1} to 16.".format( WARNING, stateWordSize ) ) + print( "Results count: ", results_count ) + print( "Triggers count: ", triggers_count ) + stateWordSize == "16" + self.fill_dict['Defines'] = self.fill_dict['Defines'].replace("StateWordSize_define 8", "StateWordSize_define 16") ## Trigger Macro List ## self.fill_dict['TriggerMacroList'] = "const TriggerMacro TriggerMacroList[] = {\n" @@ -263,6 +288,9 @@ class Backend( BackendBase ): ## Trigger Macro Record ## self.fill_dict['TriggerMacroRecord'] = "TriggerMacroRecord TriggerMacroRecordList[ TriggerMacroNum ];" + # Define for total number of Trigger Macros + self.fill_dict['Defines'] += "\n#define TriggerMacroNum_KLL {0}".format( len( macros.triggersIndexSorted ) ) + ## Max Scan Code ## self.fill_dict['MaxScanCode'] = "#define MaxScanCode 0x{0:X}".format( macros.overallMaxScanCode ) @@ -354,6 +382,9 @@ class Backend( BackendBase ): self.fill_dict['LayerIndexList'] += '\tLayer_IN( layer{0}_scanMap, "{0}: {2}", 0x{1:02X} ),\n'.format( layer, firstScanCode, stackName ) self.fill_dict['LayerIndexList'] += "};" + # Define for total number of Trigger Macros + self.fill_dict['Defines'] += "\n#define LayerNum_KLL {0}".format( len( macros.triggerList ) ) + ## Layer State ## self.fill_dict['LayerState'] = "uint8_t LayerState[ LayerNum ];" diff --git a/kll.py b/kll.py index 27170f1..1ad0244 100755 --- a/kll.py +++ b/kll.py @@ -1,7 +1,9 @@ #!/usr/bin/env python3 -# KLL Compiler -# Keyboard Layout Langauge -# +''' +KLL Compiler +Keyboard Layout Langauge +''' + # Copyright (C) 2014-2016 by Jacob Alexander # # This file is free software: you can redistribute it and/or modify @@ -21,21 +23,16 @@ import argparse import importlib -import io import os -import re import sys -import token -from pprint import pformat from re import VERBOSE -from tokenize import generate_tokens from kll_lib.containers import * from kll_lib.hid_dict import * from funcparserlib.lexer import make_tokenizer, Token, LexerError -from funcparserlib.parser import (some, a, many, oneplus, skip, finished, maybe, skip, forward_decl, NoParseError) +from funcparserlib.parser import (some, a, many, oneplus, finished, maybe, skip, NoParseError) @@ -84,7 +81,7 @@ def processCommandLineArgs(): pArgs.add_argument( '-b', '--backend', type=str, default="kiibohd", help="Specify target backend for the KLL compiler.\n" "Default: kiibohd\n" - "Options: kiibohd" ) + "Options: kiibohd, json" ) pArgs.add_argument( '-d', '--default', type=str, nargs='+', help="Specify .kll files to layer on top of the default map to create a combined map." ) pArgs.add_argument( '-p', '--partial', type=str, nargs='+', action='append', @@ -142,30 +139,20 @@ def tokenize( string ): ( 'ConsCodeStart', ( r'CONS\[', ) ), ( 'SysCode', ( r'SYS(("[^"]+")|(0x[0-9a-fA-F]+)|([0-9]+))', ) ), ( 'SysCodeStart', ( r'SYS\[', ) ), + ( 'LedCode', ( r'LED(("[^"]+")|(0x[0-9a-fA-F]+)|([0-9]+))', ) ), + ( 'LedCodeStart', ( r'LED\[', ) ), ( 'ScanCode', ( r'S((0x[0-9a-fA-F]+)|([0-9]+))', ) ), ( 'ScanCodeStart', ( r'S\[', ) ), - ( 'Indicator', ( r'I(("[^"]+")|(0x[0-9a-fA-F]+)|([0-9]+))', ) ), - ( 'IndicatorStart', ( r'I\[', ) ), - ( 'Pixel', ( r'P"[^"]+"', ) ), - ( 'PixelStart', ( r'P\[', ) ), - ( 'PixelLayer', ( r'PL"[^"]+"', ) ), - ( 'PixelLayerStart', ( r'PL\[', ) ), - ( 'Animation', ( r'A"[^"]+"', ) ), - ( 'AnimationStart', ( r'A\[', ) ), - ( 'CodeBegin', ( r'\[', ) ), ( 'CodeEnd', ( r'\]', ) ), - ( 'Position', ( r'r?[xyz]:[0-9]+(.[0-9]+)?', ) ), ( 'String', ( r'"[^"]*"', ) ), ( 'SequenceString', ( r"'[^']*'", ) ), - ( 'PixelOperator', ( r'(\+:|-:|>>|<<)', ) ), - ( 'Operator', ( r'=>|<=|:\+|:-|::|:|=', ) ), + ( 'Operator', ( r'=>|:\+|:-|::|:|=', ) ), + ( 'Number', ( r'(-[ \t]*)?((0x[0-9a-fA-F]+)|(0|([1-9][0-9]*)))', VERBOSE ) ), ( 'Comma', ( r',', ) ), ( 'Dash', ( r'-', ) ), ( 'Plus', ( r'\+', ) ), ( 'Parenthesis', ( r'\(|\)', ) ), ( 'None', ( r'None', ) ), - ( 'Timing', ( r'[0-9]+(.[0-9]+)?((s)|(ms)|(us))', ) ), - ( 'Number', ( r'-?(0x[0-9a-fA-F]+)|(0|([1-9][0-9]*))', VERBOSE ) ), ( 'Name', ( r'[A-Za-z_][A-Za-z_0-9]*', ) ), ( 'VariableContents', ( r'''[^"' ;:=>()]+''', ) ), ( 'EndOfLine', ( r';', ) ), @@ -189,308 +176,196 @@ capabilities_dict = Capabilities() ## Parsing Functions -class Make: - def scanCode( token ): - scanCode = int( token[1:], 0 ) - # Check size, to make sure it's valid - # XXX Add better check that takes symbolic names into account (i.e. U"Latch5") - #if scanCode > 0xFF: - # print ( "{0} ScanCode value {1} is larger than 255".format( ERROR, scanCode ) ) - # raise - return scanCode +def make_scanCode( token ): + scanCode = int( token[1:], 0 ) + # Check size, to make sure it's valid + # XXX Add better check that takes symbolic names into account (i.e. U"Latch5") + #if scanCode > 0xFF: + # print ( "{0} ScanCode value {1} is larger than 255".format( ERROR, scanCode ) ) + # raise + return scanCode - def hidCode( type, token ): - # If first character is a U or I, strip - if token[0] == "U" or token[0] == "I": - token = token[1:] - # CONS specifier - elif 'CONS' in token: - token = token[4:] - # SYS specifier - elif 'SYS' in token: - token = token[3:] +def make_hidCode( type, token ): + # If first character is a U, strip + if token[0] == "U": + token = token[1:] + # CONS specifier + elif 'CONS' in token: + token = token[4:] + # SYS specifier + elif 'SYS' in token: + token = token[3:] - # If using string representation of USB Code, do lookup, case-insensitive - if '"' in token: - try: - hidCode = kll_hid_lookup_dictionary[ type ][ token[1:-1].upper() ][1] - except LookupError as err: - print ( "{0} {1} is an invalid USB HID Code Lookup...".format( ERROR, err ) ) - raise + # If using string representation of USB Code, do lookup, case-insensitive + if '"' in token: + try: + hidCode = kll_hid_lookup_dictionary[ type ][ token[1:-1].upper() ][1] + except LookupError as err: + print ( "{0} {1} is an invalid USB HID Code Lookup...".format( ERROR, err ) ) + raise + else: + # Already tokenized + if type == 'USBCode' and token[0] == 'USB' or type == 'SysCode' and token[0] == 'SYS' or type == 'ConsCode' and token[0] == 'CONS': + hidCode = token[1] + # Convert else: - # Already tokenized - if type == 'USBCode' and token[0] == 'USB' or type == 'SysCode' and token[0] == 'SYS' or type == 'ConsCode' and token[0] == 'CONS': - hidCode = token[1] - # Convert - else: - hidCode = int( token, 0 ) + hidCode = int( token, 0 ) - # Check size if a USB Code, to make sure it's valid - # XXX Add better check that takes symbolic names into account (i.e. U"Latch5") - #if type == 'USBCode' and hidCode > 0xFF: - # print ( "{0} USBCode value {1} is larger than 255".format( ERROR, hidCode ) ) - # raise + # Check size if a USB Code, to make sure it's valid + # XXX Add better check that takes symbolic names into account (i.e. U"Latch5") + #if type == 'USBCode' and hidCode > 0xFF: + # print ( "{0} USBCode value {1} is larger than 255".format( ERROR, hidCode ) ) + # raise - # Return a tuple, identifying which type it is - if type == 'USBCode': - return Make.usbCode_number( hidCode ) - elif type == 'ConsCode': - return Make.consCode_number( hidCode ) - elif type == 'SysCode': - return Make.sysCode_number( hidCode ) - elif type == 'IndCode': - return Make.indCode_number( hidCode ) + # Return a tuple, identifying which type it is + if type == 'USBCode': + return make_usbCode_number( hidCode ) + elif type == 'ConsCode': + return make_consCode_number( hidCode ) + elif type == 'SysCode': + return make_sysCode_number( hidCode ) - print ( "{0} Unknown HID Specifier '{1}'".format( ERROR, type ) ) - raise + print ( "{0} Unknown HID Specifier '{1}'".format( ERROR, type ) ) + raise - def usbCode( token ): - return Make.hidCode( 'USBCode', token ) +def make_usbCode( token ): + return make_hidCode( 'USBCode', token ) - def consCode( token ): - return Make.hidCode( 'ConsCode', token ) +def make_consCode( token ): + return make_hidCode( 'ConsCode', token ) - def sysCode( token ): - return Make.hidCode( 'SysCode', token ) +def make_sysCode( token ): + return make_hidCode( 'SysCode', token ) - def indCode( token ): - return Make.hidCode( 'IndCode', token ) +def make_hidCode_number( type, token ): + lookup = { + 'ConsCode' : 'CONS', + 'SysCode' : 'SYS', + 'USBCode' : 'USB', + } + return ( lookup[ type ], token ) - def animation( token ): - # TODO - print( token ) - return "NULL" +def make_usbCode_number( token ): + return make_hidCode_number( 'USBCode', token ) - def animationCapability( token ): - # TODO - print( token ) - return "DIS" +def make_consCode_number( token ): + return make_hidCode_number( 'ConsCode', token ) - def pixelCapability( token ): - # TODO - print( token ) - return "DAT" +def make_sysCode_number( token ): + return make_hidCode_number( 'SysCode', token ) - def pixel( token ): - # TODO - print( token ) - return "PNULL" + # Replace key-word with None specifier (which indicates a noneOut capability) +def make_none( token ): + return [[[('NONE', 0)]]] - def pixelLayer( token ): - # TODO - print( token ) - return "PLNULL" +def make_seqString( token ): + # Shifted Characters, and amount to move by to get non-shifted version + # US ANSI + shiftCharacters = ( + ( "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 0x20 ), + ( "+", 0x12 ), + ( "&(", 0x11 ), + ( "!#$%", 0x10 ), + ( "*", 0x0E ), + ( ")", 0x07 ), + ( '"', 0x05 ), + ( ":", 0x01 ), + ( "@", -0x0E ), + ( "<>?", -0x10 ), + ( "~", -0x1E ), + ( "{}|", -0x20 ), + ( "^", -0x28 ), + ( "_", -0x32 ), + ) - def pixelchans( token ): - # Create dictionary list - channel_widths = [] - for elem in token: - channel_widths.append( { - 'chan' : elem[0], - 'width' : elem[1], - } ) - print(channel_widths) - return channel_widths + listOfLists = [] + shiftKey = kll_hid_lookup_dictionary['USBCode']["SHIFT"] - def pixelchan_elem( token ): - channel_config = { - 'pixels' : token[0], - 'chans' : token[1], - } - return channel_config + # Creates a list of USB codes from the string: sequence (list) of combos (lists) + for char in token[1:-1]: + processedChar = char - def pixelmods( token ): - # TODO - print( token ) - return "PMOD" + # Whether or not to create a combo for this sequence with a shift + shiftCombo = False - def pixellayer( token ): - # TODO - print( token ) - return "PL" + # Depending on the ASCII character, convert to single character or Shift + character + for pair in shiftCharacters: + if char in pair[0]: + shiftCombo = True + processedChar = chr( ord( char ) + pair[1] ) + break - def position( token ): - return token.split(':') + # Do KLL HID Lookup on non-shifted character + # NOTE: Case-insensitive, which is why the shift must be pre-computed + usbCode = kll_hid_lookup_dictionary['USBCode'][ processedChar.upper() ] - def hidCode_number( type, token ): - lookup = { - 'ConsCode' : 'CONS', - 'SysCode' : 'SYS', - 'USBCode' : 'USB', - 'IndCode' : 'LED', - } - return ( lookup[ type ], token ) + # Create Combo for this character, add shift key if shifted + charCombo = [] + if shiftCombo: + charCombo = [ [ shiftKey ] ] + charCombo.append( [ usbCode ] ) - def usbCode_number( token ): - return Make.hidCode_number( 'USBCode', token ) + # Add to list of lists + listOfLists.append( charCombo ) - def consCode_number( token ): - return Make.hidCode_number( 'ConsCode', token ) + return listOfLists - def sysCode_number( token ): - return Make.hidCode_number( 'SysCode', token ) +def make_string( token ): + return token[1:-1] - def indCode_number( token ): - return Make.hidCode_number( 'IndCode', token ) +def make_unseqString( token ): + return token[1:-1] - # Replace key-word with None specifier (which indicates a noneOut capability) - def none( token ): - return [[[('NONE', 0)]]] +def make_number( token ): + return int( token, 0 ) - def seqString( token ): - # Shifted Characters, and amount to move by to get non-shifted version - # US ANSI - shiftCharacters = ( - ( "ABCDEFGHIJKLMNOPQRSTUVWXYZ", 0x20 ), - ( "+", 0x12 ), - ( "&(", 0x11 ), - ( "!#$%", 0x10 ), - ( "*", 0x0E ), - ( ")", 0x07 ), - ( '"', 0x05 ), - ( ":", 0x01 ), - ( "@", -0x0E ), - ( "<>?", -0x10 ), - ( "~", -0x1E ), - ( "{}|", -0x20 ), - ( "^", -0x28 ), - ( "_", -0x32 ), - ) +# Range can go from high to low or low to high +def make_scanCode_range( rangeVals ): + start = rangeVals[0] + end = rangeVals[1] - listOfLists = [] - shiftKey = kll_hid_lookup_dictionary['USBCode']["SHIFT"] + # Swap start, end if start is greater than end + if start > end: + start, end = end, start - # Creates a list of USB codes from the string: sequence (list) of combos (lists) - for char in token[1:-1]: - processedChar = char + # Iterate from start to end, and generate the range + return list( range( start, end + 1 ) ) - # Whether or not to create a combo for this sequence with a shift - shiftCombo = False - - # Depending on the ASCII character, convert to single character or Shift + character - for pair in shiftCharacters: - if char in pair[0]: - shiftCombo = True - processedChar = chr( ord( char ) + pair[1] ) - break - - # Do KLL HID Lookup on non-shifted character - # NOTE: Case-insensitive, which is why the shift must be pre-computed - usbCode = kll_hid_lookup_dictionary['USBCode'][ processedChar.upper() ] - - # Create Combo for this character, add shift key if shifted - charCombo = [] - if shiftCombo: - charCombo = [ [ shiftKey ] ] - charCombo.append( [ usbCode ] ) - - # Add to list of lists - listOfLists.append( charCombo ) - - return listOfLists - - def string( token ): - return token[1:-1] - - def unseqString( token ): - return token[1:-1] - - def number( token ): - return int( token, 0 ) - - def timing( token ): - # Find ms, us, or s - if 'ms' in token: - unit = 'ms' - num = token.split('m')[0] - print (token.split('m')) - elif 'us' in token: - unit = 'us' - num = token.split('u')[0] - elif 's' in token: - unit = 's' - num = token.split('s')[0] - else: - print ( "{0} cannot find timing unit in token '{1}'".format( ERROR, token ) ) - return "NULL" - - print ( num, unit ) - ret = { - 'time' : float( num ), - 'unit' : unit, - } - return ret - - def specifierState( values ): - # TODO - print ( values ) - return "SPECSTATE" - - def specifierAnalog( value ): - # TODO - print( value ) - return "SPECANALOG" - - def specifierUnroll( value ): - # TODO - print( value ) - return [ value[0] ] - - # Range can go from high to low or low to high - def scanCode_range( rangeVals ): +# Range can go from high to low or low to high +# Warn on 0-9 for USBCodes (as this does not do what one would expect) TODO +# Lookup USB HID tags and convert to a number +def make_hidCode_range( type, rangeVals ): + # Check if already integers + if isinstance( rangeVals[0], int ): start = rangeVals[0] - end = rangeVals[1] + else: + start = make_hidCode( type, rangeVals[0] )[1] - # Swap start, end if start is greater than end - if start > end: - start, end = end, start + if isinstance( rangeVals[1], int ): + end = rangeVals[1] + else: + end = make_hidCode( type, rangeVals[1] )[1] - # Iterate from start to end, and generate the range - return list( range( start, end + 1 ) ) + # Swap start, end if start is greater than end + if start > end: + start, end = end, start - # Range can go from high to low or low to high - # Warn on 0-9 for USBCodes (as this does not do what one would expect) TODO - # Lookup USB HID tags and convert to a number - def hidCode_range( type, rangeVals ): - # Check if already integers - if isinstance( rangeVals[0], int ): - start = rangeVals[0] - else: - start = Make.hidCode( type, rangeVals[0] )[1] + # Iterate from start to end, and generate the range + listRange = list( range( start, end + 1 ) ) - if isinstance( rangeVals[1], int ): - end = rangeVals[1] - else: - end = Make.hidCode( type, rangeVals[1] )[1] + # Convert each item in the list to a tuple + for item in range( len( listRange ) ): + listRange[ item ] = make_hidCode_number( type, listRange[ item ] ) + return listRange - # Swap start, end if start is greater than end - if start > end: - start, end = end, start +def make_usbCode_range( rangeVals ): + return make_hidCode_range( 'USBCode', rangeVals ) - # Iterate from start to end, and generate the range - listRange = list( range( start, end + 1 ) ) +def make_sysCode_range( rangeVals ): + return make_hidCode_range( 'SysCode', rangeVals ) - # Convert each item in the list to a tuple - for item in range( len( listRange ) ): - listRange[ item ] = Make.hidCode_number( type, listRange[ item ] ) - return listRange - - def usbCode_range( rangeVals ): - return Make.hidCode_range( 'USBCode', rangeVals ) - - def sysCode_range( rangeVals ): - return Make.hidCode_range( 'SysCode', rangeVals ) - - def consCode_range( rangeVals ): - return Make.hidCode_range( 'ConsCode', rangeVals ) - - def indCode_range( rangeVals ): - return Make.hidCode_range( 'IndCode', rangeVals ) - - def range( rangeVals ): - # TODO - print (rangeVals) - return "" +def make_consCode_range( rangeVals ): + return make_hidCode_range( 'ConsCode', rangeVals ) ## Base Rules @@ -503,7 +378,6 @@ tokenValue = lambda x: x.value tokenType = lambda t: some( lambda x: x.type == t ) >> tokenValue operator = lambda s: a( Token( 'Operator', s ) ) >> tokenValue parenthesis = lambda s: a( Token( 'Parenthesis', s ) ) >> tokenValue -bracket = lambda s: a( Token( 'Bracket', s ) ) >> tokenValue eol = a( Token( 'EndOfLine', ';' ) ) def listElem( item ): @@ -521,14 +395,27 @@ def oneLayerFlatten( items ): return mainList -# Capability arguments may need to be expanded (e.g. 1 16 bit argument needs to be 2 8 bit arguments for the state machine) def capArgExpander( items ): + ''' + Capability arguments may need to be expanded + (e.g. 1 16 bit argument needs to be 2 8 bit arguments for the state machine) + + If the number is negative, determine width of the final value, mask to max, subtract, + then convert to multiple bytes + ''' newArgs = [] # For each defined argument in the capability definition for arg in range( 0, len( capabilities_dict[ items[0] ][1] ) ): argLen = capabilities_dict[ items[0] ][1][ arg ][1] num = items[1][ arg ] - byteForm = num.to_bytes( argLen, byteorder='little' ) # XXX Yes, little endian from how the uC structs work + + # Set last bit if value is negative + if num < 0: + max_val = 2 ** (argLen * 8) + num += max_val + + # XXX Yes, little endian from how the uC structs work + byteForm = num.to_bytes( argLen, byteorder='little' ) # For each sub-argument, split into byte-sized chunks for byte in range( 0, argLen ): @@ -614,279 +501,156 @@ def tupleit( t ): ## Evaluation Rules -class Eval: - def scanCode( triggers, operator, results ): - print ( triggers, operator, results ) - # Convert to lists of lists of lists to tuples of tuples of tuples - # Tuples are non-mutable, and can be used has index items - triggers = tuple( tuple( tuple( sequence ) for sequence in variant ) for variant in triggers ) - results = tuple( tuple( tuple( sequence ) for sequence in variant ) for variant in results ) +def eval_scanCode( triggers, operator, results ): + # Convert to lists of lists of lists to tuples of tuples of tuples + # Tuples are non-mutable, and can be used has index items + triggers = tuple( tuple( tuple( sequence ) for sequence in variant ) for variant in triggers ) + results = tuple( tuple( tuple( sequence ) for sequence in variant ) for variant in results ) - # Lookup interconnect id (Current file scope) - # Default to 0 if not specified - if 'ConnectId' not in variables_dict.overallVariables.keys(): - id_num = 0 - else: - id_num = int( variables_dict.overallVariables['ConnectId'] ) + # Lookup interconnect id (Current file scope) + # Default to 0 if not specified + if 'ConnectId' not in variables_dict.overallVariables.keys(): + id_num = 0 + else: + id_num = int( variables_dict.overallVariables['ConnectId'] ) - # Iterate over all combinations of triggers and results - for sequence in triggers: - # Convert tuple of tuples to list of lists so each element can be modified - trigger = listit( sequence ) + # Iterate over all combinations of triggers and results + for sequence in triggers: + # Convert tuple of tuples to list of lists so each element can be modified + trigger = listit( sequence ) - # Create ScanCode entries for trigger - for seq_index, combo in enumerate( sequence ): - for com_index, scancode in enumerate( combo ): - trigger[ seq_index ][ com_index ] = macros_map.scanCodeStore.append( ScanCode( scancode, id_num ) ) + # Create ScanCode entries for trigger + for seq_index, combo in enumerate( sequence ): + for com_index, scancode in enumerate( combo ): + trigger[ seq_index ][ com_index ] = macros_map.scanCodeStore.append( ScanCode( scancode, id_num ) ) - # Convert back to a tuple of tuples - trigger = tupleit( trigger ) + # Convert back to a tuple of tuples + trigger = tupleit( trigger ) + for result in results: + # Append Case + if operator == ":+": + macros_map.appendScanCode( trigger, result ) + + # Remove Case + elif operator == ":-": + macros_map.removeScanCode( trigger, result ) + + # Replace Case + # Soft Replace Case is the same for Scan Codes + elif operator == ":" or operator == "::": + macros_map.replaceScanCode( trigger, result ) + +def eval_usbCode( triggers, operator, results ): + # Convert to lists of lists of lists to tuples of tuples of tuples + # Tuples are non-mutable, and can be used has index items + triggers = tuple( tuple( tuple( sequence ) for sequence in variant ) for variant in triggers ) + results = tuple( tuple( tuple( sequence ) for sequence in variant ) for variant in results ) + + # Iterate over all combinations of triggers and results + for trigger in triggers: + scanCodes = macros_map.lookupUSBCodes( trigger ) + for scanCode in scanCodes: for result in results: - # Append Case - if operator == ":+": - macros_map.appendScanCode( trigger, result ) + # Soft Replace needs additional checking to see if replacement is necessary + if operator == "::" and not macros_map.softReplaceCheck( scanCode ): + continue - # Remove Case - elif operator == ":-": - macros_map.removeScanCode( trigger, result ) + # Cache assignment until file finishes processing + macros_map.cacheAssignment( operator, scanCode, result ) - # Replace Case - # Soft Replace Case is the same for Scan Codes - elif operator == ":" or operator == "::": - macros_map.replaceScanCode( trigger, result ) +def eval_variable( name, content ): + # Content might be a concatenation of multiple data types, convert everything into a single string + assigned_content = "" + for item in content: + assigned_content += str( item ) - def usbCode( triggers, operator, results ): - # TODO - return - # Convert to lists of lists of lists to tuples of tuples of tuples - # Tuples are non-mutable, and can be used has index items - triggers = tuple( tuple( tuple( sequence ) for sequence in variant ) for variant in triggers ) - results = tuple( tuple( tuple( sequence ) for sequence in variant ) for variant in results ) + variables_dict.assignVariable( name, assigned_content ) - # Iterate over all combinations of triggers and results - for trigger in triggers: - scanCodes = macros_map.lookupUSBCodes( trigger ) - for scanCode in scanCodes: - for result in results: - # Soft Replace needs additional checking to see if replacement is necessary - if operator == "::" and not macros_map.softReplaceCheck( scanCode ): - continue +def eval_capability( name, function, args ): + capabilities_dict[ name ] = [ function, args ] - # Cache assignment until file finishes processing - macros_map.cacheAssignment( operator, scanCode, result ) +def eval_define( name, cdefine_name ): + variables_dict.defines[ name ] = cdefine_name - def variable( name, content ): - # Content might be a concatenation of multiple data types, convert everything into a single string - assigned_content = "" - for item in content: - assigned_content += str( item ) +map_scanCode = unarg( eval_scanCode ) +map_usbCode = unarg( eval_usbCode ) - variables_dict.assignVariable( name, assigned_content ) - - def capability( name, function, args ): - capabilities_dict[ name ] = [ function, args ] - - def define( name, cdefine_name ): - variables_dict.defines[ name ] = cdefine_name - - def scanCodePosition( scanCode, positions ): - print (scanCode) - # Re-organize position lists into a dictionary first - pos_dict = dict() - for pos in positions: - pos_dict[ pos[0] ] = pos[1] - print (pos_dict) - - # TODO Create datastructure for positions - - def pixelPosition( pixel, position ): - # TODO - print (pixel, position) - - def pixelChannels( channel, scanCode ): - # TODO - print (channel, scanCode ) - - def animation( animation, modifiers ): - # TODO - print( animation, modifiers ) - - def animationFrame( animation, frame, modifiers ): - # TODO - print( frame, modifiers ) - - def animationTrigger( animation, operator, results ): - # TODO - print ( animation, operator, results ) - - def animationTriggerFrame( animation, frame, operator, results ): - # TODO - print ( animation, frame, operator, results ) - - def array( name, index, content ): - # TODO - print (name, index, content) - -class Map: - scanCode = unarg( Eval.scanCode ) - usbCode = unarg( Eval.usbCode ) - animationTrigger = unarg( Eval.animationTrigger ) - animationTriggerFrame = unarg( Eval.animationTriggerFrame ) - -class Set: - animation = unarg( Eval.animation ) - animationFrame = unarg( Eval.animationFrame ) - array = unarg( Eval.array ) - capability = unarg( Eval.capability ) - define = unarg( Eval.define ) - pixelChannels = unarg( Eval.pixelChannels ) - pixelPosition = unarg( Eval.pixelPosition ) - scanCodePosition = unarg( Eval.scanCodePosition ) - variable = unarg( Eval.variable ) +set_variable = unarg( eval_variable ) +set_capability = unarg( eval_capability ) +set_define = unarg( eval_define ) ## Sub Rules -usbCode = tokenType('USBCode') >> Make.usbCode -scanCode = tokenType('ScanCode') >> Make.scanCode -consCode = tokenType('ConsCode') >> Make.consCode -sysCode = tokenType('SysCode') >> Make.sysCode -indCode = tokenType('Indicator') >> Make.indCode -animation = tokenType('Animation') >> Make.animation -pixel = tokenType('Pixel') >> Make.pixel -pixelLayer = tokenType('PixelLayer') >> Make.pixelLayer -none = tokenType('None') >> Make.none -position = tokenType('Position') >> Make.position -name = tokenType('Name') -number = tokenType('Number') >> Make.number -timing = tokenType('Timing') >> Make.timing -comma = tokenType('Comma') -dash = tokenType('Dash') -plus = tokenType('Plus') -content = tokenType('VariableContents') -string = tokenType('String') >> Make.string -unString = tokenType('String') # When the double quotes are still needed for internal processing -seqString = tokenType('SequenceString') >> Make.seqString -unseqString = tokenType('SequenceString') >> Make.unseqString # For use with variables -pixelOperator = tokenType('PixelOperator') +usbCode = tokenType('USBCode') >> make_usbCode +scanCode = tokenType('ScanCode') >> make_scanCode +consCode = tokenType('ConsCode') >> make_consCode +sysCode = tokenType('SysCode') >> make_sysCode +none = tokenType('None') >> make_none +name = tokenType('Name') +number = tokenType('Number') >> make_number +comma = tokenType('Comma') +dash = tokenType('Dash') +plus = tokenType('Plus') +content = tokenType('VariableContents') +string = tokenType('String') >> make_string +unString = tokenType('String') # When the double quotes are still needed for internal processing +seqString = tokenType('SequenceString') >> make_seqString +unseqString = tokenType('SequenceString') >> make_unseqString # For use with variables # Code variants -code_begin = tokenType('CodeBegin') -code_end = tokenType('CodeEnd') - -# Specifier -specifier_state = ( name + skip( operator(':') ) + timing ) | ( name + skip( operator(':') ) + timing ) | timing | name >> Make.specifierState -specifier_analog = number >> Make.specifierAnalog -specifier_list = skip( parenthesis('(') ) + many( ( specifier_state | specifier_analog ) + skip( maybe( comma ) ) ) + skip( parenthesis(')') ) +code_end = tokenType('CodeEnd') # Scan Codes scanCode_start = tokenType('ScanCodeStart') -scanCode_range = number + skip( dash ) + number >> Make.scanCode_range +scanCode_range = number + skip( dash ) + number >> make_scanCode_range scanCode_listElem = number >> listElem -scanCode_specifier = ( scanCode_range | scanCode_listElem ) + maybe( specifier_list ) >> Make.specifierUnroll >> flatten -scanCode_innerList = many( scanCode_specifier + skip( maybe( comma ) ) ) >> flatten +scanCode_innerList = oneplus( ( scanCode_range | scanCode_listElem ) + skip( maybe( comma ) ) ) >> flatten scanCode_expanded = skip( scanCode_start ) + scanCode_innerList + skip( code_end ) -scanCode_elem = scanCode + maybe( specifier_list ) >> Make.specifierUnroll >> listElem +scanCode_elem = scanCode >> listElem scanCode_combo = oneplus( ( scanCode_expanded | scanCode_elem ) + skip( maybe( plus ) ) ) scanCode_sequence = oneplus( scanCode_combo + skip( maybe( comma ) ) ) +# USB Codes +usbCode_start = tokenType('USBCodeStart') +usbCode_number = number >> make_usbCode_number +usbCode_range = ( usbCode_number | unString ) + skip( dash ) + ( number | unString ) >> make_usbCode_range +usbCode_listElemTag = unString >> make_usbCode +usbCode_listElem = ( usbCode_number | usbCode_listElemTag ) >> listElem +usbCode_innerList = oneplus( ( usbCode_range | usbCode_listElem ) + skip( maybe( comma ) ) ) >> flatten +usbCode_expanded = skip( usbCode_start ) + usbCode_innerList + skip( code_end ) +usbCode_elem = usbCode >> listElem +usbCode_combo = oneplus( ( usbCode_expanded | usbCode_elem ) + skip( maybe( plus ) ) ) >> listElem +usbCode_sequence = oneplus( ( usbCode_combo | seqString ) + skip( maybe( comma ) ) ) >> oneLayerFlatten + # Cons Codes consCode_start = tokenType('ConsCodeStart') -consCode_number = number >> Make.consCode_number -consCode_range = ( consCode_number | unString ) + skip( dash ) + ( number | unString ) >> Make.consCode_range -consCode_listElemTag = unString >> Make.consCode +consCode_number = number >> make_consCode_number +consCode_range = ( consCode_number | unString ) + skip( dash ) + ( number | unString ) >> make_consCode_range +consCode_listElemTag = unString >> make_consCode consCode_listElem = ( consCode_number | consCode_listElemTag ) >> listElem -consCode_specifier = ( consCode_range | consCode_listElem ) + maybe( specifier_list ) >> Make.specifierUnroll >> flatten -consCode_innerList = oneplus( consCode_specifier + skip( maybe( comma ) ) ) >> flatten +consCode_innerList = oneplus( ( consCode_range | consCode_listElem ) + skip( maybe( comma ) ) ) >> flatten consCode_expanded = skip( consCode_start ) + consCode_innerList + skip( code_end ) -consCode_elem = consCode + maybe( specifier_list ) >> Make.specifierUnroll >> listElem +consCode_elem = consCode >> listElem # Sys Codes sysCode_start = tokenType('SysCodeStart') -sysCode_number = number >> Make.sysCode_number -sysCode_range = ( sysCode_number | unString ) + skip( dash ) + ( number | unString ) >> Make.sysCode_range -sysCode_listElemTag = unString >> Make.sysCode +sysCode_number = number >> make_sysCode_number +sysCode_range = ( sysCode_number | unString ) + skip( dash ) + ( number | unString ) >> make_sysCode_range +sysCode_listElemTag = unString >> make_sysCode sysCode_listElem = ( sysCode_number | sysCode_listElemTag ) >> listElem -sysCode_specifier = ( sysCode_range | sysCode_listElem ) + maybe( specifier_list ) >> Make.specifierUnroll >> flatten -sysCode_innerList = oneplus( sysCode_specifier + skip( maybe( comma ) ) ) >> flatten +sysCode_innerList = oneplus( ( sysCode_range | sysCode_listElem ) + skip( maybe( comma ) ) ) >> flatten sysCode_expanded = skip( sysCode_start ) + sysCode_innerList + skip( code_end ) -sysCode_elem = sysCode + maybe( specifier_list ) >> Make.specifierUnroll >> listElem - -# Indicator Codes -indCode_start = tokenType('IndicatorStart') -indCode_number = number >> Make.indCode_number -indCode_range = ( indCode_number | unString ) + skip( dash ) + ( number | unString ) >> Make.indCode_range -indCode_listElemTag = unString >> Make.indCode -indCode_listElem = ( indCode_number | indCode_listElemTag ) >> listElem -indCode_specifier = ( indCode_range | indCode_listElem ) + maybe( specifier_list ) >> Make.specifierUnroll >> flatten -indCode_innerList = oneplus( indCode_specifier + skip( maybe( comma ) ) ) >> flatten -indCode_expanded = skip( indCode_start ) + indCode_innerList + skip( code_end ) -indCode_elem = indCode + maybe( specifier_list ) >> Make.specifierUnroll >> listElem - -# USB Codes -usbCode_start = tokenType('USBCodeStart') -usbCode_number = number >> Make.usbCode_number -usbCode_range = ( usbCode_number | unString ) + skip( dash ) + ( number | unString ) >> Make.usbCode_range -usbCode_listElemTag = unString >> Make.usbCode -usbCode_listElem = ( usbCode_number | usbCode_listElemTag ) >> listElem -usbCode_specifier = ( usbCode_range | usbCode_listElem ) + maybe( specifier_list ) >> Make.specifierUnroll >> flatten -usbCode_innerList = oneplus( usbCode_specifier + skip( maybe( comma ) ) ) >> flatten -usbCode_expanded = skip( usbCode_start ) + usbCode_innerList + skip( code_end ) -usbCode_elem = usbCode + maybe( specifier_list ) >> Make.specifierUnroll >> listElem +sysCode_elem = sysCode >> listElem # HID Codes -hidCode_elem = usbCode_expanded | usbCode_elem | sysCode_expanded | sysCode_elem | consCode_expanded | consCode_elem | indCode_expanded | indCode_elem - -usbCode_combo = oneplus( hidCode_elem + skip( maybe( plus ) ) ) >> listElem -usbCode_sequence = oneplus( ( usbCode_combo | seqString ) + skip( maybe( comma ) ) ) >> oneLayerFlatten - -# Pixels -pixel_start = tokenType('PixelStart') -pixel_number = number -pixel_range = ( pixel_number ) + skip( dash ) + ( number ) >> Make.range -pixel_listElem = pixel_number >> listElem -pixel_innerList = many( ( pixel_range | pixel_listElem ) + skip( maybe( comma ) ) ) -pixel_expanded = skip( pixel_start ) + pixel_innerList + skip( code_end ) -pixel_elem = pixel >> listElem - -# Pixel Layer -pixellayer_start = tokenType('PixelLayerStart') -pixellayer_number = number -pixellayer_expanded = skip( pixellayer_start ) + pixellayer_number + skip( code_end ) -pixellayer_elem = pixelLayer >> listElem - -# Pixel Channels -pixelchan_chans = many( number + skip( operator(':') ) + number + skip( maybe( comma ) ) ) >> Make.pixelchans -pixelchan_elem = ( pixel_expanded | pixel_elem ) + skip( parenthesis('(') ) + pixelchan_chans + skip( parenthesis(')') ) >> Make.pixelchan_elem - -# Pixel Mods -pixelmod_mods = many( maybe( pixelOperator | plus | dash ) + number + skip( maybe( comma ) ) ) >> Make.pixelmods -pixelmod_layer = ( pixellayer_expanded | pixellayer_elem ) >> Make.pixellayer -pixelmod_elem = ( pixel_expanded | pixel_elem | pixelmod_layer ) + skip( parenthesis('(') ) + pixelmod_mods + skip( parenthesis(')') ) - -# Pixel Capability -pixel_capability = pixelmod_elem >> Make.pixelCapability - -# Animations -animation_start = tokenType('AnimationStart') -animation_name = name -animation_frame_range = ( number ) + skip( dash ) + ( number ) >> Make.range -animation_name_frame = many( ( number | animation_frame_range ) + skip( maybe( comma ) ) ) -animation_def = skip( animation_start ) + animation_name + skip( code_end ) -animation_expanded = skip( animation_start ) + animation_name + skip( comma ) + animation_name_frame + skip( code_end ) -animation_elem = animation >> listElem - -# Animation Modifier -animation_modifier = many( ( name | number ) + maybe( skip( operator(':') ) + number ) + skip( maybe( comma ) ) ) - -# Animation Capability -animation_capability = ( animation_def | animation_elem ) + maybe( skip( parenthesis('(') + animation_modifier + skip( parenthesis(')') ) ) ) >> Make.animationCapability +hidCode_elem = usbCode_expanded | usbCode_elem | sysCode_expanded | sysCode_elem | consCode_expanded | consCode_elem # Capabilities capFunc_arguments = many( number + skip( maybe( comma ) ) ) >> listToTuple capFunc_elem = name + skip( parenthesis('(') ) + capFunc_arguments + skip( parenthesis(')') ) >> capArgExpander >> listElem -capFunc_combo = oneplus( ( hidCode_elem | capFunc_elem | animation_capability | pixel_capability ) + skip( maybe( plus ) ) ) >> listElem +capFunc_combo = oneplus( ( hidCode_elem | capFunc_elem ) + skip( maybe( plus ) ) ) >> listElem capFunc_sequence = oneplus( ( capFunc_combo | seqString ) + skip( maybe( comma ) ) ) >> oneLayerFlatten # Trigger / Result Codes @@ -894,76 +658,30 @@ triggerCode_outerList = scanCode_sequence >> optionExpansion triggerUSBCode_outerList = usbCode_sequence >> optionExpansion >> hidCodeToCapability resultCode_outerList = ( ( capFunc_sequence >> optionExpansion ) | none ) >> hidCodeToCapability -# Positions -position_list = oneplus( position + skip( maybe( comma ) ) ) - ## Main Rules -#| Assignment #| = ; variable_contents = name | content | string | number | comma | dash | unseqString -variable_expression = name + skip( operator('=') ) + oneplus( variable_contents ) + skip( eol ) >> Set.variable +variable_expression = name + skip( operator('=') ) + oneplus( variable_contents ) + skip( eol ) >> set_variable -#| Array Assignment -#| [] = ; -#| [] = ; -array_expression = name + skip( code_begin ) + maybe( number ) + skip( code_end ) + skip( operator('=') ) + oneplus( variable_contents ) + skip( eol ) >> Set.array - -#| Name Association #| => ; capability_arguments = name + skip( operator(':') ) + number + skip( maybe( comma ) ) -capability_expression = name + skip( operator('=>') ) + name + skip( parenthesis('(') ) + many( capability_arguments ) + skip( parenthesis(')') ) + skip( eol ) >> Set.capability +capability_expression = name + skip( operator('=>') ) + name + skip( parenthesis('(') ) + many( capability_arguments ) + skip( parenthesis(')') ) + skip( eol ) >> set_capability -#| Name Association #| => ; -define_expression = name + skip( operator('=>') ) + name + skip( eol ) >> Set.define +define_expression = name + skip( operator('=>') ) + name + skip( eol ) >> set_define -#| Data Association -#| <= ; -#| <= ; -animation_expression = ( animation_elem | animation_def ) + skip( operator('<=') ) + animation_modifier + skip( eol ) >> Set.animation -animationFrame_expression = animation_expanded + skip( operator('<=') ) + many( pixelmod_elem + skip( maybe( comma ) ) ) + skip( eol ) >> Set.animationFrame - -#| Data Association -#| <= ; -pixelPosition_expression = ( pixel_expanded | pixel_elem ) + skip( operator('<=') ) + position_list + skip( eol ) >> Set.pixelPosition - -#| Data Association -#| <= ; -pixelChan_expression = pixelchan_elem + skip( operator(':') ) + ( scanCode_expanded | scanCode_elem | none ) + skip( eol ) >> Set.pixelChannels - -#| Data Association -#| <= ; -scanCodePosition_expression = triggerCode_outerList + skip( operator('<=') ) + position_list + skip( eol ) >> Set.scanCodePosition - -#| Mapping #| : ; -operatorTriggerResult = operator(':') | operator(':+') | operator(':-') | operator('::') -scanCode_expression = triggerCode_outerList + operatorTriggerResult + resultCode_outerList + skip( eol ) >> Map.scanCode -usbCode_expression = triggerUSBCode_outerList + operatorTriggerResult + resultCode_outerList + skip( eol ) >> Map.usbCode -animation_trigger = ( animation_elem | animation_def ) + operatorTriggerResult + resultCode_outerList + skip( eol ) >> Map.animationTrigger -animation_triggerFrame = animation_expanded + operatorTriggerResult + resultCode_outerList + skip( eol ) >> Map.animationTriggerFrame +operatorTriggerResult = operator(':') | operator(':+') | operator(':-') | operator('::') +scanCode_expression = triggerCode_outerList + operatorTriggerResult + resultCode_outerList + skip( eol ) >> map_scanCode +usbCode_expression = triggerUSBCode_outerList + operatorTriggerResult + resultCode_outerList + skip( eol ) >> map_usbCode def parse( tokenSequence ): """Sequence(Token) -> object""" # Top-level Parser - expression = ( - scanCode_expression | - scanCodePosition_expression | - usbCode_expression | - animation_trigger | - animation_triggerFrame | - pixelPosition_expression | - pixelChan_expression | - animation_expression | - animationFrame_expression | - array_expression | - variable_expression | - capability_expression | - define_expression - ) + expression = scanCode_expression | usbCode_expression | variable_expression | capability_expression | define_expression kll_text = many( expression ) kll_file = maybe( kll_text ) + skip( finished ) @@ -973,7 +691,7 @@ def parse( tokenSequence ): def processKLLFile( filename ): - with open( filename ) as file: + with open( filename, encoding='utf-8' ) as file: data = file.read() try: tokenSequence = tokenize( data ) diff --git a/layouts/mouseTest.kll b/layouts/mouseTest.kll new file mode 100644 index 0000000..9205eab --- /dev/null +++ b/layouts/mouseTest.kll @@ -0,0 +1,40 @@ +Name = mouseTest; +Version = 0.2; +Author = "HaaTa (Jacob Alexander) 2016"; +KLL = 0.3d; + +# Modified Date +Date = 2016-03-21; + +# mouseOut +# Arg1, button, 1-16 +# Arg2, mouse x relative axis -32 767 to 32 767 +# Arg3, mouse y relative axis -32 767 to 32 767 + +U"1" : mouseOut( 1, 0, 0 ); +U"2" : mouseOut( 2, 0, 0 ); +U"3" : mouseOut( 3, 0, 0 ); +U"4" : mouseOut( 4, 0, 0 ); +U"5" : mouseOut( 5, 0, 0 ); +U"6" : mouseOut( 6, 0, 0 ); +U"7" : mouseOut( 7, 0, 0 ); +U"8" : mouseOut( 8, 0, 0 ); +U"Z" : mouseOut( 9, 0, 0 ); +U"X" : mouseOut( 10, 0, 0 ); +U"C" : mouseOut( 11, 0, 0 ); +U"V" : mouseOut( 12, 0, 0 ); +U"B" : mouseOut( 13, 0, 0 ); +U"N" : mouseOut( 14, 0, 0 ); +U"M" : mouseOut( 15, 0, 0 ); +U"Comma" : mouseOut( 16, 0, 0 ); + +U"Up" : mouseOut( 0, 0, 1 ); +U"Down" : mouseOut( 0, 0, -1 ); +U"Left" : mouseOut( 0, -1, 0 ); +U"Right" : mouseOut( 0, 1, 0 ); + +U"W" : mouseOut( 0, 0, 5 ); +U"S" : mouseOut( 0, 0, -5 ); +U"A" : mouseOut( 0, -5, 0 ); +U"D" : mouseOut( 0, 5, 0 ); + diff --git a/layouts/programmers_dvorak_default.kll b/layouts/programmers_dvorak_default.kll new file mode 100644 index 0000000..bfb79a4 --- /dev/null +++ b/layouts/programmers_dvorak_default.kll @@ -0,0 +1,93 @@ +Name = programmers dvorak default layer; +Version = 0.1; +Author = "HaaTa (Jacob Alexander) 2016"; +KLL = 0.3d; + +# Modified Date +Date = 2016-08-06; + +# This the default layer for programmers dvorak +# http://www.kaufmann.no/roland/dvorak/ +# +# CAVEATS; +# 1) Assumes US ANSI locale set on the host OS +# 2) No AltGr layer (future enhancement, will require a different locale) +# 3) Some shortcuts may not behave correctly +# Shift Keys are masked in some situations +# +# USAGE: +# This layer must be set on the defaultMap +# programmers_dvorak_shift must be set as Layer1 (first PartialMap) + + +# Attempt to force the host OS to use US ANSI +# (Not guaranteed) +keyboardLocale = 33; + + +### Mapping ### + +# Top Row +U"BackTick" : '$'; +U"1" : '&'; +U"2" : '['; +U"3" : '{'; +U"4" : '}'; +U"5" : '('; +U"6" : '='; +U"7" : '*'; +U"8" : ')'; +U"9" : '+'; +U"0" : ']'; +U"-" : '!'; +U"=" : '#'; + +# Top-Middle Row +U"Q" : ';'; +U"W" : ','; +U"E" : '.'; +U"R" : 'p'; +U"T" : 'y'; +U"Y" : 'f'; +U"U" : 'g'; +U"I" : 'c'; +U"O" : 'r'; +U"P" : 'l'; +U"[" : '/'; +U"]" : '@'; +### / is in the same place + +# Middle Row +### A is in the same place +U"S" : 'o'; +U"D" : 'e'; +U"F" : 'u'; +U"G" : 'i'; +U"H" : 'd'; +U"J" : 'h'; +U"K" : 't'; +U"L" : 'n'; +U"Semicolon" : 's'; +U"Quote" : '-'; + +# Bottom-Middle Row + +U"LShift" :+ U"Function1"; # Do not replace LShift, just trigger Function1 in addition to LShift + +### XXX Not sure what the square key is (-HaaTa) +U"Z" : U"Quote"; # ' is hard to do using the single quote syntax +U"X" : 'q'; +U"C" : 'j'; +U"V" : 'k'; +U"B" : 'x'; +### M is in the same place +U"N" : 'b'; +U"Comma" : 'w'; +#U"Period" : 'v'; +U"Slash" : 'z'; + +U"RShift" :+ U"Function1"; # Do not replace RShift, just trigger Function1 in addition to RShift + +# Bottom Row +# N/A + diff --git a/layouts/programmers_dvorak_shift.kll b/layouts/programmers_dvorak_shift.kll new file mode 100644 index 0000000..663fa23 --- /dev/null +++ b/layouts/programmers_dvorak_shift.kll @@ -0,0 +1,48 @@ +Name = programmers dvorak shift layer; +Version = 0.1; +Author = "HaaTa (Jacob Alexander) 2016"; +KLL = 0.3d; + +# +# NOTE: See programmers_dvorak_default.kll for more details on how to use this layout +# It relies on the semantics of the US ANSI layout +# +# This file relies heavily on the blockKey capability for LShift (0xE1) and RShift (0xE5) +# However, it is only used in the cases where it's necessary +# +# We also rely on "fall-through" to the previous layer +# This means any normally shifted keys do not need to be redefined here +# + +# Modified Date +Date = 2016-08-06; + +### Mapping ### + +# Top Row +U"BackTick" : '~'; +U"1" : '%'; +U"2" : U"7" + blockKey( 0xE1 ) + blockKey( 0xE5 ); +U"3" : U"5" + blockKey( 0xE1 ) + blockKey( 0xE5 ); +U"4" : U"3" + blockKey( 0xE1 ) + blockKey( 0xE5 ); +U"5" : U"1" + blockKey( 0xE1 ) + blockKey( 0xE5 ); +U"6" : U"9" + blockKey( 0xE1 ) + blockKey( 0xE5 ); +U"7" : U"0" + blockKey( 0xE1 ) + blockKey( 0xE5 ); +U"8" : U"2" + blockKey( 0xE1 ) + blockKey( 0xE5 ); +U"9" : U"4" + blockKey( 0xE1 ) + blockKey( 0xE5 ); +U"0" : U"6" + blockKey( 0xE1 ) + blockKey( 0xE5 ); +U"-" : U"8" + blockKey( 0xE1 ) + blockKey( 0xE5 ); +U"=" : U"Backtick" + blockKey( 0xE1 ) + blockKey( 0xE5 ); + +# Top-Middle Row +U"]" : '^'; + +# Middle Row +# N/A + +# Bottom-Middle Row +# N/A + +# Bottom Row +# N/A +