X-Git-Url: https://git.donarmstrong.com/?a=blobdiff_plain;f=backends%2Fkiibohd.py;h=8419ee85e6e06e0c63f6b99afce5def7c26bf098;hb=b7a897986418b83d5037ebc14f659ec046457c45;hp=19168a256cc7046dd5f72867a4e8e274a72a3013;hpb=0cb66411aad82f7bf9fa20e4942be9bacefcfa86;p=kiibohd-kll.git

diff --git a/backends/kiibohd.py b/backends/kiibohd.py
index 19168a2..8419ee8 100644
--- a/backends/kiibohd.py
+++ b/backends/kiibohd.py
@@ -100,8 +100,24 @@ class Backend:
 		else:
 			gitChangesStr = "    None\n"
 
+		# Prepare BaseLayout and Layer Info
+		baseLayoutInfo = ""
+		defaultLayerInfo = ""
+		partialLayersInfo = ""
+		for file, name in zip( variables.baseLayout['*LayerFiles'], variables.baseLayout['*NameStack'] ):
+			baseLayoutInfo += "//    {0}\n//      {1}\n".format( name, file )
+		if '*LayerFiles' in variables.layerVariables[0].keys():
+			for file, name in zip( variables.layerVariables[0]['*LayerFiles'], variables.layerVariables[0]['*NameStack'] ):
+				defaultLayerInfo += "//    {0}\n//      {1}\n".format( name, file )
+		if '*LayerFiles' in variables.layerVariables[1].keys():
+			for layer in range( 1, len( variables.layerVariables ) ):
+				partialLayersInfo += "//    Layer {0}\n".format( layer )
+				if len( variables.layerVariables[ layer ]['*LayerFiles'] ) > 0:
+					for file, name in zip( variables.layerVariables[ layer ]['*LayerFiles'], variables.layerVariables[ layer ]['*NameStack'] ):
+						partialLayersInfo += "//     {0}\n//       {1}\n".format( name, file )
+
+
 		## Information ##
-		# TODO
 		self.fill_dict['Information']  = "// This file was generated by the kll compiler, DO NOT EDIT.\n"
 		self.fill_dict['Information'] += "// Generation Date:    {0}\n".format( date.today() )
 		self.fill_dict['Information'] += "// KLL Backend:        {0}\n".format( "kiibohd" )
@@ -109,9 +125,9 @@ class Backend:
 		self.fill_dict['Information'] += "// KLL Git Changes:{0}".format( gitChangesStr )
 		self.fill_dict['Information'] += "// Compiler arguments:\n{0}".format( compilerArgs )
 		self.fill_dict['Information'] += "//\n"
-		self.fill_dict['Information'] += "// - Base Layer -\n"
-		self.fill_dict['Information'] += "// - Default Layer -\n"
-		self.fill_dict['Information'] += "// - Partial Layers -\n"
+		self.fill_dict['Information'] += "// - Base Layer -\n{0}".format( baseLayoutInfo )
+		self.fill_dict['Information'] += "// - Default Layer -\n{0}".format( defaultLayerInfo )
+		self.fill_dict['Information'] += "// - Partial Layers -\n{0}".format( partialLayersInfo )
 
 
 		## Variable Information ##
@@ -173,7 +189,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
@@ -304,12 +320,18 @@ class Backend:
 			# Lookup first scancode in map
 			firstScanCode = macros.firstScanCode[ layer ]
 
+			# Generate stacked name
+			stackName = ""
+			if '*NameStack' in variables.layerVariables[ layer ].keys():
+				for name in range( 0, len( variables.layerVariables[ layer ]['*NameStack'] ) ):
+					stackName += "{0} + ".format( variables.layerVariables[ layer ]['*NameStack'][ name ] )
+				stackName = stackName[:-3]
+
 			# Default map is a special case, always the first index
-			# TODO Fix names
 			if layer == 0:
-				self.fill_dict['LayerIndexList'] += '\tLayer_IN( default_scanMap, "DefaultMap", 0x{0:02X} ),\n'.format( firstScanCode )
+				self.fill_dict['LayerIndexList'] += '\tLayer_IN( default_scanMap, "D: {1}", 0x{0:02X} ),\n'.format( firstScanCode, stackName )
 			else:
-				self.fill_dict['LayerIndexList'] += '\tLayer_IN( layer{0}_scanMap, "Layer {0}", 0x{1:02X} ),\n'.format( layer, firstScanCode )
+				self.fill_dict['LayerIndexList'] += '\tLayer_IN( layer{0}_scanMap, "{0}: {2}", 0x{1:02X} ),\n'.format( layer, firstScanCode, stackName )
 		self.fill_dict['LayerIndexList'] += "};"