summaryrefslogtreecommitdiff
path: root/keyboard/hhkb
diff options
context:
space:
mode:
authorStephan Bösebeck <stephan.boesebeck@holidayinsider.com>2016-04-02 15:15:21 +0200
committerStephan Bösebeck <stephan.boesebeck@holidayinsider.com>2016-04-02 15:15:21 +0200
commitf0424a0c0fa4153234ad6979929e5a2426c86f21 (patch)
tree53deb01f09e9feb9a2fa11259c75411adceb2f3c /keyboard/hhkb
parent71cdfe11682cf63c262380747d8a1b3d48a6bad0 (diff)
parentaee8715815544b076c123d4ed55c76e23a7e54d0 (diff)
Merge branch 'master' of https://github.com/sboesebeck/qmk_firmware
Diffstat (limited to 'keyboard/hhkb')
-rw-r--r--keyboard/hhkb/Makefile8
-rw-r--r--keyboard/hhkb/Makefile.pjrc4
-rw-r--r--keyboard/hhkb/Makefile.rn428
-rw-r--r--keyboard/hhkb/README.md2
-rw-r--r--keyboard/hhkb/keymaps/hasu.c (renamed from keyboard/hhkb/keymap_hasu.c)0
-rw-r--r--keyboard/hhkb/keymaps/hhkb.c (renamed from keyboard/hhkb/keymap_hhkb.c)0
-rw-r--r--keyboard/hhkb/keymaps/jp.c (renamed from keyboard/hhkb/keymap_jp.c)0
-rw-r--r--keyboard/hhkb/keymaps/spacefn.c (renamed from keyboard/hhkb/keymap_spacefn.c)0
8 files changed, 11 insertions, 11 deletions
diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile
index 5a179bd24d..d434246cef 100644
--- a/keyboard/hhkb/Makefile
+++ b/keyboard/hhkb/Makefile
@@ -129,17 +129,17 @@ NKRO_ENABLE = yes # USB Nkey Rollover
# Keymap file
#
ifdef KEYMAP
- SRC := keymap_$(KEYMAP).c $(SRC)
+ SRC := keymaps/$(KEYMAP).c $(SRC)
else
ifdef HHKB_JP
- SRC := keymap_jp.c $(SRC)
+ SRC := keymaps/jp.c $(SRC)
else
- SRC := keymap_hhkb.c $(SRC)
+ SRC := keymaps/hhkb.c $(SRC)
endif
endif
-ifneq (, $(or $(findstring keymap_jp.c, $(SRC)), $(findstring yes, $(HHKB_JP))))
+ifneq (, $(or $(findstring jp.c, $(SRC)), $(findstring yes, $(HHKB_JP))))
OPT_DEFS += -DHHKB_JP
endif
diff --git a/keyboard/hhkb/Makefile.pjrc b/keyboard/hhkb/Makefile.pjrc
index 7d0f8c3a9c..403a8ec60a 100644
--- a/keyboard/hhkb/Makefile.pjrc
+++ b/keyboard/hhkb/Makefile.pjrc
@@ -18,9 +18,9 @@ SRC = keymap_common.c \
led.c
ifdef KEYMAP
- SRC := keymap_$(KEYMAP).c $(SRC)
+ SRC := keymaps/$(KEYMAP).c $(SRC)
else
- SRC := keymap_hasu.c $(SRC)
+ SRC := keymaps/hasu.c $(SRC)
endif
CONFIG_H = config.h
diff --git a/keyboard/hhkb/Makefile.rn42 b/keyboard/hhkb/Makefile.rn42
index cbb2b744c9..a730442af0 100644
--- a/keyboard/hhkb/Makefile.rn42
+++ b/keyboard/hhkb/Makefile.rn42
@@ -122,17 +122,17 @@ COMMAND_ENABLE = yes # Commands for debug and configuration
# Keymap file
#
ifdef KEYMAP
- SRC := keymap_$(KEYMAP).c $(SRC)
+ SRC := keymaps/$(KEYMAP).c $(SRC)
else
ifdef HHKB_JP
- SRC := keymap_jp.c $(SRC)
+ SRC := keymaps/jp.c $(SRC)
else
- SRC := keymap_hhkb.c $(SRC)
+ SRC := keymaps/hhkb.c $(SRC)
endif
endif
-ifneq (, $(or $(findstring keymap_jp.c, $(SRC)), $(findstring yes, $(HHKB_JP))))
+ifneq (, $(or $(findstring jp.c, $(SRC)), $(findstring yes, $(HHKB_JP))))
OPT_DEFS += -DHHKB_JP
endif
diff --git a/keyboard/hhkb/README.md b/keyboard/hhkb/README.md
index fcd72e1941..e20c23d823 100644
--- a/keyboard/hhkb/README.md
+++ b/keyboard/hhkb/README.md
@@ -76,7 +76,7 @@ Use [Teensy Loader] if your controller is Teensy/Teensy++.
##Keymap
-To define your own keymap create file named `keymap_<name>.c` and see [keymap document](../../doc/keymap.md) and existent keymap files.
+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.
##Hardware
diff --git a/keyboard/hhkb/keymap_hasu.c b/keyboard/hhkb/keymaps/hasu.c
index a5602ded31..a5602ded31 100644
--- a/keyboard/hhkb/keymap_hasu.c
+++ b/keyboard/hhkb/keymaps/hasu.c
diff --git a/keyboard/hhkb/keymap_hhkb.c b/keyboard/hhkb/keymaps/hhkb.c
index 86ad0f5eee..86ad0f5eee 100644
--- a/keyboard/hhkb/keymap_hhkb.c
+++ b/keyboard/hhkb/keymaps/hhkb.c
diff --git a/keyboard/hhkb/keymap_jp.c b/keyboard/hhkb/keymaps/jp.c
index 48d0ee70ba..48d0ee70ba 100644
--- a/keyboard/hhkb/keymap_jp.c
+++ b/keyboard/hhkb/keymaps/jp.c
diff --git a/keyboard/hhkb/keymap_spacefn.c b/keyboard/hhkb/keymaps/spacefn.c
index deff920ae2..deff920ae2 100644
--- a/keyboard/hhkb/keymap_spacefn.c
+++ b/keyboard/hhkb/keymaps/spacefn.c