Merge branch 'master' of github.com:kiibohd/kll

diff --git a/backends/kiibohd.py b/backends/kiibohd.py
index c03f853def63d41e45b14c1ca1c24aed508b3e5d..9f47150451cb706fae115ac54f31be92d83e190f 100644 (file)
--- a/backends/kiibohd.py
+++ b/backends/kiibohd.py
@@ -123,7 +123,7 @@ class Backend( BackendBase ):
                # 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 ) )
 

diff --git a/templates/kiibohdDefs.h b/templates/kiibohdDefs.h
index dd21fd023f51d9cf577e4ea7bd2f4c2db4268369..00b45a69bdc1d60512fdf4fce062cd212fd750e6 100644 (file)
--- a/templates/kiibohdDefs.h
+++ b/templates/kiibohdDefs.h
@@ -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
-

diff --git a/templates/kiibohdKeymap.h b/templates/kiibohdKeymap.h
index d3bfe4990c6a4a4c70b4dfaafdcf499ec6d48c52..baf78d9493f629f4e32934ab78c74805e9791d1a 100644 (file)
--- a/templates/kiibohdKeymap.h
+++ b/templates/kiibohdKeymap.h
@@ -17,8 +17,7 @@
 <|Information|>
 
 
-#ifndef __kiibohdKeymap_h
-#define __kiibohdKeymap_h
+#pragma once
 
 // ----- Includes -----
 
@@ -126,7 +125,3 @@
 // - Layer State
 <|LayerState|>
 
-
-
-#endif // __generatedKeymap_h
-