diff options
| -rw-r--r-- | keyboard/hhkb/Makefile | 10 | ||||
| -rw-r--r-- | keyboard/hhkb/Makefile.jp | 2 | ||||
| -rw-r--r-- | keyboard/hhkb/README.md | 7 |
3 files changed, 13 insertions, 6 deletions
diff --git a/keyboard/hhkb/Makefile b/keyboard/hhkb/Makefile index 5cf02d194..dc5c06a94 100644 --- a/keyboard/hhkb/Makefile +++ b/keyboard/hhkb/Makefile @@ -121,11 +121,6 @@ NKRO_ENABLE = yes # USB Nkey Rollover #HHKB_JP = yes # HHKB JP support -ifdef HHKB_JP - OPT_DEFS += -DHHKB_JP -endif - - # # Keymap file # @@ -140,6 +135,11 @@ else endif +ifneq (, $(or $(findstring keymap_jp.c, $(SRC)), $(findstring yes, $(HHKB_JP)))) + OPT_DEFS += -DHHKB_JP +endif + + # Search Path VPATH += $(TARGET_DIR) VPATH += $(TOP_DIR) diff --git a/keyboard/hhkb/Makefile.jp b/keyboard/hhkb/Makefile.jp new file mode 100644 index 000000000..e04dbb242 --- /dev/null +++ b/keyboard/hhkb/Makefile.jp @@ -0,0 +1,2 @@ +HHKB_JP = yes +include Makefile diff --git a/keyboard/hhkb/README.md b/keyboard/hhkb/README.md index d4a2cd022..f9fd16507 100644 --- a/keyboard/hhkb/README.md +++ b/keyboard/hhkb/README.md @@ -43,12 +43,15 @@ See [doc/HHKB.txt](doc/HHKB.txt) and files under [doc/](doc/) for internal of HH See [this document](../../doc/build.md) first. ### Configuration -Set `MCU`, `BOOTLOADER_SIZE` and other build options in `Makefile` and `config.h`. If your target is **HHKB JP** you need to set `HHKB_JP` build option in `Makefile`. +If your target is **HHKB JP** you need to set `HHKB_JP` build option in `Makefile` or use `Makefile.jp` instead of `Makefile`. + +If you use other than **TMK Alt Controller Board** set proper `MCU`, `BOOTLOADER_SIZE` and other build options in `Makefile` and `config.h`. At least PJRC Teensy requires changing `BOOTLOADER_SIZE` to 512. ### Build Several version of keymap are available in advance but you are recommended to define your favorite layout yourself. Just `make` with `KEYMAP` option like: $ make KEYMAP=[hasu|hhkb|spacefn|<name>] + $ make -f Makefile.jp KEYMAP=[jp|<name>] # for HHKB JP ### Program @@ -57,10 +60,12 @@ First, push reset button on board to start bootloader. This command programs the controller with [dfu-programmer] if the tool is installed and configured properly. $ make dfu + $ make -f Makefile.jp dfu # for HHKB JP Or you can also use [FLIP] command to program. Also the tool should be installed and configured properly. FLIP GUI application is also available. $ make flip + $ make -f Makefile.jp flip # for HHKB JP Use [Teensy Loader] if your controller is Teensy/Teensy++. |