muflax
/
ergodox-firmware
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

(intermediate checkin)

partial-rewrite
Ben Blazak 2013-01-29 21:59:20 -08:00
parent 1db6d4dd37
commit ad0ff14ca6
4 changed files with 20 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
firmware/keyboard/ergodox/options.h
View File

@ -18,6 +18,14 @@
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// ----------------------------------------------------------------------------
// firmware/main
// ----------------------------------------------------------------------------
#define OPT__DEBOUNCE_TIME 5
// in milliseconds
// ----------------------------------------------------------------------------
// firmware/keyboard/controller
// ----------------------------------------------------------------------------
@ -53,17 +61,10 @@
// ----------------------------------------------------------------------------
// firmware/main
// firmware/lib/...
// ----------------------------------------------------------------------------
#define OPT__DEBOUNCE_TIME 5
// in milliseconds
#include "../../../firmware/main/options.h"
// ----------------------------------------------------------------------------
// firmware/lib/twi
// ----------------------------------------------------------------------------
#define OPT__TWI__FREQENCY 400000
@ -72,7 +73,6 @@
// ----------------------------------------------------------------------------
// firmware/lib/from-pjrc/usb_keyboard
// ----------------------------------------------------------------------------
#define OPT__USB__STR_MANUFACTURER L"custom"

2
firmware/keyboard/ergodox/options.mk
View File

@ -7,6 +7,8 @@
## description
# A central place for all ErgoDox-specific Makefile-level things
#
# This file is meant to be included by '.../firmware/makefile'
#
# TODO: include the other 'options.mk' files that we need to

6
firmware/main/options.h
View File

@ -5,11 +5,13 @@
* ------------------------------------------------------------------------- */
/** description
* `main()` options
* A central place for all `main()` related source-level options (though, some
* of them aren't defined here)
*
* Prefix: `OPT__`
*
* This file is meant to be included by the using '.../options.h'
* This file is meant to be globally included on the command line (after
* '.../firmware/keyboard/.../options.h')
*/

7
firmware/main/options.mk
View File

@ -5,12 +5,15 @@
# -----------------------------------------------------------------------------
## description
# `main()` options
# A central place for all `main()` related Makefile-level options
#
# This file is meant to be included by the using '.../options.mk'
# This file is meant to be included by '.../firmware/makefile' (after
# '.../firmware/keyboard/.../options.mk')
#
SRC += $(wildcard ../main.c)
SRC += $(wildcard main/*.c)
CFLAGS += -include $(wildcard options.h)