Adding --enable-capv2 option

- Incrementing to 0.5.7.13
- Needed to support bitwidth change of states

kll/__init__.py

@@ -31,7 +31,7 @@
 
 ## Variables
 
-__version__ = '0.5.7.12'
+__version__ = '0.5.7.13'
 kll_name = 'kll'
 
 # This is updated whenever there is a KLL language breaking behaviour

kll/emitters/kiibohd/kiibohd.py

@@ -125,6 +125,7 @@ def __init__(self, control):
  self.def_output = "kll_defs.h"
  self.json_output = "kll.json"
  self.kiibohd_debug = False
+ self.enable_capv2 = False
 
  # Convenience
  self.capabilities = None
@@ -162,6 +163,7 @@ def command_line_args(self, args):
  self.pixel_output = args.pixel_output
  self.json_output = args.json_output
  self.kiibohd_debug = args.kiibohd_debug
+ self.enable_capv2 = args.enable_capv2
 
  def command_line_flags(self, parser):
  '''
@@ -214,6 +216,12 @@ def command_line_flags(self, parser):
  default=self.kiibohd_debug,
  help="Show debug info from kiibohd emitter.",
  )
+ group.add_argument(
+ '--enable-capv2',
+ action='store_true',
+ default=self.enable_capv2,
+ help="Enable v2 of capabilities (requires firmware support).",
+ )
 
  def check_file(self, filepath):
  '''
@@ -1043,8 +1051,12 @@ def get_context_name(context_type, contexts=None):
  count,
  dkey,
  )
- self.fill_dict['CapabilitiesFuncDecl'] += \
- "void {0}( TriggerMacro *trigger, uint8_t state, uint8_t stateType, uint8_t *args );\n".format(funcName)
+ if self.enable_capv2:
+ self.fill_dict['CapabilitiesFuncDecl'] += \
+ "void {0}( TriggerMacro *trigger, uint16_t state, uint8_t stateType, uint8_t *args );\n".format(funcName)
+ else:
+ self.fill_dict['CapabilitiesFuncDecl'] += \
+ "void {0}( TriggerMacro *trigger, uint8_t state, uint8_t stateType, uint8_t *args );\n".format(funcName)
  self.fill_dict['CapabilitiesIndices'] += "\t{0}_index,\n".format(funcName)
 
  # Add to json