tree!

generate_layout.rb

@@ -6,7 +6,7 @@
 # require "muflax"
 
 LayoutDir 	= "src/keyboard"
-LayoutFile	= "#{LayoutDir}/layout_gen.h"
+LayoutFile	= "#{LayoutDir}/layout.c"
 
 puts "generating #{LayoutFile}..."
 

src/keyboard/keyboard.h

@@ -21,8 +21,11 @@
  * ------------------------------------------------------------------------- */
 
 #pragma once
-// ----------------------------------------------------------------------------
-// ----------------------------------------------------------------------------
+// --------------------------------------------------------------------
+
+#define KB_ROWS     6  // must match real life
+#define KB_COLUMNS 14  // must match real life
+#define KB_LAYERS  10
 
 
 //      Name                        ID    // PC Mac Unix  Boot Keyboard Req.

src/keyboard/layout.h

@@ -11,15 +11,10 @@
 #include <stdint.h>
 #include <stddef.h>
 #include <avr/pgmspace.h>
+#include "./keyboard.h"
 
 typedef void (*void_funptr_t)(void);
 
-// --------------------------------------------------------------------
-
-#define KB_ROWS     6  // must match real life
-#define KB_COLUMNS 14  // must match real life
-#define KB_LAYERS  10
-
 // --------------------------------------------------------------------
 uint8_t	main_layers_top_layer  	(void);
 uint8_t	main_layers_top_sticky 	(void);

src/main.c

@@ -14,16 +14,12 @@
 #include <stdint.h>
 #include <util/delay.h>
 #include <util/delay.h>
-#include "./keyboard/controller.h"
+#include "./keyboard/controller.c"
+#include "./keyboard/layout.c"
 #include "./keyboard/keyboard.h"
-#include "./keyboard/layout_gen.h"
 
 // ----------------------------------------------------------------------------
 
-#define KB_ROWS     6  // must match real life
-#define KB_COLUMNS 14  // must match real life
-#define KB_LAYERS  10
-
 static bool _main_kb_is_pressed[KB_ROWS][KB_COLUMNS];
 bool (*main_kb_is_pressed)[KB_ROWS][KB_COLUMNS] = &_main_kb_is_pressed;
 

src/makefile

@@ -21,13 +21,12 @@ BOARD  := teensy-2-0  # see the libraries you're using for what's available
 F_CPU  := 16000000    # processor speed, in Hz
 
 # firmware stuff
-SRC  := main.c keyboard/controller.c
+SRC	:= main.c
+OBJ	:= $(SRC:%.c=%.o)
 # keyboard and layout stuff
-# --- remove whitespace from vars
-KEYBOARD := $(strip $(KEYBOARD))
-LAYOUT   := $(strip $(LAYOUT))
+KEYBOARD	:= $(strip $(KEYBOARD))
+LAYOUT  	:= $(strip $(LAYOUT))
 
-OBJ = $(SRC:%.c=%.o)
 
 
 # . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . . .