changeset 46:32046b29c58c

Merge branch 'master' of github.com:kiibohd/kll
author Jacob Alexander <haata@kiibohd.com>
date Sun, 02 Aug 2015 13:42:38 -0700
parents dcbdf80b2ca7 (diff) 55c708717fb0 (current diff)
children a92bdf81be01
files
diffstat 3 files changed, 3 insertions(+), 13 deletions(-) [+]
line wrap: on
line diff
--- a/backends/kiibohd.py	Sat Aug 01 10:45:50 2015 -0700
+++ b/backends/kiibohd.py	Sun Aug 02 13:42:38 2015 -0700
@@ -123,7 +123,7 @@
 		# 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 ] )
+				self.fill_dict['Defines'] += "\n#define {0} {1}".format( variables.defines[ define ], variables.overallVariables[ define ].replace( '\n', ' \\\n' ) )
 			else:
 				print( "{0} '{1}' not defined...".format( WARNING, define ) )
 
--- a/templates/kiibohdDefs.h	Sat Aug 01 10:45:50 2015 -0700
+++ b/templates/kiibohdDefs.h	Sun Aug 02 13:42:38 2015 -0700
@@ -17,8 +17,7 @@
 <|Information|>
 
 
-#ifndef __kll_defs_h
-#define __kll_defs_h
+#pragma once
 
 // ----- KLL Variables -----
 <|VariableInformation|>
@@ -28,7 +27,3 @@
 // ----- Defines -----
 <|Defines|>
 
-
-
-#endif // __kll_defs_h
-
--- a/templates/kiibohdKeymap.h	Sat Aug 01 10:45:50 2015 -0700
+++ b/templates/kiibohdKeymap.h	Sun Aug 02 13:42:38 2015 -0700
@@ -17,8 +17,7 @@
 <|Information|>
 
 
-#ifndef __kiibohdKeymap_h
-#define __kiibohdKeymap_h
+#pragma once
 
 // ----- Includes -----
 
@@ -126,7 +125,3 @@
 // - Layer State
 <|LayerState|>
 
-
-
-#endif // __generatedKeymap_h
-