diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-21 12:30:17 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-06-21 12:30:17 -0400 |
| commit | a6e109caa1e813d18f76f2b23dfd1655b6acf691 (patch) | |
| tree | 2f8d823848eeb968b7bdb233fc8b4a222289d488 /keyboard/planck/keymaps/cbbrowne | |
| parent | f6d1ce7863893e6dd0233c57f04b262f6808d78a (diff) | |
| parent | a8375fa15a6ca9285eb15ae89bcda898349e06f8 (diff) | |
| download | qmk_firmware-a6e109caa1e813d18f76f2b23dfd1655b6acf691.tar.gz qmk_firmware-a6e109caa1e813d18f76f2b23dfd1655b6acf691.zip | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/planck/keymaps/cbbrowne')
| -rw-r--r-- | keyboard/planck/keymaps/cbbrowne/Makefile | 42 | ||||
| -rw-r--r-- | keyboard/planck/keymaps/cbbrowne/config.h (renamed from keyboard/planck/keymaps/cbbrowne/config_user.h) | 8 | ||||
| -rw-r--r-- | keyboard/planck/keymaps/cbbrowne/keymap.c | 2 |
3 files changed, 11 insertions, 41 deletions
diff --git a/keyboard/planck/keymaps/cbbrowne/Makefile b/keyboard/planck/keymaps/cbbrowne/Makefile index 4fbe3b6619..581e08cd02 100644 --- a/keyboard/planck/keymaps/cbbrowne/Makefile +++ b/keyboard/planck/keymaps/cbbrowne/Makefile @@ -1,45 +1,7 @@ -#---------------------------------------------------------------------------- -# On command line: -# -# make all = Make software. -# -# make clean = Clean out built project files. -# -# make coff = Convert ELF to AVR COFF. -# -# make extcoff = Convert ELF to AVR Extended COFF. -# -# make program = Download the hex file to the device. -# Please customize your programmer settings(PROGRAM_CMD) -# -# make teensy = Download the hex file to the device, using teensy_loader_cli. -# (must have teensy_loader_cli installed). -# -# make dfu = Download the hex file to the device, using dfu-programmer (must -# have dfu-programmer installed). -# -# make flip = Download the hex file to the device, using Atmel FLIP (must -# have Atmel FLIP installed). -# -# make dfu-ee = Download the eeprom file to the device, using dfu-programmer -# (must have dfu-programmer installed). -# -# make flip-ee = Download the eeprom file to the device, using Atmel FLIP -# (must have Atmel FLIP installed). -# -# make debug = Start either simulavr or avarice as specified for debugging, -# with avr-gdb or avr-insight as the front end for debugging. -# -# make filename.s = Just compile filename.c into the assembler code only. -# -# make filename.i = Create a preprocessed source file for use in submitting -# bug reports to the GCC project. -# -# To rebuild project do "make clean" then "make all". -#---------------------------------------------------------------------------- + # Build Options -# change to "no" to disable the options, or define them in the makefile.mk in +# change to "no" to disable the options, or define them in the Makefile in # the appropriate keymap folder that will get included automatically # BOOTMAGIC_ENABLE = no # Virtual DIP switch configuration(+1000) diff --git a/keyboard/planck/keymaps/cbbrowne/config_user.h b/keyboard/planck/keymaps/cbbrowne/config.h index de46ec6aaa..2d3df59bd2 100644 --- a/keyboard/planck/keymaps/cbbrowne/config_user.h +++ b/keyboard/planck/keymaps/cbbrowne/config.h @@ -1,7 +1,15 @@ +#ifndef CONFIG_USER_H +#define CONFIG_USER_H + +#include "../../config.h" + /* cbbrowne user configuration */ #define randadd 53 #define randmul 181 #define randmod 167 +#endif + + diff --git a/keyboard/planck/keymaps/cbbrowne/keymap.c b/keyboard/planck/keymaps/cbbrowne/keymap.c index 7fe391ec5d..14a5be1708 100644 --- a/keyboard/planck/keymaps/cbbrowne/keymap.c +++ b/keyboard/planck/keymaps/cbbrowne/keymap.c @@ -2,7 +2,7 @@ #ifdef BACKLIGHT_ENABLE #include "backlight.h" #endif -#include "config_user.h" +#include "config.h" #include "quantum.h" /* Each layer is given a name to aid in readability, which is then |