Added check for too small stateWordSize (default 8) showing: Over 255 trigger or...

[kiibohd-kll.git] / backends / kiibohd.py

diff --git a/backends/kiibohd.py b/backends/kiibohd.py
index 70fd58c8e7c97dae0a121c36ed6223cf4fc974ca..9604a1fd03ff0fa1d88f568dbaacbc8d73b82be1 100644 (file)
--- a/backends/kiibohd.py
+++ b/backends/kiibohd.py
@@ -119,11 +119,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 ) )
 
@@ -176,11 +179,16 @@ class Backend( BackendBase ):
                                                # Special cases
                                                if isinstance( resultItem[1][ arg ], str ):
                                                        # If this is a CONSUMER_ element, needs to be split into 2 elements
-                                                       if re.match( '^CONSUMER_', resultItem[1][ arg ] ):
+                                                       # AC_ and AL_ are other sections of consumer control
+                                                       if re.match( '^(CONSUMER|AC|AL)_', resultItem[1][ arg ] ):
                                                                tag = resultItem[1][ arg ].split( '_', 1 )[1]
                                                                if '_' in tag:
                                                                        tag = tag.replace( '_', '' )
-                                                               lookupNum = kll_hid_lookup_dictionary['ConsCode'][ tag ][1]
+                                                               try:
+                                                                       lookupNum = kll_hid_lookup_dictionary['ConsCode'][ tag ][1]
+                                                               except KeyError as err:
+                                                                       print ( "{0} {1} Consumer HID kll bug...please report.".format( ERROR, err ) )
+                                                                       raise
                                                                byteForm = lookupNum.to_bytes( 2, byteorder='little' ) # XXX Yes, little endian from how the uC structs work
                                                                self.fill_dict['ResultMacros'] += "{0}, {1}, ".format( *byteForm )
                                                                continue
@@ -209,6 +217,9 @@ class Backend( BackendBase ):
                for result in range( 0, len( macros.resultsIndexSorted ) ):
                        self.fill_dict['ResultMacroList'] += "\tDefine_RM( {0} ),\n".format( result )
                self.fill_dict['ResultMacroList'] += "};"
+               
+               results_count = len( macros.resultsIndexSorted );
+               print( "Results count: ", results_count )
 
 
                ## Result Macro Record ##
@@ -219,6 +230,7 @@ class Backend( BackendBase ):
                self.fill_dict['TriggerMacros'] = ""
 
                # Iterate through each of the trigger macros
+               triggers_count = 0;
                for trigger in range( 0, len( macros.triggersIndexSorted ) ):
                        self.fill_dict['TriggerMacros'] += "Guide_TM( {0} ) = {{ ".format( trigger )
 
@@ -239,11 +251,20 @@ class Backend( BackendBase ):
                                        # TODO Add support for Analog keys
                                        # TODO Add support for LED states
                                        self.fill_dict['TriggerMacros'] += "0x00, 0x01, 0x{0:02X}, ".format( triggerItem )
+                                       triggers_count += 1
 
                        # Add list ending 0 and end of list
                        self.fill_dict['TriggerMacros'] += "0 };\n"
                self.fill_dict['TriggerMacros'] = self.fill_dict['TriggerMacros'][ :-1 ] # Remove last newline
 
+               print( "Triggers count:", triggers_count )
+
+               # 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 to 16.".format( WARNING ) )
+                       stateWordSize == "16"
+                       self.fill_dict['Defines'] = self.fill_dict['Defines'].replace("StateWordSize_define 8", "StateWordSize_define 16")
+                       #print (self.fill_dict['Defines'])
 
                ## Trigger Macro List ##
                self.fill_dict['TriggerMacroList'] = "const TriggerMacro TriggerMacroList[] = {\n"