diff options
| author | Nicholas Keene <git@nicholaskeene.com> | 2016-05-02 21:35:58 -0500 |
|---|---|---|
| committer | Nicholas Keene <git@nicholaskeene.com> | 2016-05-02 21:35:58 -0500 |
| commit | 8b0274f60a47eae523e28b5a7c6c7f581b6d605a (patch) | |
| tree | b8c6194d89712ddaf5e22aef85274c12c53cb2f1 /keyboard/atreus | |
| parent | 1076c2b1226ed049a364971bf8e1edcd9ed45f6d (diff) | |
| parent | 2c070163ffffffde546fb00acaa2fbb96b93da64 (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/atreus')
| -rw-r--r-- | keyboard/atreus/Makefile | 4 | ||||
| -rw-r--r-- | keyboard/atreus/README.md | 4 | ||||
| -rw-r--r-- | keyboard/atreus/keymaps/default.c (renamed from keyboard/atreus/keymaps/keymap_default.c) | 0 | ||||
| -rw-r--r-- | keyboard/atreus/keymaps/gerb.c (renamed from keyboard/atreus/keymaps/keymap_gerb.c) | 0 |
4 files changed, 4 insertions, 4 deletions
diff --git a/keyboard/atreus/Makefile b/keyboard/atreus/Makefile index 2e542d62ed..a6fddd70d2 100644 --- a/keyboard/atreus/Makefile +++ b/keyboard/atreus/Makefile @@ -53,9 +53,9 @@ TARGET_DIR = . SRC = atreus.c ifdef KEYMAP - SRC := keymaps/keymap_$(KEYMAP).c $(SRC) + SRC := keymaps/$(KEYMAP).c $(SRC) else - SRC := keymaps/keymap_default.c $(SRC) + SRC := keymaps/default.c $(SRC) endif ifdef TEENSY2 diff --git a/keyboard/atreus/README.md b/keyboard/atreus/README.md index 4db7ac1203..aacf2841f4 100644 --- a/keyboard/atreus/README.md +++ b/keyboard/atreus/README.md @@ -177,10 +177,10 @@ Depending on which keymap you would like to use, you will have to compile slight To build with the default keymap, simply run `make`. ### Other Keymaps -Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `keymap_<name>.c` and see keymap document (you can find in top README.md) and existent keymap files. +Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. To define your own keymap create file named `<name>.c` and see keymap document (you can find in top README.md) and existent keymap files. To build the firmware binary hex file with a keymap just do `make` with `KEYMAP` option like: ``` $ make KEYMAP=[default|jack|<name>] ``` -Keymaps follow the format **__keymap\_\<name\>.c__** and are stored in the `keymaps` folder. +Keymaps follow the format **__\<name\>.c__** and are stored in the `keymaps` folder. diff --git a/keyboard/atreus/keymaps/keymap_default.c b/keyboard/atreus/keymaps/default.c index 1c4280ff56..1c4280ff56 100644 --- a/keyboard/atreus/keymaps/keymap_default.c +++ b/keyboard/atreus/keymaps/default.c diff --git a/keyboard/atreus/keymaps/keymap_gerb.c b/keyboard/atreus/keymaps/gerb.c index 1ba3942e3b..1ba3942e3b 100644 --- a/keyboard/atreus/keymaps/keymap_gerb.c +++ b/keyboard/atreus/keymaps/gerb.c |