summaryrefslogtreecommitdiff
path: root/keyboard/hhkb_qmk
diff options
context:
space:
mode:
authorJack Humbert <jack.humb@gmail.com>2016-03-29 22:37:20 -0400
committerJack Humbert <jack.humb@gmail.com>2016-03-29 22:37:20 -0400
commit4a676746a6d8c9b47956f863ead335e995677c53 (patch)
treeabec71f825ce412d13e057bc1bd89018cf3bb8f7 /keyboard/hhkb_qmk
parent26513b497b8bae5160389c0beac2d45cbb29c50f (diff)
parent95fba250ef2029ccdedb34500c5d1e96f6d065cf (diff)
Merge pull request #224 from NoahAndrews/make-keymap-names-consistent
Make keymap names more consistent
Diffstat (limited to 'keyboard/hhkb_qmk')
-rw-r--r--keyboard/hhkb_qmk/Makefile4
-rw-r--r--keyboard/hhkb_qmk/README.md4
-rw-r--r--keyboard/hhkb_qmk/keymaps/default.c (renamed from keyboard/hhkb_qmk/keymaps/keymap_default.c)0
-rw-r--r--keyboard/hhkb_qmk/keymaps/lxol.c (renamed from keyboard/hhkb_qmk/keymaps/keymap_lxol.c)0
4 files changed, 4 insertions, 4 deletions
diff --git a/keyboard/hhkb_qmk/Makefile b/keyboard/hhkb_qmk/Makefile
index 8bd44100b7..21ba261a23 100644
--- a/keyboard/hhkb_qmk/Makefile
+++ b/keyboard/hhkb_qmk/Makefile
@@ -54,9 +54,9 @@ SRC = hhkb_qmk.c \
matrix.c
ifdef KEYMAP
- SRC := keymaps/keymap_$(KEYMAP).c $(SRC)
+ SRC := keymaps/keymaps/$(KEYMAP).c $(SRC)
else
- SRC := keymaps/keymap_default.c $(SRC)
+ SRC := keymaps/keymaps/default.c $(SRC)
endif
CONFIG_H = config.h
diff --git a/keyboard/hhkb_qmk/README.md b/keyboard/hhkb_qmk/README.md
index 606025c411..389407b3aa 100644
--- a/keyboard/hhkb_qmk/README.md
+++ b/keyboard/hhkb_qmk/README.md
@@ -171,10 +171,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/hhkb_qmk/keymaps/keymap_default.c b/keyboard/hhkb_qmk/keymaps/default.c
index bcd8ead377..bcd8ead377 100644
--- a/keyboard/hhkb_qmk/keymaps/keymap_default.c
+++ b/keyboard/hhkb_qmk/keymaps/default.c
diff --git a/keyboard/hhkb_qmk/keymaps/keymap_lxol.c b/keyboard/hhkb_qmk/keymaps/lxol.c
index 3256fda516..3256fda516 100644
--- a/keyboard/hhkb_qmk/keymaps/keymap_lxol.c
+++ b/keyboard/hhkb_qmk/keymaps/lxol.c