diff options
author | Alex Johnstone <alexjj@gmail.com> | 2016-04-05 16:44:37 +0200 |
---|---|---|
committer | Alex Johnstone <alexjj@gmail.com> | 2016-04-05 16:44:37 +0200 |
commit | 1facc53a26294df7fb2a42f8f3d025176b8c384a (patch) | |
tree | 98eebfa4beb49524c1345c2dd9e93d1fb8aa445a /keyboard/atomic | |
parent | 48899673af8b82638d601455f405f03db165bd57 (diff) | |
parent | 931b0a79fc071498c229b0051be0ebadd934a549 (diff) | |
download | qmk_firmware-1facc53a26294df7fb2a42f8f3d025176b8c384a.tar.gz qmk_firmware-1facc53a26294df7fb2a42f8f3d025176b8c384a.tar.xz |
Merge pull request #5 from jackhumbert/master
Sync with upstream
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 e678b4efa..da6d0ac60 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 c8e83cf55..0e42370ba 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 589a64dc4..589a64dc4 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 f37d9d9a5..f37d9d9a5 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 2364c46a1..2364c46a1 100644 --- a/keyboard/atomic/keymaps/keymap_michelle.c +++ b/keyboard/atomic/keymaps/michelle.c |