diff --git a/src/key-functions.c b/src/key-functions.c index ff5112b..3eb9c1f 100644 --- a/src/key-functions.c +++ b/src/key-functions.c @@ -7,10 +7,9 @@ * ------------------------------------------------------------------------- */ -#include "lib-other/pjrc/usb_keyboard/usb_keyboard.h" - -#include "lib/data-types.h" -#include "lib/usb/keyboard-usage-page.h" +#include "lib/pjrc/usb_keyboard/usb_keyboard.h" +#include "lib/_data-types.h" +#include "lib/_usb/keyboard-usage-page.h" #include "keyboard.h" diff --git a/src/key-functions.h b/src/key-functions.h index 887dfa6..04dce41 100644 --- a/src/key-functions.h +++ b/src/key-functions.h @@ -10,7 +10,7 @@ #ifndef KEY_FUNCTIONS_h #define KEY_FUNCTIONS_h - #include "lib/data-types.h" + #include "lib/_data-types.h" typedef void (*kbfun_funptr_t)(uint8_t*, uint8_t*, uint8_t*, uint8_t*); diff --git a/src/keyboard/ergodox.c b/src/keyboard/ergodox.c index 12b5f32..afd5a56 100644 --- a/src/keyboard/ergodox.c +++ b/src/keyboard/ergodox.c @@ -7,7 +7,7 @@ * ------------------------------------------------------------------------- */ -#include "lib/data-types.h" +#include "lib/_data-types.h" #define KEYBOARD_INCLUDE_PRIVATE #include "ergodox/matrix.h" diff --git a/src/keyboard/ergodox.h b/src/keyboard/ergodox.h index 13d096b..4082aaf 100644 --- a/src/keyboard/ergodox.h +++ b/src/keyboard/ergodox.h @@ -11,7 +11,7 @@ #ifndef ERGODOX_h #define ERGODOX_h - #include "lib/data-types.h" + #include "lib/_data-types.h" #include "ergodox/layout.h" // number of layers, layout #include "ergodox/matrix.h" // kb dimensions, matrix status diff --git a/src/keyboard/ergodox/layout.c b/src/keyboard/ergodox/layout.c index 663de73..a342cc6 100644 --- a/src/keyboard/ergodox/layout.c +++ b/src/keyboard/ergodox/layout.c @@ -7,8 +7,8 @@ * ------------------------------------------------------------------------- */ -#include "lib/data-types.h" -#include "lib/usb/keyboard-usage-page.h" +#include "lib/_data-types.h" +#include "lib/_usb/keyboard-usage-page.h" #include "key-functions.h" diff --git a/src/keyboard/ergodox/layout.h b/src/keyboard/ergodox/layout.h index 8b786f1..0d26981 100644 --- a/src/keyboard/ergodox/layout.h +++ b/src/keyboard/ergodox/layout.h @@ -9,7 +9,7 @@ #ifndef LAYOUT_h #define LAYOUT_h - #include "lib/data-types.h" + #include "lib/_data-types.h" #include "key-functions.h" diff --git a/src/keyboard/ergodox/matrix.c b/src/keyboard/ergodox/matrix.c index 3a1f9e7..7b18951 100644 --- a/src/keyboard/ergodox/matrix.c +++ b/src/keyboard/ergodox/matrix.c @@ -7,7 +7,7 @@ * ------------------------------------------------------------------------- */ -#include "lib/data-types.h" +#include "lib/_data-types.h" #include "matrix.h" diff --git a/src/keyboard/ergodox/matrix.h b/src/keyboard/ergodox/matrix.h index 1ee9907..e782487 100644 --- a/src/keyboard/ergodox/matrix.h +++ b/src/keyboard/ergodox/matrix.h @@ -10,7 +10,7 @@ #ifndef MATRIX_h #define MATRIX_h - #include "lib/data-types.h" + #include "lib/_data-types.h" #define KB_ROWS 12 // must match real life #define KB_COLUMNS 7 // must match real life diff --git a/src/keyboard/ergodox/mcp23018.c b/src/keyboard/ergodox/mcp23018.c index 67d30be..70d4138 100644 --- a/src/keyboard/ergodox/mcp23018.c +++ b/src/keyboard/ergodox/mcp23018.c @@ -9,8 +9,8 @@ #include -#include "lib/data-types.h" -#include "lib/teensy-2-0/twi.h" // `TWI_FREQ` defined in "teensy-2-0.c" +#include "lib/_data-types.h" +#include "lib/_teensy-2-0/twi.h" // `TWI_FREQ` defined in "teensy-2-0.c" #define KEYBOARD_INCLUDE_PRIVATE #include "matrix.h" diff --git a/src/keyboard/ergodox/mcp23018.h b/src/keyboard/ergodox/mcp23018.h index ef29523..8f57af8 100644 --- a/src/keyboard/ergodox/mcp23018.h +++ b/src/keyboard/ergodox/mcp23018.h @@ -10,7 +10,7 @@ #ifndef MCP23018_h #define MCP23018_h - #include "lib/data-types.h" + #include "lib/_data-types.h" #ifdef KEYBOARD_INCLUDE_PRIVATE diff --git a/src/keyboard/ergodox/teensy-2-0.c b/src/keyboard/ergodox/teensy-2-0.c index d692218..0a7a6c5 100644 --- a/src/keyboard/ergodox/teensy-2-0.c +++ b/src/keyboard/ergodox/teensy-2-0.c @@ -9,9 +9,9 @@ #include -#include "lib/data-types.h" +#include "lib/_data-types.h" #define TWI_FREQ 400000 -#include "lib/teensy-2-0/twi.h" +#include "lib/_teensy-2-0/twi.h" #define KEYBOARD_INCLUDE_PRIVATE #include "matrix.h" diff --git a/src/keyboard/ergodox/teensy-2-0.h b/src/keyboard/ergodox/teensy-2-0.h index b7f6d32..68ec677 100644 --- a/src/keyboard/ergodox/teensy-2-0.h +++ b/src/keyboard/ergodox/teensy-2-0.h @@ -12,7 +12,7 @@ #include // for the register macros - #include "lib/data-types.h" + #include "lib/_data-types.h" #include "matrix.h" diff --git a/src/lib/data-types.h b/src/lib/_data-types.h similarity index 100% rename from src/lib/data-types.h rename to src/lib/_data-types.h diff --git a/src/lib/teensy-2-0/twi.c b/src/lib/_teensy-2-0/twi.c similarity index 100% rename from src/lib/teensy-2-0/twi.c rename to src/lib/_teensy-2-0/twi.c diff --git a/src/lib/teensy-2-0/twi.h b/src/lib/_teensy-2-0/twi.h similarity index 100% rename from src/lib/teensy-2-0/twi.h rename to src/lib/_teensy-2-0/twi.h diff --git a/src/lib/teensy-2-0/twi.md b/src/lib/_teensy-2-0/twi.md similarity index 100% rename from src/lib/teensy-2-0/twi.md rename to src/lib/_teensy-2-0/twi.md diff --git a/src/lib/usb/keyboard-usage-page.h b/src/lib/_usb/keyboard-usage-page.h similarity index 100% rename from src/lib/usb/keyboard-usage-page.h rename to src/lib/_usb/keyboard-usage-page.h diff --git a/src/lib/usb/led-usage-page.h b/src/lib/_usb/led-usage-page.h similarity index 100% rename from src/lib/usb/led-usage-page.h rename to src/lib/_usb/led-usage-page.h diff --git a/src/lib-other/readme.md b/src/lib/pjrc/readme.md similarity index 89% rename from src/lib-other/readme.md rename to src/lib/pjrc/readme.md index e7188b8..70e605e 100644 --- a/src/lib-other/readme.md +++ b/src/lib/pjrc/readme.md @@ -1,5 +1,4 @@ -# src/lib-other -Files taken from other projects +# src/lib/pjrc ## links to original files diff --git a/src/lib-other/pjrc/usb_keyboard/usb_keyboard.c b/src/lib/pjrc/usb_keyboard/usb_keyboard.c similarity index 100% rename from src/lib-other/pjrc/usb_keyboard/usb_keyboard.c rename to src/lib/pjrc/usb_keyboard/usb_keyboard.c diff --git a/src/lib-other/pjrc/usb_keyboard/usb_keyboard.h b/src/lib/pjrc/usb_keyboard/usb_keyboard.h similarity index 100% rename from src/lib-other/pjrc/usb_keyboard/usb_keyboard.h rename to src/lib/pjrc/usb_keyboard/usb_keyboard.h diff --git a/src/lib/readme.md b/src/lib/readme.md new file mode 100644 index 0000000..2bbef28 --- /dev/null +++ b/src/lib/readme.md @@ -0,0 +1,12 @@ +# src/lib +Stuff that's generally useful + +* Directories prepended by a `_` were written for (and exist solely in) this + project. + +------------------------------------------------------------------------------- + +Copyright © 2012 Ben Blazak +Released under The MIT License (MIT) (see "license.md") +Project located at + diff --git a/src/main.c b/src/main.c index 206d969..f605767 100644 --- a/src/main.c +++ b/src/main.c @@ -10,9 +10,8 @@ #include -#include "lib-other/pjrc/usb_keyboard/usb_keyboard.h" - -#include "lib/data-types.h" +#include "lib/pjrc/usb_keyboard/usb_keyboard.h" +#include "lib/_data-types.h" #include "keyboard.h" diff --git a/src/makefile b/src/makefile index 25bd31a..bfe2495 100644 --- a/src/makefile +++ b/src/makefile @@ -19,11 +19,10 @@ FORMAT = ihex SRC = \ $(wildcard *.c) \ - $(wildcard keyboard/*.c) \ - $(wildcard keyboard/*/*.c) \ - $(wildcard lib/*.c) \ - $(wildcard lib/*/*.c) \ - lib-other/pjrc/usb_keyboard/usb_keyboard.c + $(wildcard keyboard/ergodox*.c) \ + $(wildcard keyboard/ergodox/*.c) \ + $(wildcard lib/_teensy-2-0/*.c) \ + $(wildcard lib/pjrc/usb_keyboard/*.c) OBJ = $(SRC:%.c=%.o)