From 66a5932fa89f40932d2a58f292725c966e7393a6 Mon Sep 17 00:00:00 2001
From: Ben Blazak <benblazak.dev@gmail.com>
Date: Fri, 27 Apr 2012 15:39:26 -0700
Subject: [PATCH] moved the key-functions files

---
 src/keyboard/ergodox/layout.h                 | 3 +--
 src/keyboard/ergodox/layout.md                | 4 ++--
 src/keyboard/ergodox/layout/qwerty.c          | 3 +--
 src/{key-functions.c => lib/_key-functions.c} | 2 ++
 src/{key-functions.h => lib/_key-functions.h} | 0
 src/lib/pjrc/readme.md                        | 6 ++++++
 src/makefile                                  | 4 ++--
 7 files changed, 14 insertions(+), 8 deletions(-)
 rename src/{key-functions.c => lib/_key-functions.c} (99%)
 rename src/{key-functions.h => lib/_key-functions.h} (100%)

diff --git a/src/keyboard/ergodox/layout.h b/src/keyboard/ergodox/layout.h
index 12cfc2f..84dca27 100644
--- a/src/keyboard/ergodox/layout.h
+++ b/src/keyboard/ergodox/layout.h
@@ -12,8 +12,7 @@
 	#define LAYOUT_h
 
 	#include "lib/_data-types.h"
-
-	#include "key-functions.h"  // for `kbfun_funptr_t`
+	#include "lib/_key-functions.h"  // for `kbfun_funptr_t`
 
 	#include "matrix.h"  // for number of rows and columns
 
diff --git a/src/keyboard/ergodox/layout.md b/src/keyboard/ergodox/layout.md
index c865394..7ee273c 100644
--- a/src/keyboard/ergodox/layout.md
+++ b/src/keyboard/ergodox/layout.md
@@ -19,8 +19,8 @@ To write a new one:
 * See [matrix.md] (matrix.md) for how the key matrix maps to hardware.
 * See [keyboard-usage-page--short-names.h]
   (../../lib/_usb/keyboard-usage-page--short-names.h) for available keycodes.
-* See [key-functions.c] (../../key-functions.c) for what functions keys can
-  call.
+* See [key-functions.c] (../../lib/_key-functions.c) for what functions keys
+  can call.
 
 
 ## notes
diff --git a/src/keyboard/ergodox/layout/qwerty.c b/src/keyboard/ergodox/layout/qwerty.c
index 2a9ecb9..2a2a27c 100644
--- a/src/keyboard/ergodox/layout/qwerty.c
+++ b/src/keyboard/ergodox/layout/qwerty.c
@@ -11,8 +11,7 @@
 
 #include "lib/_data-types.h"
 #include "lib/_usb/keyboard-usage-page--short-names.h"
-
-#include "key-functions.h"
+#include "lib/_key-functions.h"
 
 #include "../matrix.h"
 #include "../layout.h"
diff --git a/src/key-functions.c b/src/lib/_key-functions.c
similarity index 99%
rename from src/key-functions.c
rename to src/lib/_key-functions.c
index 7f6470f..8b279eb 100644
--- a/src/key-functions.c
+++ b/src/lib/_key-functions.c
@@ -17,6 +17,8 @@
 
 #include "keyboard.h"
 
+#include "_key-functions.h"
+
 
 // ----------------------------------------------------------------------------
 
diff --git a/src/key-functions.h b/src/lib/_key-functions.h
similarity index 100%
rename from src/key-functions.h
rename to src/lib/_key-functions.h
diff --git a/src/lib/pjrc/readme.md b/src/lib/pjrc/readme.md
index 4c64cb5..ec7ad28 100644
--- a/src/lib/pjrc/readme.md
+++ b/src/lib/pjrc/readme.md
@@ -4,6 +4,12 @@
 
 * [pjrc] (http://pjrc.com/teensy/)
     * [usb_keyboard] (http://pjrc.com/teensy/usb_keyboard.zip)
+<!--
+    * [usb_mouse] (http://pjrc.com/teensy/usb_mouse.zip)
+    * [usb_serial] (http://pjrc.com/teensy/usb_serial.zip)
+        * Directions for host setup [here]
+          (http://pjrc.com/teensy/usb_serial.html)
+-->
 
 -------------------------------------------------------------------------------
 
diff --git a/src/makefile b/src/makefile
index d94d456..ce5673d 100644
--- a/src/makefile
+++ b/src/makefile
@@ -20,7 +20,7 @@ LAYOUT   = qwerty    # see "src/keyboard/*/layout" for what's available
 
 # firmware stuff
 SRC  = $(wildcard *.c)
-# keyboard stuff
+# keyboard and layout stuff
 # --- remove whitespace
 KEYBOARD := $(strip $(KEYBOARD))
 LAYOUT   := $(strip $(LAYOUT))
@@ -30,7 +30,7 @@ SRC += $(wildcard keyboard/$(KEYBOARD)/*.c)
 SRC += $(wildcard keyboard/$(KEYBOARD)/layout/$(LAYOUT)*.c)
 # library stuff
 # - add more "*/*/..."s as necessary to compile everything.
-# - parts the stuff under "lib" may not be necessary, depending on other
+# - parts of the stuff under "lib" may not be necessary, depending on other
 #   options, but it's all included here.  hopefully any unnecessary stuff gets
 #   compiled out.  else, the makefile will have to become more complicated.
 SRC += $(wildcard lib/*.c)