From fced377ac007d27f2650ccffbe0b18abcdcfe23d Mon Sep 17 00:00:00 2001 From: James Young <18669334+noroadsleft@users.noreply.github.com> Date: Sat, 30 May 2020 13:14:59 -0700 Subject: 2020 May 30 Breaking Changes Update (#9215) * Branch point for 2020 May 30 Breaking Change * Migrate `ACTION_LAYER_TOGGLE` to `TG()` (#8954) * Migrate `ACTION_MODS_ONESHOT` to `OSM()` (#8957) * Migrate `ACTION_DEFAULT_LAYER_SET` to `DF()` (#8958) * Migrate `ACTION_LAYER_MODS` to `LM()` (#8959) * Migrate `ACTION_MODS_TAP_KEY` to `MT()` (#8968) * Convert V-USB usbdrv to a submodule (#8321) * Unify Tap Hold functions and documentation (#8348) * Changing board names to prevent confusion (#8412) * Move the Keyboardio Model01 to a keyboardio/ subdir (#8499) * Move spaceman keyboards (#8830) * Migrate miscellaneous `fn_actions` entries (#8977) * Migrate `ACTION_MODS_KEY` to chained mod keycodes (#8979) * Organizing my keyboards (plaid, tartan, ergoinu) (#8537) * Refactor Lily58 to use split_common (#6260) * Refactor zinc to use split_common (#7114) * Add a message if bin/qmk doesn't work (#9000) * Fix conflicting types for 'tfp_printf' (#8269) * Fixed RGB_DISABLE_AFTER_TIMEOUT to be seconds based & small internals cleanup (#6480) * Refactor and updates to TKC1800 code (#8472) * Switch to qmk forks for everything (#9019) * audio refactor: replace deprecated PLAY_NOTE_ARRAY (#8484) * Audio enable corrections (2/3) (#8903) * Split HHKB to ANSI and JP layouts and Add VIA support for each (#8582) * Audio enable corrections (Part 4) (#8974) * Fix typo from PR7114 (#9171) * Augment future branch Changelogs (#8978) * Revert "Branch point for 2020 May 30 Breaking Change" --- keyboards/hhkb/ansi/ansi.c | 1 + keyboards/hhkb/ansi/ansi.h | 23 +++ keyboards/hhkb/ansi/config.h | 104 ++++++++++ keyboards/hhkb/ansi/hhkb_avr.h | 157 +++++++++++++++ keyboards/hhkb/ansi/info.json | 73 +++++++ keyboards/hhkb/ansi/keymaps/blakedietz/README.md | 134 +++++++++++++ keyboards/hhkb/ansi/keymaps/blakedietz/config.h | 24 +++ keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c | 125 ++++++++++++ keyboards/hhkb/ansi/keymaps/blakedietz/rules.mk | 3 + keyboards/hhkb/ansi/keymaps/brett/config.h | 17 ++ keyboards/hhkb/ansi/keymaps/brett/keymap.c | 119 ++++++++++++ keyboards/hhkb/ansi/keymaps/brett/readme.md | 13 ++ keyboards/hhkb/ansi/keymaps/brett/rules.mk | 4 + keyboards/hhkb/ansi/keymaps/cinaeco/README.md | 23 +++ keyboards/hhkb/ansi/keymaps/cinaeco/config.h | 20 ++ keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c | 178 +++++++++++++++++ keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk | 20 ++ keyboards/hhkb/ansi/keymaps/dbroqua/keymap.c | 89 +++++++++ keyboards/hhkb/ansi/keymaps/dbroqua/readme.md | 26 +++ keyboards/hhkb/ansi/keymaps/default/keymap.c | 56 ++++++ keyboards/hhkb/ansi/keymaps/eric/keymap.c | 73 +++++++ keyboards/hhkb/ansi/keymaps/krusli/config.h | 1 + keyboards/hhkb/ansi/keymaps/krusli/keymap.c | 75 +++++++ keyboards/hhkb/ansi/keymaps/lxol/keymap.c | 200 +++++++++++++++++++ keyboards/hhkb/ansi/keymaps/mjt/config.h | 72 +++++++ keyboards/hhkb/ansi/keymaps/mjt/keymap.c | 112 +++++++++++ keyboards/hhkb/ansi/keymaps/mjt/readme.md | 16 ++ keyboards/hhkb/ansi/keymaps/mjt/rules.mk | 1 + keyboards/hhkb/ansi/keymaps/schaeferdev/README.md | 36 ++++ keyboards/hhkb/ansi/keymaps/schaeferdev/config.h | 9 + keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c | 76 ++++++++ keyboards/hhkb/ansi/keymaps/schaeferdev/rules.mk | 1 + .../hhkb/ansi/keymaps/shela/action_pseudo_lut.c | 143 ++++++++++++++ .../hhkb/ansi/keymaps/shela/action_pseudo_lut.h | 15 ++ keyboards/hhkb/ansi/keymaps/shela/config.h | 12 ++ keyboards/hhkb/ansi/keymaps/shela/keymap.c | 186 ++++++++++++++++++ keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h | 32 +++ keyboards/hhkb/ansi/keymaps/shela/readme.md | 14 ++ keyboards/hhkb/ansi/keymaps/shela/rules.mk | 1 + keyboards/hhkb/ansi/keymaps/smt/keymap.c | 172 +++++++++++++++++ keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c | 20 ++ keyboards/hhkb/ansi/keymaps/tobiasvl_iso/readme.md | 22 +++ keyboards/hhkb/ansi/keymaps/tominabox1/.gitignore | 3 + keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c | 12 ++ keyboards/hhkb/ansi/keymaps/via/keymap.c | 68 +++++++ keyboards/hhkb/ansi/keymaps/via/rules.mk | 1 + keyboards/hhkb/ansi/keymaps/xyverz/keymap.c | 137 +++++++++++++ keyboards/hhkb/ansi/matrix.c | 211 ++++++++++++++++++++ keyboards/hhkb/ansi/readme.md | 14 ++ keyboards/hhkb/ansi/rules.mk | 71 +++++++ keyboards/hhkb/config.h | 111 ----------- keyboards/hhkb/hhkb.c | 1 - keyboards/hhkb/hhkb.h | 52 ----- keyboards/hhkb/hhkb_avr.h | 167 ---------------- keyboards/hhkb/info.json | 147 -------------- keyboards/hhkb/jp/config.h | 104 ++++++++++ keyboards/hhkb/jp/hhkb_avr.h | 164 ++++++++++++++++ keyboards/hhkb/jp/info.json | 82 ++++++++ keyboards/hhkb/jp/jp.c | 1 + keyboards/hhkb/jp/jp.h | 28 +++ keyboards/hhkb/jp/keymaps/bakingpy/keymap.c | 16 ++ keyboards/hhkb/jp/keymaps/bakingpy/rules.mk | 1 + keyboards/hhkb/jp/keymaps/default/keymap.c | 49 +++++ keyboards/hhkb/jp/keymaps/default/rules.mk | 1 + keyboards/hhkb/jp/keymaps/default_mac/keymap.c | 49 +++++ keyboards/hhkb/jp/keymaps/default_mac/rules.mk | 1 + keyboards/hhkb/jp/keymaps/dhertz/config.h | 1 + keyboards/hhkb/jp/keymaps/dhertz/keymap.c | 84 ++++++++ keyboards/hhkb/jp/keymaps/dhertz/keymap.h | 7 + keyboards/hhkb/jp/keymaps/dhertz/rules.mk | 2 + keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c | 71 +++++++ keyboards/hhkb/jp/keymaps/enoch_jp/rules.mk | 3 + keyboards/hhkb/jp/keymaps/halfqwerty_jp/README.md | 49 +++++ keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c | 76 ++++++++ keyboards/hhkb/jp/keymaps/halfqwerty_jp/rules.mk | 1 + keyboards/hhkb/jp/keymaps/rdg_jp/keymap.c | 55 ++++++ keyboards/hhkb/jp/keymaps/rdg_jp/rules.mk | 1 + keyboards/hhkb/jp/keymaps/sh_jp/README.md | 86 +++++++++ keyboards/hhkb/jp/keymaps/sh_jp/keymap.c | 50 +++++ keyboards/hhkb/jp/keymaps/sh_jp/rules.mk | 1 + keyboards/hhkb/jp/keymaps/via/config.h | 2 + keyboards/hhkb/jp/keymaps/via/keymap.c | 58 ++++++ keyboards/hhkb/jp/keymaps/via/rules.mk | 1 + keyboards/hhkb/jp/matrix.c | 212 ++++++++++++++++++++ keyboards/hhkb/jp/readme.md | 14 ++ keyboards/hhkb/jp/rules.mk | 69 +++++++ keyboards/hhkb/keymaps/bakingpy/keymap.c | 16 -- keyboards/hhkb/keymaps/bakingpy/rules.mk | 1 - keyboards/hhkb/keymaps/blakedietz/README.md | 134 ------------- keyboards/hhkb/keymaps/blakedietz/config.h | 24 --- keyboards/hhkb/keymaps/blakedietz/keymap.c | 125 ------------ keyboards/hhkb/keymaps/blakedietz/rules.mk | 3 - keyboards/hhkb/keymaps/brett/config.h | 17 -- keyboards/hhkb/keymaps/brett/keymap.c | 119 ------------ keyboards/hhkb/keymaps/brett/readme.md | 13 -- keyboards/hhkb/keymaps/brett/rules.mk | 4 - keyboards/hhkb/keymaps/cinaeco/README.md | 23 --- keyboards/hhkb/keymaps/cinaeco/config.h | 20 -- keyboards/hhkb/keymaps/cinaeco/keymap.c | 178 ----------------- keyboards/hhkb/keymaps/cinaeco/rules.mk | 20 -- keyboards/hhkb/keymaps/dbroqua/keymap.c | 89 --------- keyboards/hhkb/keymaps/dbroqua/readme.md | 26 --- keyboards/hhkb/keymaps/default/keymap.c | 56 ------ keyboards/hhkb/keymaps/dhertz/config.h | 1 - keyboards/hhkb/keymaps/dhertz/keymap.c | 84 -------- keyboards/hhkb/keymaps/dhertz/keymap.h | 7 - keyboards/hhkb/keymaps/dhertz/rules.mk | 2 - keyboards/hhkb/keymaps/enoch_jp/keymap.c | 71 ------- keyboards/hhkb/keymaps/enoch_jp/rules.mk | 3 - keyboards/hhkb/keymaps/eric/keymap.c | 73 ------- keyboards/hhkb/keymaps/halfqwerty_jp/README.md | 49 ----- keyboards/hhkb/keymaps/halfqwerty_jp/keymap.c | 76 -------- keyboards/hhkb/keymaps/halfqwerty_jp/rules.mk | 1 - keyboards/hhkb/keymaps/jp/keymap.c | 49 ----- keyboards/hhkb/keymaps/jp/rules.mk | 1 - keyboards/hhkb/keymaps/jp_mac/keymap.c | 49 ----- keyboards/hhkb/keymaps/jp_mac/rules.mk | 1 - keyboards/hhkb/keymaps/krusli/config.h | 1 - keyboards/hhkb/keymaps/krusli/keymap.c | 75 ------- keyboards/hhkb/keymaps/lxol/keymap.c | 204 ------------------- keyboards/hhkb/keymaps/mjt/config.h | 72 ------- keyboards/hhkb/keymaps/mjt/keymap.c | 113 ----------- keyboards/hhkb/keymaps/mjt/readme.md | 16 -- keyboards/hhkb/keymaps/rdg_jp/keymap.c | 55 ------ keyboards/hhkb/keymaps/rdg_jp/rules.mk | 1 - keyboards/hhkb/keymaps/schaeferdev/README.md | 36 ---- keyboards/hhkb/keymaps/schaeferdev/config.h | 9 - keyboards/hhkb/keymaps/schaeferdev/keymap.c | 76 -------- keyboards/hhkb/keymaps/schaeferdev/rules.mk | 1 - keyboards/hhkb/keymaps/sh_jp/README.md | 86 --------- keyboards/hhkb/keymaps/sh_jp/keymap.c | 50 ----- keyboards/hhkb/keymaps/sh_jp/rules.mk | 1 - keyboards/hhkb/keymaps/shela/action_pseudo_lut.c | 143 -------------- keyboards/hhkb/keymaps/shela/action_pseudo_lut.h | 15 -- keyboards/hhkb/keymaps/shela/config.h | 12 -- keyboards/hhkb/keymaps/shela/keymap.c | 193 ------------------ keyboards/hhkb/keymaps/shela/keymap_jis2us.h | 32 --- keyboards/hhkb/keymaps/shela/readme.md | 14 -- keyboards/hhkb/keymaps/shela/rules.mk | 1 - keyboards/hhkb/keymaps/smt/keymap.c | 172 ----------------- keyboards/hhkb/keymaps/tobiasvl_iso/keymap.c | 20 -- keyboards/hhkb/keymaps/tobiasvl_iso/readme.md | 22 --- keyboards/hhkb/keymaps/tominabox1/.gitignore | 3 - keyboards/hhkb/keymaps/tominabox1/keymap.c | 12 -- keyboards/hhkb/keymaps/xyverz/keymap.c | 137 ------------- keyboards/hhkb/matrix.c | 215 --------------------- keyboards/hhkb/readme.md | 14 -- keyboards/hhkb/rules.mk | 71 ------- 148 files changed, 4354 insertions(+), 3685 deletions(-) create mode 100644 keyboards/hhkb/ansi/ansi.c create mode 100644 keyboards/hhkb/ansi/ansi.h create mode 100644 keyboards/hhkb/ansi/config.h create mode 100644 keyboards/hhkb/ansi/hhkb_avr.h create mode 100644 keyboards/hhkb/ansi/info.json create mode 100644 keyboards/hhkb/ansi/keymaps/blakedietz/README.md create mode 100644 keyboards/hhkb/ansi/keymaps/blakedietz/config.h create mode 100644 keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/blakedietz/rules.mk create mode 100644 keyboards/hhkb/ansi/keymaps/brett/config.h create mode 100644 keyboards/hhkb/ansi/keymaps/brett/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/brett/readme.md create mode 100644 keyboards/hhkb/ansi/keymaps/brett/rules.mk create mode 100644 keyboards/hhkb/ansi/keymaps/cinaeco/README.md create mode 100644 keyboards/hhkb/ansi/keymaps/cinaeco/config.h create mode 100644 keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/cinaeco/rules.mk create mode 100644 keyboards/hhkb/ansi/keymaps/dbroqua/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/dbroqua/readme.md create mode 100644 keyboards/hhkb/ansi/keymaps/default/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/eric/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/krusli/config.h create mode 100644 keyboards/hhkb/ansi/keymaps/krusli/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/lxol/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/mjt/config.h create mode 100644 keyboards/hhkb/ansi/keymaps/mjt/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/mjt/readme.md create mode 100644 keyboards/hhkb/ansi/keymaps/mjt/rules.mk create mode 100644 keyboards/hhkb/ansi/keymaps/schaeferdev/README.md create mode 100644 keyboards/hhkb/ansi/keymaps/schaeferdev/config.h create mode 100644 keyboards/hhkb/ansi/keymaps/schaeferdev/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/schaeferdev/rules.mk create mode 100644 keyboards/hhkb/ansi/keymaps/shela/action_pseudo_lut.c create mode 100644 keyboards/hhkb/ansi/keymaps/shela/action_pseudo_lut.h create mode 100644 keyboards/hhkb/ansi/keymaps/shela/config.h create mode 100644 keyboards/hhkb/ansi/keymaps/shela/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/shela/keymap_jis2us.h create mode 100644 keyboards/hhkb/ansi/keymaps/shela/readme.md create mode 100644 keyboards/hhkb/ansi/keymaps/shela/rules.mk create mode 100644 keyboards/hhkb/ansi/keymaps/smt/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/tobiasvl_iso/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/tobiasvl_iso/readme.md create mode 100644 keyboards/hhkb/ansi/keymaps/tominabox1/.gitignore create mode 100644 keyboards/hhkb/ansi/keymaps/tominabox1/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/via/keymap.c create mode 100644 keyboards/hhkb/ansi/keymaps/via/rules.mk create mode 100644 keyboards/hhkb/ansi/keymaps/xyverz/keymap.c create mode 100644 keyboards/hhkb/ansi/matrix.c create mode 100644 keyboards/hhkb/ansi/readme.md create mode 100644 keyboards/hhkb/ansi/rules.mk delete mode 100644 keyboards/hhkb/config.h delete mode 100644 keyboards/hhkb/hhkb.c delete mode 100644 keyboards/hhkb/hhkb.h delete mode 100644 keyboards/hhkb/hhkb_avr.h delete mode 100644 keyboards/hhkb/info.json create mode 100644 keyboards/hhkb/jp/config.h create mode 100644 keyboards/hhkb/jp/hhkb_avr.h create mode 100644 keyboards/hhkb/jp/info.json create mode 100644 keyboards/hhkb/jp/jp.c create mode 100644 keyboards/hhkb/jp/jp.h create mode 100644 keyboards/hhkb/jp/keymaps/bakingpy/keymap.c create mode 100644 keyboards/hhkb/jp/keymaps/bakingpy/rules.mk create mode 100644 keyboards/hhkb/jp/keymaps/default/keymap.c create mode 100644 keyboards/hhkb/jp/keymaps/default/rules.mk create mode 100644 keyboards/hhkb/jp/keymaps/default_mac/keymap.c create mode 100644 keyboards/hhkb/jp/keymaps/default_mac/rules.mk create mode 100644 keyboards/hhkb/jp/keymaps/dhertz/config.h create mode 100644 keyboards/hhkb/jp/keymaps/dhertz/keymap.c create mode 100644 keyboards/hhkb/jp/keymaps/dhertz/keymap.h create mode 100644 keyboards/hhkb/jp/keymaps/dhertz/rules.mk create mode 100644 keyboards/hhkb/jp/keymaps/enoch_jp/keymap.c create mode 100644 keyboards/hhkb/jp/keymaps/enoch_jp/rules.mk create mode 100644 keyboards/hhkb/jp/keymaps/halfqwerty_jp/README.md create mode 100644 keyboards/hhkb/jp/keymaps/halfqwerty_jp/keymap.c create mode 100644 keyboards/hhkb/jp/keymaps/halfqwerty_jp/rules.mk create mode 100644 keyboards/hhkb/jp/keymaps/rdg_jp/keymap.c create mode 100644 keyboards/hhkb/jp/keymaps/rdg_jp/rules.mk create mode 100644 keyboards/hhkb/jp/keymaps/sh_jp/README.md create mode 100644 keyboards/hhkb/jp/keymaps/sh_jp/keymap.c create mode 100644 keyboards/hhkb/jp/keymaps/sh_jp/rules.mk create mode 100644 keyboards/hhkb/jp/keymaps/via/config.h create mode 100644 keyboards/hhkb/jp/keymaps/via/keymap.c create mode 100644 keyboards/hhkb/jp/keymaps/via/rules.mk create mode 100644 keyboards/hhkb/jp/matrix.c create mode 100644 keyboards/hhkb/jp/readme.md create mode 100644 keyboards/hhkb/jp/rules.mk delete mode 100644 keyboards/hhkb/keymaps/bakingpy/keymap.c delete mode 100644 keyboards/hhkb/keymaps/bakingpy/rules.mk delete mode 100644 keyboards/hhkb/keymaps/blakedietz/README.md delete mode 100644 keyboards/hhkb/keymaps/blakedietz/config.h delete mode 100644 keyboards/hhkb/keymaps/blakedietz/keymap.c delete mode 100644 keyboards/hhkb/keymaps/blakedietz/rules.mk delete mode 100644 keyboards/hhkb/keymaps/brett/config.h delete mode 100644 keyboards/hhkb/keymaps/brett/keymap.c delete mode 100644 keyboards/hhkb/keymaps/brett/readme.md delete mode 100644 keyboards/hhkb/keymaps/brett/rules.mk delete mode 100644 keyboards/hhkb/keymaps/cinaeco/README.md delete mode 100644 keyboards/hhkb/keymaps/cinaeco/config.h delete mode 100644 keyboards/hhkb/keymaps/cinaeco/keymap.c delete mode 100644 keyboards/hhkb/keymaps/cinaeco/rules.mk delete mode 100644 keyboards/hhkb/keymaps/dbroqua/keymap.c delete mode 100644 keyboards/hhkb/keymaps/dbroqua/readme.md delete mode 100644 keyboards/hhkb/keymaps/default/keymap.c delete mode 100644 keyboards/hhkb/keymaps/dhertz/config.h delete mode 100644 keyboards/hhkb/keymaps/dhertz/keymap.c delete mode 100644 keyboards/hhkb/keymaps/dhertz/keymap.h delete mode 100644 keyboards/hhkb/keymaps/dhertz/rules.mk delete mode 100644 keyboards/hhkb/keymaps/enoch_jp/keymap.c delete mode 100644 keyboards/hhkb/keymaps/enoch_jp/rules.mk delete mode 100644 keyboards/hhkb/keymaps/eric/keymap.c delete mode 100644 keyboards/hhkb/keymaps/halfqwerty_jp/README.md delete mode 100644 keyboards/hhkb/keymaps/halfqwerty_jp/keymap.c delete mode 100644 keyboards/hhkb/keymaps/halfqwerty_jp/rules.mk delete mode 100644 keyboards/hhkb/keymaps/jp/keymap.c delete mode 100644 keyboards/hhkb/keymaps/jp/rules.mk delete mode 100644 keyboards/hhkb/keymaps/jp_mac/keymap.c delete mode 100644 keyboards/hhkb/keymaps/jp_mac/rules.mk delete mode 100644 keyboards/hhkb/keymaps/krusli/config.h delete mode 100644 keyboards/hhkb/keymaps/krusli/keymap.c delete mode 100644 keyboards/hhkb/keymaps/lxol/keymap.c delete mode 100644 keyboards/hhkb/keymaps/mjt/config.h delete mode 100644 keyboards/hhkb/keymaps/mjt/keymap.c delete mode 100644 keyboards/hhkb/keymaps/mjt/readme.md delete mode 100644 keyboards/hhkb/keymaps/rdg_jp/keymap.c delete mode 100644 keyboards/hhkb/keymaps/rdg_jp/rules.mk delete mode 100644 keyboards/hhkb/keymaps/schaeferdev/README.md delete mode 100644 keyboards/hhkb/keymaps/schaeferdev/config.h delete mode 100644 keyboards/hhkb/keymaps/schaeferdev/keymap.c delete mode 100644 keyboards/hhkb/keymaps/schaeferdev/rules.mk delete mode 100644 keyboards/hhkb/keymaps/sh_jp/README.md delete mode 100644 keyboards/hhkb/keymaps/sh_jp/keymap.c delete mode 100644 keyboards/hhkb/keymaps/sh_jp/rules.mk delete mode 100644 keyboards/hhkb/keymaps/shela/action_pseudo_lut.c delete mode 100644 keyboards/hhkb/keymaps/shela/action_pseudo_lut.h delete mode 100644 keyboards/hhkb/keymaps/shela/config.h delete mode 100644 keyboards/hhkb/keymaps/shela/keymap.c delete mode 100644 keyboards/hhkb/keymaps/shela/keymap_jis2us.h delete mode 100644 keyboards/hhkb/keymaps/shela/readme.md delete mode 100644 keyboards/hhkb/keymaps/shela/rules.mk delete mode 100644 keyboards/hhkb/keymaps/smt/keymap.c delete mode 100644 keyboards/hhkb/keymaps/tobiasvl_iso/keymap.c delete mode 100644 keyboards/hhkb/keymaps/tobiasvl_iso/readme.md delete mode 100644 keyboards/hhkb/keymaps/tominabox1/.gitignore delete mode 100644 keyboards/hhkb/keymaps/tominabox1/keymap.c delete mode 100644 keyboards/hhkb/keymaps/xyverz/keymap.c delete mode 100644 keyboards/hhkb/matrix.c delete mode 100644 keyboards/hhkb/readme.md delete mode 100644 keyboards/hhkb/rules.mk (limited to 'keyboards/hhkb') diff --git a/keyboards/hhkb/ansi/ansi.c b/keyboards/hhkb/ansi/ansi.c new file mode 100644 index 0000000000..cefc4e0690 --- /dev/null +++ b/keyboards/hhkb/ansi/ansi.c @@ -0,0 +1 @@ +#include "ansi.h" \ No newline at end of file diff --git a/keyboards/hhkb/ansi/ansi.h b/keyboards/hhkb/ansi/ansi.h new file mode 100644 index 0000000000..28e8d2fef8 --- /dev/null +++ b/keyboards/hhkb/ansi/ansi.h @@ -0,0 +1,23 @@ +#pragma once + +#include "quantum.h" + +#define LAYOUT( \ + K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \ + K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \ + K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \ + K34, K05, K06, K07, K16, K17, K26, K46, K66, K76, K75, K55, K54, \ + K35, K36, K37, K57, K56) \ + \ +{ \ + { K00, K01, K02, K03, K04, K05, K06, K07 }, \ + { K10, K11, K12, K13, K14, K15, K16, K17 }, \ + { K20, K21, K22, K23, K24, K25, K26, KC_NO }, \ + { K30, K31, K32, K33, K34, K35, K36, K37 }, \ + { K40, K41, K42, K43, K44, K45, K46, KC_NO }, \ + { K50, K51, K52, K53, K54, K55, K56, K57 }, \ + { K60, K61, K62, K63, K64, K65, K66, KC_NO }, \ + { K70, K71, K72, K73, K74, K75, K76, KC_NO } \ +} + +#define LAYOUT_60_hhkb LAYOUT diff --git a/keyboards/hhkb/ansi/config.h b/keyboards/hhkb/ansi/config.h new file mode 100644 index 0000000000..689fd55681 --- /dev/null +++ b/keyboards/hhkb/ansi/config.h @@ -0,0 +1,104 @@ +/* +Copyright 2012 Jun Wako + +This program is free software: you can redistribute it and/or modify +it under the terms of the GNU General Public License as published by +the Free Software Foundation, either version 2 of the License, or +(at your option) any later version. + +This program is distributed in the hope that it will be useful, +but WITHOUT ANY WARRANTY; without even the implied warranty of +MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +GNU General Public License for more details. + +You should have received a copy of the GNU General Public License +along with this program. If not, see . +*/ + +#pragma once + +#include "config_common.h" + +/* USB Device descriptor parameter */ +#define VENDOR_ID 0x4848 // HH = happy hacking +#define PRODUCT_ID 0x0001 // ANSI HHKB +#define DEVICE_VER 0x0104 +#define MANUFACTURER q.m.k +#define PRODUCT HHKB mod +#define DESCRIPTION q.m.k keyboard firmware for HHKB + +/* key matrix size */ +#define MATRIX_ROWS 8 +#define MATRIX_COLS 8 + +#define TAPPING_TERM 200 + +/* number of backlight levels */ +#define BACKLIGHT_LEVELS 3 + +/* Set 0 if debouncing isn't needed */ +#define DEBOUNCE 5 + +/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */ +//#define LOCKING_SUPPORT_ENABLE +/* Locking resynchronize hack */ +//#define LOCKING_RESYNC_ENABLE + +#ifdef HHKB_RN42_ENABLE +// rn42 support -- acquired from the tmk repo. This is almost certainly not +// integrated with qmk in the correct way. + +#define SUART_OUT_PORT PORTD +#define SUART_OUT_BIT 0 +#define SUART_IN_PIN PIND +#define SUART_IN_BIT 1 + +#ifdef __AVR_ATmega32U4__ + /* iom32u4.h has no definition of UCSR1D. copy from iom32u2.h */ + #define UCSR1D _SFR_MEM8(0xCB) + #define RTSEN 0 + #define CTSEN 1 + + #define SERIAL_UART_BAUD 115200 + #define SERIAL_UART_DATA UDR1 + #define SERIAL_UART_UBRR ((F_CPU/(16.0*SERIAL_UART_BAUD)-1+0.5)) + #define SERIAL_UART_RXD_VECT USART1_RX_vect + #define SERIAL_UART_TXD_READY (UCSR1A&(1<>8); /* baud rate */ \ + UCSR1B |= (1< +#include +#include +#include +#include + + +// Timer resolution check +#if (1000000/TIMER_RAW_FREQ > 20) +# error "Timer resolution(>20us) is not enough for HHKB matrix scan tweak on V-USB." +#endif + + +/* + * HHKB Matrix I/O + * + * row: HC4051[A,B,C] selects scan row0-7 + * row-ext: [En0,En1] row extention for JP + * col: LS145[A,B,C,D] selects scan col0-7 and enable(D) + * key: on: 0/off: 1 + * prev: hysteresis control: assert(1) when previous key state is on + */ + + +#if defined(__AVR_ATmega32U4__) +/* + * For TMK HHKB alt controller(ATMega32U4) + * + * row: PB0-2 + * col: PB3-5,6 + * key: PD7(pull-uped) + * prev: PB7 + * power: PD4(L:off/H:on) + * row-ext: PC6,7 for HHKB JP(active low) + */ +static inline void KEY_ENABLE(void) { (PORTB &= ~(1<<6)); } +static inline void KEY_UNABLE(void) { (PORTB |= (1<<6)); } +static inline bool KEY_STATE(void) { return (PIND & (1<<7)); } +static inline void KEY_PREV_ON(void) { (PORTB |= (1<<7)); } +static inline void KEY_PREV_OFF(void) { (PORTB &= ~(1<<7)); } +#ifdef HHKB_POWER_SAVING +static inline void KEY_POWER_ON(void) { + DDRB = 0xFF; PORTB = 0x40; // change pins output + DDRD |= (1<<4); PORTD |= (1<<4); // MOS FET switch on + /* Without this wait you will miss or get false key events. */ + _delay_ms(5); // wait for powering up +} +static inline void KEY_POWER_OFF(void) { + /* input with pull-up consumes less than without it when pin is open. */ + DDRB = 0x00; PORTB = 0xFF; // change pins input with pull-up + DDRD |= (1<<4); PORTD &= ~(1<<4); // MOS FET switch off +} +static inline bool KEY_POWER_STATE(void) { return PORTD & (1<<4); } +#else +static inline void KEY_POWER_ON(void) {} +static inline void KEY_POWER_OFF(void) {} +static inline bool KEY_POWER_STATE(void) { return true; } +#endif +static inline void KEY_INIT(void) +{ + /* row,col,prev: output */ + DDRB = 0xFF; + PORTB = 0x40; // unable + /* key: input with pull-up */ + DDRD &= ~0x80; + PORTD |= 0x80; + + KEY_UNABLE(); + KEY_PREV_OFF(); + + KEY_POWER_OFF(); +} +static inline void KEY_SELECT(uint8_t ROW, uint8_t COL) +{ + PORTB = (PORTB & 0xC0) | (((COL) & 0x07)<<3) | ((ROW) & 0x07); + +} + + +#elif defined(__AVR_AT90USB1286__) +/* + * For Teensy++(AT90USB1286) + * + * HHKB pro HHKB pro2 + * row: PB0-2 (6-8) (5-7) + * col: PB3-5,6 (9-12) (8-11) + * key: PE6(pull-uped) (4) (3) + * prev: PE7 (5) (4) + * + * TODO: convert into 'staitc inline' function + */ +#define KEY_INIT() do { \ + DDRB |= 0x7F; \ + DDRE |= (1<<7); \ + DDRE &= ~(1<<6); \ + PORTE |= (1<<6); \ +} while (0) +#define KEY_SELECT(ROW, COL) (PORTB = (PORTB & 0xC0) | \ + (((COL) & 0x07)<<3) | \ + ((ROW) & 0x07)) +#define KEY_ENABLE() (PORTB &= ~(1<<6)) +#define KEY_UNABLE() (PORTB |= (1<<6)) +#define KEY_STATE() (PINE & (1<<6)) +#define KEY_PREV_ON() (PORTE |= (1<<7)) +#define KEY_PREV_OFF() (PORTE &= ~(1<<7)) +#define KEY_POWER_ON() +#define KEY_POWER_OFF() +#define KEY_POWER_STATE() true + + +#else +# error "define code for matrix scan" +#endif + + +#if 0 +// For ATMega328P with V-USB +// +// #elif defined(__AVR_ATmega328P__) +// Ports for V-USB +// key: PB0(pull-uped) +// prev: PB1 +// row: PB2-4 +// col: PC0-2,3 +// power: PB5(Low:on/Hi-z:off) +#define KEY_INIT() do { \ + DDRB |= 0x3E; \ + DDRB &= ~(1<<0); \ + PORTB |= 1<<0; \ + DDRC |= 0x0F; \ + KEY_UNABLE(); \ + KEY_PREV_OFF(); \ +} while (0) +#define KEY_SELECT(ROW, COL) do { \ + PORTB = (PORTB & 0xE3) | ((ROW) & 0x07)<<2; \ + PORTC = (PORTC & 0xF8) | ((COL) & 0x07); \ +} while (0) +#define KEY_ENABLE() (PORTC &= ~(1<<3)) +#define KEY_UNABLE() (PORTC |= (1<<3)) +#define KEY_STATE() (PINB & (1<<0)) +#define KEY_PREV_ON() (PORTB |= (1<<1)) +#define KEY_PREV_OFF() (PORTB &= ~(1<<1)) +// Power supply switching +#define KEY_POWER_ON() do { \ + KEY_INIT(); \ + PORTB &= ~(1<<5); \ + _delay_ms(1); \ +} while (0) +#define KEY_POWER_OFF() do { \ + DDRB &= ~0x3F; \ + PORTB &= ~0x3F; \ + DDRC &= ~0x0F; \ + PORTC &= ~0x0F; \ +} while (0) +#endif diff --git a/keyboards/hhkb/ansi/info.json b/keyboards/hhkb/ansi/info.json new file mode 100644 index 0000000000..a36f1d44c8 --- /dev/null +++ b/keyboards/hhkb/ansi/info.json @@ -0,0 +1,73 @@ +{ + "keyboard_name": "HHKB", + "url": "", + "maintainer": "qmk", + "width": 15, + "height": 5, + "layouts": { + "LAYOUT": { + "layout": [ + { "label": "Esc", "x": 0, "y": 0 }, + { "label": "!", "x": 1, "y": 0 }, + { "label": "@", "x": 2, "y": 0 }, + { "label": "#", "x": 3, "y": 0 }, + { "label": "$", "x": 4, "y": 0 }, + { "label": "%", "x": 5, "y": 0 }, + { "label": "^", "x": 6, "y": 0 }, + { "label": "&", "x": 7, "y": 0 }, + { "label": "*", "x": 8, "y": 0 }, + { "label": "(", "x": 9, "y": 0 }, + { "label": ")", "x": 10, "y": 0 }, + { "label": "_", "x": 11, "y": 0 }, + { "label": "+", "x": 12, "y": 0 }, + { "label": "|", "x": 13, "y": 0 }, + { "label": "~", "x": 14, "y": 0 }, + { "label": "Tab", "x": 0, "y": 1, "w": 1.5 }, + { "label": "Q", "x": 1.5, "y": 1 }, + { "label": "W", "x": 2.5, "y": 1 }, + { "label": "E", "x": 3.5, "y": 1 }, + { "label": "R", "x": 4.5, "y": 1 }, + { "label": "T", "x": 5.5, "y": 1 }, + { "label": "Y", "x": 6.5, "y": 1 }, + { "label": "U", "x": 7.5, "y": 1 }, + { "label": "I", "x": 8.5, "y": 1 }, + { "label": "O", "x": 9.5, "y": 1 }, + { "label": "P", "x": 10.5, "y": 1 }, + { "label": "{", "x": 11.5, "y": 1 }, + { "label": "}", "x": 12.5, "y": 1 }, + { "label": "Delete", "x": 13.5, "y": 1, "w": 1.5 }, + { "label": "Control", "x": 0, "y": 2, "w": 1.75 }, + { "label": "A", "x": 1.75, "y": 2 }, + { "label": "S", "x": 2.75, "y": 2 }, + { "label": "D", "x": 3.75, "y": 2 }, + { "label": "F", "x": 4.75, "y": 2 }, + { "label": "G", "x": 5.75, "y": 2 }, + { "label": "H", "x": 6.75, "y": 2 }, + { "label": "J", "x": 7.75, "y": 2 }, + { "label": "K", "x": 8.75, "y": 2 }, + { "label": "L", "x": 9.75, "y": 2 }, + { "label": ":", "x": 10.75, "y": 2 }, + { "label": "\"", "x": 11.75, "y": 2 }, + { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 }, + { "label": "Shift", "x": 0, "y": 3, "w": 2.25 }, + { "label": "Z", "x": 2.25, "y": 3 }, + { "label": "X", "x": 3.25, "y": 3 }, + { "label": "C", "x": 4.25, "y": 3 }, + { "label": "V", "x": 5.25, "y": 3 }, + { "label": "B", "x": 6.25, "y": 3 }, + { "label": "N", "x": 7.25, "y": 3 }, + { "label": "M", "x": 8.25, "y": 3 }, + { "label": "<", "x": 9.25, "y": 3 }, + { "label": ">", "x": 10.25, "y": 3 }, + { "label": "?", "x": 11.25, "y": 3 }, + { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 }, + { "label": "Fn", "x": 14, "y": 3 }, + { "label": "", "x": 1.5, "y": 4 }, + { "label": "", "x": 2.5, "y": 4, "w": 1.5 }, + { "x": 4, "y": 4, "w": 6 }, + { "label": "", "x": 10, "y": 4, "w": 1.5 }, + { "label": "", "x": 11.5, "y": 4 } + ] + } + } +} diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/README.md b/keyboards/hhkb/ansi/keymaps/blakedietz/README.md new file mode 100644 index 0000000000..4dff47a6e8 --- /dev/null +++ b/keyboards/hhkb/ansi/keymaps/blakedietz/README.md @@ -0,0 +1,134 @@ +# QMK HHKB Keymap: blakedietz + + + + +This is my (Blake Dietz's) own take on a QMK keymap for the Happy Hacking Keyboard Pro 2 alternate controller made by Hasu. A lot of the + functionality was inspired by the ergodox ez default layout. + +## Dependencies + +### macOS + +```bash +brew tap osx-cross/avr +brew install avr-libc +brew install dfu-programmer +``` + +### Windows/Linux + +[Build Environment Setup](https://github.com/jackhumbert/qmk_firmware/wiki#build-environment-setup) + +## Flashing + +You will need to make sure that you have something that you can use to press the button on the alternate controller in +order to put it into boot mode. + +From the hhkb directory run the following: + +```bash +make clean +make hhkb:blakedietz:dfu +``` + +Press the button on the alternate controller to put the board into boot mode. + +You'll see an output similar to the following: + +```bash +make hhkb:blakedietz:dfu + +Making hhkb with keymap blakedietz and target dfu + +avr-gcc (GCC) 6.2.0 +Copyright (C) 2016 Free Software Foundation, Inc. +This is free software; see the source for copying conditions. There is NO +warranty; not even for MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + +Size before: + text data bss dec hex filename + 0 22162 0 22162 5692 hhkb_blakedietz.hex + +Compiling: keyboards/hhkb/keymaps/blakedietz/keymap.c [OK] +Compiling: ./tmk_core/common/command.c [OK] +Linking: .build/hhkb_blakedietz.elf [OK] +Creating load file for Flash: .build/hhkb_blakedietz.hex [OK] + +Size after: + text data bss dec hex filename + 0 22162 0 22162 5692 hhkb_blakedietz.hex + +dfu-programmer: no device present. +Error: Bootloader not found. Trying again in 5s. +dfu-programmer: no device present. +Error: Bootloader not found. Trying again in 5s. +Bootloader Version: 0x00 (0) +Erasing flash... Success +Checking memory from 0x0 to 0x6FFF... Empty. +Checking memory from 0x0 to 0x56FF... Empty. +0% 100% Programming 0x5700 bytes... +[>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>] Success +0% 100% Reading 0x7000 bytes... +[>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>>] Success +Validating... Success +0x5700 bytes written into 0x7000 bytes memory (77.68%). +``` + +### Layers + +#### Default + +##### A more "standard" layout + +This layout places tilde in the standard location. Backspace is moved to the two upper-right-most keys and pipe +is put back where it belongs (where backspace is on the default hhkb2 keymapping). + +##### Hyper key + + + +This layout throws out the HHKB's control key in favor of a Hyper key. Ctrl is instead placed on the z and / keys and +can be activated with a long press. I find that this is far more ergonomic as it's less of a reach and it allows you to +alternate to either hand when you need to use `ctrl` as a modifier. + +The hyper key can be held for hyper and tapped for escape. You'll find that this is quite nice for vim. + +Enter is also a hyper key. This allows for symmetry between control and enter. Hold for hyper, tap for enter. + +##### Tap to Hold + +###### CTL, ALT, GUI + +Since the HHKB does not have three super/meta keys, these keys were moved to pinky, ring and middle finger for ctrl, alt/ + option and super respectively. This is closer to home row which I've found causes less strain. + +The Alt and Super keys are instead replaced with layer toggle keys to go to dev and mouse mode respectively. + +###### Space + +Hold space to switch to dev mode. This will put you on a layer to have vim like arrow functionality on h,j,k and l. Use +this in editors that don't have vim keybindings. + +### Dev + +The Dev layer can be activated holding space or hitting the HHKB's Alt key. This will put you in a mode +where all function keys are available and left, right, up and down are mapped to their vim equivalents. The function + keys are mapped in such a way that you can use them for debugging. Typically I map debugging functions in all IDEs to + the following for a seamless debugging experience (e.g. jumping from Intellij to chrome dev tools and back): + + - f1 -> step over + - f2 -> step into + - f3 -> step out + - f4 -> continue + - f5 -> set break point on current line + +### Media + +The media layer can be activated by pressing and holding the semi-colon. I've also placed the play and pause key on the +apostrophe key in the media layer. This allows you to easily roll your pinky from the media toggle (semi-colon) to the +play/pause key in one fluid motion. + +I've also tried to logically map next/previous track along with volume up/down vim behavior. In vim since middle finger +goes up on k and index finger goes down on j, next/prev track is k/j respectively. ,/m changes volume up/down +respectively while toggled to the media layer. diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/config.h b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h new file mode 100644 index 0000000000..e0d2bce0f1 --- /dev/null +++ b/keyboards/hhkb/ansi/keymaps/blakedietz/config.h @@ -0,0 +1,24 @@ +// Based off of this section: +// https://github.com/qmk/qmk_firmware/blob/master/doc/BUILD_GUIDE.md#the-configh-file +#ifndef CONFIG_BLAKEDIETZ_H +#define CONFIG_BLAKEDIETZ_H + +// Bring in original defaults +#include "../../config.h" + +// Define mousekey settings +#define MOUSEKEY_DELAY 0 +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_MAX_SPEED 2 +#define MOUSEKEY_TIME_TO_MAX 5 +#define MOUSEKEY_WHEEL_DELAY 0 + +// Set up tapdance functionality +//#define TAPPING_TOGGLE 1 +// TAPPING_TERM is set in config.h this defaults to 200 + +// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when +// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) +#define IGNORE_MOD_TAP_INTERRUPT + +#endif diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c b/keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c new file mode 100644 index 0000000000..a9146a4a08 --- /dev/null +++ b/keyboards/hhkb/ansi/keymaps/blakedietz/keymap.c @@ -0,0 +1,125 @@ +#include QMK_KEYBOARD_H + +// Layer names +#define BASE 0 +#define DEV 1 +#define MOUSE 2 +#define MEDIA 3 + +// Required for leader function. Measured in ms +// #define LEADER_TIMEOUT 300 + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* BASE Level: Default Layer + |-----------+-------+--------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----| + | ` | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | Bksp |Lead| + |-----------+-------+--------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----| + | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | | \ | + |-----------+-------+--------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----| + | Esc/Hyper | A | S | D | F | G | H | J | K | L |;/Media| ' | Enter | | | + |-----------+-------+--------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----| + | Shift | Z/Ctl | X/Alt | C/Gui | V | B | N | M | ,/Gui | ./Alt | //Ctl | Shift | Dev | | | + |-----------+-------+--------+-------+-------+-------+-------+-------+-------+-------+-------+-------+-------+------+----| + TODO: Maybe add a photoshop layer for when I need to hold spacebar down. Maybe just make it a layer that you + |------+------+-----------------------+------+------| + | Dev |Mouse | ******* Space ******* | Dev |Mouse | + |------+------+-----------------------+------+------| + */ + + [BASE] = LAYOUT( // default layer + KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSPC, KC_LEAD, + KC_TAB, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSLS, + ALL_T(KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, LT(MEDIA, KC_SCLN), KC_QUOT, ALL_T(KC_ENT), + KC_LSFT, CTL_T(KC_Z), ALT_T(KC_X), GUI_T(KC_C), KC_V, KC_B, KC_N, KC_M, GUI_T(KC_COMM), ALT_T(KC_DOT), CTL_T(KC_SLSH), KC_RSFT, TG(DEV), + TG(DEV), TG(MOUSE), LT(DEV, KC_SPC), TG(MOUSE), TG(DEV)), + + /* Layer DEV: DEV mode (DEV Fn) + TODO: Add a cmd/tab function to the developer layer for quick switching between different applications when debugging + |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | | | | | | | | | | | | | | | + |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | | | | | | | | | | | | | | | + |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | F1 | F2 | F3 | F4 | F5 | Left | Down | Up | Right | | | | | | + |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | | | | | | | | | | | | | | | + |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + + |------+------+----------------------+------+------+ + | **** | **** | ******************** | **** | **** | + |------+------+----------------------+------+------+ + */ + + [DEV] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(DEV), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + /* Layer MOUSE: MOUSE mode (MOUSE Fn) + |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | | | | | | | | | | | | | | | + |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | | | | | | | | | | | | | | | + |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | | | | | | | | | | | | | | | + |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | | | | | | | | | | | | | | | + |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + + |------+------+----------------------+------+------+ + | **** | **** | ******************** | **** | **** | + |------+------+----------------------+------+------+ + */ + + [MOUSE] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_MS_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_WH_D, KC_WH_U, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_MS_L, KC_MS_D, KC_MS_R, KC_TRNS, KC_TRNS, KC_BTN1, KC_BTN2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, TG(DEV), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + /* Layer MEDIA: mode (Hold Semi-colon) + |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | | | | | | | | | | | | | | | + |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | | | | | | | | | | | | | | | + |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | | | | | | | Previous | Next | | Play/Pause | | | | | + |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + | | | | | | | | Volume Down | Volume Up | Mute | | | | | | + |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----| + + |------+------+----------------------+------+------+ + | **** | **** | ******************** | **** | **** | + |------+------+----------------------+------+------+ + + */ + + [MEDIA] = LAYOUT( + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_MPRV, KC_MNXT, KC_MUTE, KC_TRNS, KC_MPLY, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_TRNS, KC_TRNS, KC_TRNS, TG(DEV), + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)}; + +const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) +{ + // MACRODOWN only works in this function + switch (id) + { + case 0: + if (record->event.pressed) + { + register_code(KC_RSFT); + } + else + { + unregister_code(KC_RSFT); + } + break; + } + return MACRO_NONE; +}; diff --git a/keyboards/hhkb/ansi/keymaps/blakedietz/rules.mk b/keyboards/hhkb/ansi/keymaps/blakedietz/rules.mk new file mode 100644 index 0000000000..7d97e7a524 --- /dev/null +++ b/keyboards/hhkb/ansi/keymaps/blakedietz/rules.mk @@ -0,0 +1,3 @@ +TAP_DANCE_ENABLE = no +UNICODE_ENABLE = no +LEADER_ENABLE = yes diff --git a/keyboards/hhkb/ansi/keymaps/brett/config.h b/keyboards/hhkb/ansi/keymaps/brett/config.h new file mode 100644 index 0000000000..b9a61e10a7 --- /dev/null +++ b/keyboards/hhkb/ansi/keymaps/brett/config.h @@ -0,0 +1,17 @@ +#pragma once + +// Define mousekey settings +#define MOUSEKEY_DELAY 0 +#define MOUSEKEY_INTERVAL 20 +#define MOUSEKEY_MAX_SPEED 2 +#define MOUSEKEY_TIME_TO_MAX 5 +#define MOUSEKEY_WHEEL_DELAY 0 + +#define LSPO_KEY KC_9 +#define RSPC_KEY KC_0 +#define LSPO_MOD KC_LSHIFT +#define RSPC_MOD KC_RSHIFT + +// This makes it possible to do rolling combos (zx) with keys that convert to other keys on hold (z becomes ctrl when +// you hold it, and when this option isn't enabled, z rapidly followed by x actually sends Ctrl-x. That's bad.) +#define IGNORE_MOD_TAP_INTERRUPT diff --git a/keyboards/hhkb/ansi/keymaps/brett/keymap.c b/keyboards/hhkb/ansi/keymaps/brett/keymap.c new file mode 100644 index 0000000000..1201146b00 --- /dev/null +++ b/keyboards/hhkb/ansi/keymaps/brett/keymap.c @@ -0,0 +1,119 @@ +/* -*- eval: (turn-on-orgtbl); -*- + * Brettm12345 HHKB Layout + */ +#include QMK_KEYBOARD_H +#include "brett.h" + +enum layers { + BASE = 0, + HHKB = 1, + PROG = 2, + MOUSE = 3 +}; + +// Tap for tab hold for MOUSE +#define TAB_MOUSE LT(MOUSE, KC_TAB) + +// Tap for space hold for PROG +#define SPACE_PROG LT(PROG, KC_SPC) + +// Tap for ESC hold for CTRL +#define CTL_ESC CTL_T(KC_ESC) + +// Tab for ; hold for PROG +#define PROG_SCLN LT(PROG, KC_SCLN) + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* BASE Level: Default Layer + |---------+---+---+---+---+---+---+---+---+---+---+--------+--------+-----------+---| + | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` | + |---------+---+---+---+---+---+---+---+---+---+---+--------+--------+-----------+---| + | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Backspace | * | + |---------+---+---+---+---+---+---+---+---+---+---+--------+--------+-----------+---| + | Control | A | S | D | F | G | H | J | K | L | ; | ' | Return | ****** | * | + |---------+---+---+---+---+---+---+---+---+---+---+--------+--------+-----------+---| + | LShift | Z | X | C | V | B | N | M | , | . | / | RShift | HHKB | ****** | * | + |---------+---+---+---+---+---+---+---+---+---+---+--------+--------+-----------+---| + + |------+------+----------------------------+------+------| + | LAlt | LGUI | ******* Space/Prog ******* | RGUI | RAlt | + |------+------+----------------------------+------+------| + */ + + [BASE] = LAYOUT( + KC_GESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + TAB_MOUSE, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, PROG_SCLN, KC_QUOT, KC_ENT, + KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC, MO(HHKB), + KC_LALT, KC_LGUI, SPACE_PROG, KC_RGUI, KC_RALT), + + /* HHKB Level: Function Layer + |---------+------+------+--------+---------+-------+-----------+---------+---------+---------+----------------+--------+------+--------+-----| + | Flash | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del | + |---------+------+------+--------+---------+-------+-----------+---------+---------+---------+----------------+--------+------+--------+-----| + | Caps | Calc | Mail | Media | Browser | My PC | Browser | u | i | o | Print | [ | ] | Backsp | * | + | | | | Player | Refresh | | Favorites | | | | Screen | | | | | + |---------+------+------+--------+---------+-------+-----------+---------+---------+---------+----------------+--------+------+--------+-----| + | Control | Prev | Next | Find | f | g | Browser | Browser | Browser | Browser | ; | ' | Exec | ****** | * | + | | | | | | | Back | Home | Search | Forward | | | | | | + |---------+------+------+--------+---------+-------+-----------+---------+---------+---------+----------------+--------+------+--------+-----| + | LShift | Vol+ | Vol- | Mute | Select | b | n | m | , | Again | Browser Search | RShift | HHKB | ****** | * | + |---------+------+------+--------+---------+-------+-----------+---------+---------+---------+----------------+--------+------+--------+-----| + + |------+------+----------------------+------+------| + | Menu | LGUI | ******* Play ******* | RGUI | Menu | + |------+------+----------------------+------+------| + */ + [HHKB] = LAYOUT( + FLASH, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_INS, KC_DEL, + KC_CAPS, KC_CALC, KC_MAIL, KC_MSEL, KC_WREF, KC_MYCM, KC_WFAV, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_TRNS, KC_TRNS, KC_BSPC, + KC_TRNS, KC_MPRV, KC_MNXT, KC_FIND, KC_TRNS, KC_TRNS, KC_WBAK, KC_WHOM, KC_WSCH, KC_WFWD, KC_TRNS, KC_TRNS, KC_EXEC, + KC_TRNS, KC_VOLU, KC_VOLD, KC_MUTE, KC_SLCT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_AGIN, KC_WSCH, KC_TRNS, KC_TRNS, + KC_MENU, KC_TRNS, KC_MPLY, KC_TRNS, KC_MENU), + + + /* Programming Level: Symbols Layer + |--------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+--------+--------+--------+--------+---| + | Esc | TTY 1 | TTY 2 | TTY 3 | TTY 4 | TTY 5 | TTY 6 | TTY 7 | TTY 8 | TTY 9 | TTY 10 | TTY 11 | TTY 12 | \ | ` | + |--------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+--------+--------+--------+--------+---| + | Tab/Mouse | => | @ | >>= | =<< | ‖ | <> | <｜> | <*> | <@> | ｜> | <$ | $> | Backsp | * | + |--------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+--------+--------+--------+--------+---| + | Toggle Mouse | -> | * | <$> | <#> | && | Left | Down | Up | Right | :: | ` | Return | ****** | * | + |--------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+--------+--------+--------+--------+---| + | LShift | z | x | c | v | b | n | m | <- | -> | <> | Shift | HHKB | ****** | * | + |--------------+-------+-------+-------+-------+-------+-------+-------+-------+-------+--------+--------+--------+--------+---| + + |------+------+----------------------------+------+------| + | LAlt | LGUI | ******* Space/Prog ******* | RGUI | RAlt | + |------+------+----------------------------+------+------| + */ + [PROG] = LAYOUT( + KC_GESC, LCA(KC_F1), LCA(KC_F2), LCA(KC_F3), LCA(KC_F4), LCA(KC_F5), LCA(KC_F6), LCA(KC_F7), LCA(KC_F8), LCA(KC_F9), LCA(KC_F10), LCA(KC_F11), LCA(KC_F12), KC_TRNS, KC_TRNS, + KC_TRNS, FAT_ARROW, KC_AT, BIND, BIND_FLIPPED, OR, CONCAT, ALT, APPLY, FLAP, PIPE, VOID_LEFT, VOID_RIGHT, KC_TRNS, + TG(MOUSE), SKINNY_ARROW, KC_ASTR, MAP, MAP_FLIPPED, AND, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, DOUBLE_COLON, KC_GRV, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, REVERSE_ARROW, SKINNY_ARROW, CONCAT, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), + + + /* Mouse Level: Mouse Layer + |--------------+---------+---------+---------+---------+---------+-------+-------+---------+---------+---------+-----------+-----------------+--------+---| + | Esc | Speed 1 | Speed 2 | Speed 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` | + |--------------+---------+---------+---------+---------+---------+-------+-------+---------+---------+---------+-----------+-----------------+--------+---| + | Mouse(Tab) | Q | Up | Button3 | Button4 | Button5 | Y | U | Button3 | Button4 | Button5 | [ | ] | Backsp | * | + |--------------+---------+---------+---------+---------+---------+-------+-------+---------+---------+---------+-----------+-----------------+--------+---| + | Control(Esc) | Left | Down | Right | Button1 | Button2 | SLeft | SDown | SUp | SRight | Button1 | Button2 | Control(Return) | ****** | * | + |--------------+---------+---------+---------+---------+---------+-------+-------+---------+---------+---------+-----------+-----------------+--------+---| + | LShift(() | Z | X | C | V | B | N | M | Button5 | Button4 | Button3 | RShift()) | HHKB | ****** | * | + |--------------+---------+---------+---------+---------+---------+-------+-------+---------+---------+---------+-----------+-----------------+--------+---| + + |---------+---------+----------------------------+---------+---------| + | LAlt([) | LGUI({) | ******* Space/Prog ******* | RGUI(}) | RAlt(]) | + |---------+---------+----------------------------+---------+---------| + */ + [MOUSE] = LAYOUT( + KC_TRNS, KC_ACL0, KC_ACL1, KC_ACL2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_MS_U, KC_BTN3, KC_BTN4, KC_BTN5, KC_TRNS, KC_TRNS, KC_BTN3, KC_BTN4, KC_BTN5, KC_TRNS, KC_TRNS, KC_TRNS, + TG(MOUSE), KC_MS_L, KC_MS_D, KC_MS_R, KC_BTN1, KC_BTN2, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_BTN1, KC_BTN2, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), +}; diff --git a/keyboards/hhkb/ansi/keymaps/brett/readme.md b/keyboards/hhkb/ansi/keymaps/brett/readme.md new file mode 100644 index 0000000000..fd07b155fb --- /dev/null +++ b/keyboards/hhkb/ansi/keymaps/brett/readme.md @@ -0,0 +1,13 @@ +# Generated Keymap Layout + +This layout was generated by the QMK API. You can find the JSON data used to +generate this keymap in the file layers.json. + +To make use of this file you will need follow the following steps: + +* Download or Clone QMK Firmware: +* Extract QMK Firmware to a location on your hard drive +* Copy this folder into %s +* You are now ready to compile or use your keymap with the source + +More information can be found in the QMK docs: \ No newline at end of file diff --git a/keyboards/hhkb/ansi/keymaps/brett/rules.mk b/keyboards/hhkb/ansi/keymaps/brett/rules.mk new file mode 100644 index 0000000000..88f57515f1 --- /dev/null +++ b/keyboards/hhkb/ansi/keymaps/brett/rules.mk @@ -0,0 +1,4 @@ +MOUSEKEY_ENABLE = yes +TAP_DANCE_ENABLE = no +LEADER_ENABLE = no +UNICODE_ENABLE = no diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/README.md b/keyboards/hhkb/ansi/keymaps/cinaeco/README.md new file mode 100644 index 0000000000..c1c48e6093 --- /dev/null +++ b/keyboards/hhkb/ansi/keymaps/cinaeco/README.md @@ -0,0 +1,23 @@ +# QMK Keyboard Firmware for HHKB + +## Modifications + +### HHKB Fn Layer + +Added some Media keys. + +### Utility Layer (SpaceFN) + +Hold `Space` for: + +- Vi-style direction keys. +- WASD-style mouse keys. +- Dynamic macro playback on `1` and `2`. +- Qwerty/Colemak/Dvorak layout selection on `-`, `=` and `\ ` + +### Dynamic Macros + +Hold `q` and press: + +- `1` or `2` to record macro 1 or 2. +- `s` to stop recording. diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/config.h b/keyboards/hhkb/ansi/keymaps/cinaeco/config.h new file mode 100644 index 0000000000..c7b4c784c0 --- /dev/null +++ b/keyboards/hhkb/ansi/keymaps/cinaeco/config.h @@ -0,0 +1,20 @@ +#ifndef CONFIG_CINAECO_H +#define CONFIG_CINAECO_H + +#include "../../config.h" + +#undef MANUFACTURER +#undef PRODUCT +#undef DESCRIPTION +#define MANUFACTURER QMK +#define PRODUCT HHKB QMK cinaeco +#define DESCRIPTION HHKB on QMK Firmware with cinaeco keymap + +// Increase "Tap" detection window. Avoid missing 'q' or 'z' when typing slowly. +#undef TAPPING_TERM +#define TAPPING_TERM 230 + +// Uncomment to enable NKRO by default. May cause issues with KVM switches. +//#define FORCE_NKRO + +#endif diff --git a/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c new file mode 100644 index 0000000000..c27e37d8a0 --- /dev/null +++ b/keyboards/hhkb/ansi/keymaps/cinaeco/keymap.c @@ -0,0 +1,178 @@ +/* -*- eval: (turn-on-orgtbl); -*- + * cinaeco's HHKB Layout + */ +#include QMK_KEYBOARD_H + +// Layers. +#define QWER 0 +#define COLE 1 +#define DVOR 2 +#define HHKB 3 +#define UTIL 4 +#define MREC 5 + +// Easier-to-read Layer Arrays. +#define ____ KC_TRNS + +enum hhkb_keycodes +{ + DYNAMIC_MACRO_RANGE = SAFE_RANGE, +}; + +#include "dynamic_macro.h" + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + + /* QWER Layer: Qwerty Default + * + * ,--------------------------------------------------------------. + * |Esc| 1 | 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| \| `| + * |--------------------------------------------------------------| + * |Tab |Q/MREC| W| E| R| T| Y| U| I| O| P| [| ]|Backs| + * |--------------------------------------------------------------| + * |Ctrl | A| S| D| F| G| H| J| K| L| ;| '|Ent/Ctrl| + * |--------------------------------------------------------------| + * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Fn0| + * `--------------------------------------------------------------' + * |Alt|Gui | Space/UTIL |Gui |Alt| + * `-------------------------------------------' + * + */ + + [QWER] = LAYOUT( + KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS, KC_EQL, KC_BSLS, KC_GRV, + KC_TAB, LT(MREC, KC_Q), KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_LBRC, KC_RBRC, KC_BSPC, + KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, CTL_T(KC_ENT), + KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(HHKB), + KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT), + + /* COLE Layer: Colemak + * + * ,--------------------------------------------------------------. + * |Esc| 1 |