reorganized src/lib
parent
502fa3a79f
commit
bec0c7244f
|
@ -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"
|
||||
|
||||
|
|
|
@ -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*);
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
* ------------------------------------------------------------------------- */
|
||||
|
||||
|
||||
#include "lib/data-types.h"
|
||||
#include "lib/_data-types.h"
|
||||
|
||||
#define KEYBOARD_INCLUDE_PRIVATE
|
||||
#include "ergodox/matrix.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
|
||||
|
|
|
@ -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"
|
||||
|
||||
|
|
|
@ -9,7 +9,7 @@
|
|||
#ifndef LAYOUT_h
|
||||
#define LAYOUT_h
|
||||
|
||||
#include "lib/data-types.h"
|
||||
#include "lib/_data-types.h"
|
||||
|
||||
#include "key-functions.h"
|
||||
|
||||
|
|
|
@ -7,7 +7,7 @@
|
|||
* ------------------------------------------------------------------------- */
|
||||
|
||||
|
||||
#include "lib/data-types.h"
|
||||
#include "lib/_data-types.h"
|
||||
|
||||
#include "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
|
||||
|
|
|
@ -9,8 +9,8 @@
|
|||
|
||||
#include <util/twi.h>
|
||||
|
||||
#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"
|
||||
|
|
|
@ -10,7 +10,7 @@
|
|||
#ifndef MCP23018_h
|
||||
#define MCP23018_h
|
||||
|
||||
#include "lib/data-types.h"
|
||||
#include "lib/_data-types.h"
|
||||
|
||||
#ifdef KEYBOARD_INCLUDE_PRIVATE
|
||||
|
||||
|
|
|
@ -9,9 +9,9 @@
|
|||
|
||||
#include <avr/io.h>
|
||||
|
||||
#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"
|
||||
|
|
|
@ -12,7 +12,7 @@
|
|||
|
||||
#include <avr/io.h> // for the register macros
|
||||
|
||||
#include "lib/data-types.h"
|
||||
#include "lib/_data-types.h"
|
||||
|
||||
#include "matrix.h"
|
||||
|
||||
|
|
|
@ -1,5 +1,4 @@
|
|||
# src/lib-other
|
||||
Files taken from other projects
|
||||
# src/lib/pjrc
|
||||
|
||||
## links to original files
|
||||
|
|
@ -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 <benblazak.dev@gmail.com>
|
||||
Released under The MIT License (MIT) (see "license.md")
|
||||
Project located at <https://github.com/benblazak/ergodox-firmware>
|
||||
|
|
@ -10,9 +10,8 @@
|
|||
|
||||
#include <util/delay.h>
|
||||
|
||||
#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"
|
||||
|
||||
|
|
|
@ -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)
|
||||
|
||||
|
|
Loading…
Reference in New Issue