diff options
| author | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-30 13:14:01 -0400 |
|---|---|---|
| committer | Christopher Browne <cbbrowne@ca.afilias.info> | 2016-03-30 13:14:01 -0400 |
| commit | 5bbcc484a8e14ffb13354df4efdd460ebe7200e1 (patch) | |
| tree | 65b0a4c4e659b60038ec63706c46fb21de153598 /keyboard/atomic | |
| parent | 95a88c09e18a7531a64838ceaa52df37bad8dc0d (diff) | |
| parent | ae47275bf34549a0f66cb2f37daca299fd4ecdee (diff) | |
Merge branch 'master' of https://github.com/jackhumbert/qmk_firmware
Diffstat (limited to 'keyboard/atomic')
| -rw-r--r-- | keyboard/atomic/Makefile | 4 | ||||
| -rw-r--r-- | keyboard/atomic/README.md | 4 | ||||
| -rw-r--r-- | keyboard/atomic/keymaps/abienz.c (renamed from keyboard/atomic/keymaps/keymap_abienz.c) | 0 | ||||
| -rw-r--r-- | keyboard/atomic/keymaps/default.c (renamed from keyboard/atomic/keymaps/keymap_default.c) | 0 | ||||
| -rw-r--r-- | keyboard/atomic/keymaps/michelle.c (renamed from keyboard/atomic/keymaps/keymap_michelle.c) | 0 |
5 files changed, 4 insertions, 4 deletions
diff --git a/keyboard/atomic/Makefile b/keyboard/atomic/Makefile index e678b4efa8..da6d0ac60c 100644 --- a/keyboard/atomic/Makefile +++ b/keyboard/atomic/Makefile @@ -54,9 +54,9 @@ SRC = atomic.c \ backlight.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 CONFIG_H = config.h diff --git a/keyboard/atomic/README.md b/keyboard/atomic/README.md index c8e83cf55a..0e42370ba6 100644 --- a/keyboard/atomic/README.md +++ b/keyboard/atomic/README.md @@ -16,10 +16,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 a file in the keymaps folder 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/atomic/keymaps/keymap_abienz.c b/keyboard/atomic/keymaps/abienz.c index 589a64dc4e..589a64dc4e 100644 --- a/keyboard/atomic/keymaps/keymap_abienz.c +++ b/keyboard/atomic/keymaps/abienz.c diff --git a/keyboard/atomic/keymaps/keymap_default.c b/keyboard/atomic/keymaps/default.c index f37d9d9a51..f37d9d9a51 100644 --- a/keyboard/atomic/keymaps/keymap_default.c +++ b/keyboard/atomic/keymaps/default.c diff --git a/keyboard/atomic/keymaps/keymap_michelle.c b/keyboard/atomic/keymaps/michelle.c index 2364c46a15..2364c46a15 100644 --- a/keyboard/atomic/keymaps/keymap_michelle.c +++ b/keyboard/atomic/keymaps/michelle.c |