moved the key-functions files

partial-rewrite
Ben Blazak 2012-04-27 15:39:26 -07:00
parent 07d3bbc4f4
commit 66a5932fa8
7 changed files with 14 additions and 8 deletions

View File

@ -12,8 +12,7 @@
#define LAYOUT_h #define LAYOUT_h
#include "lib/_data-types.h" #include "lib/_data-types.h"
#include "lib/_key-functions.h" // for `kbfun_funptr_t`
#include "key-functions.h" // for `kbfun_funptr_t`
#include "matrix.h" // for number of rows and columns #include "matrix.h" // for number of rows and columns

View File

@ -19,8 +19,8 @@ To write a new one:
* See [matrix.md] (matrix.md) for how the key matrix maps to hardware. * See [matrix.md] (matrix.md) for how the key matrix maps to hardware.
* See [keyboard-usage-page--short-names.h] * See [keyboard-usage-page--short-names.h]
(../../lib/_usb/keyboard-usage-page--short-names.h) for available keycodes. (../../lib/_usb/keyboard-usage-page--short-names.h) for available keycodes.
* See [key-functions.c] (../../key-functions.c) for what functions keys can * See [key-functions.c] (../../lib/_key-functions.c) for what functions keys
call. can call.
## notes ## notes

View File

@ -11,8 +11,7 @@
#include "lib/_data-types.h" #include "lib/_data-types.h"
#include "lib/_usb/keyboard-usage-page--short-names.h" #include "lib/_usb/keyboard-usage-page--short-names.h"
#include "lib/_key-functions.h"
#include "key-functions.h"
#include "../matrix.h" #include "../matrix.h"
#include "../layout.h" #include "../layout.h"

View File

@ -17,6 +17,8 @@
#include "keyboard.h" #include "keyboard.h"
#include "_key-functions.h"
// ---------------------------------------------------------------------------- // ----------------------------------------------------------------------------

View File

@ -4,6 +4,12 @@
* [pjrc] (http://pjrc.com/teensy/) * [pjrc] (http://pjrc.com/teensy/)
* [usb_keyboard] (http://pjrc.com/teensy/usb_keyboard.zip) * [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)
-->
------------------------------------------------------------------------------- -------------------------------------------------------------------------------

View File

@ -20,7 +20,7 @@ LAYOUT = qwerty # see "src/keyboard/*/layout" for what's available
# firmware stuff # firmware stuff
SRC = $(wildcard *.c) SRC = $(wildcard *.c)
# keyboard stuff # keyboard and layout stuff
# --- remove whitespace # --- remove whitespace
KEYBOARD := $(strip $(KEYBOARD)) KEYBOARD := $(strip $(KEYBOARD))
LAYOUT := $(strip $(LAYOUT)) LAYOUT := $(strip $(LAYOUT))
@ -30,7 +30,7 @@ SRC += $(wildcard keyboard/$(KEYBOARD)/*.c)
SRC += $(wildcard keyboard/$(KEYBOARD)/layout/$(LAYOUT)*.c) SRC += $(wildcard keyboard/$(KEYBOARD)/layout/$(LAYOUT)*.c)
# library stuff # library stuff
# - add more "*/*/..."s as necessary to compile everything. # - 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 # options, but it's all included here. hopefully any unnecessary stuff gets
# compiled out. else, the makefile will have to become more complicated. # compiled out. else, the makefile will have to become more complicated.
SRC += $(wildcard lib/*.c) SRC += $(wildcard lib/*.c)