diff options
| author | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-04-02 15:15:21 +0200 |
|---|---|---|
| committer | Stephan Bösebeck <stephan.boesebeck@holidayinsider.com> | 2016-04-02 15:15:21 +0200 |
| commit | f0424a0c0fa4153234ad6979929e5a2426c86f21 (patch) | |
| tree | 53deb01f09e9feb9a2fa11259c75411adceb2f3c /keyboard/atomic | |
| parent | 71cdfe11682cf63c262380747d8a1b3d48a6bad0 (diff) | |
| parent | aee8715815544b076c123d4ed55c76e23a7e54d0 (diff) | |
Merge branch 'master' of https://github.com/sboesebeck/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 |