aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric <22215921+ericywl@users.noreply.github.com>2018-04-30 23:19:12 +0800
committerDrashna Jaelre <drashna@live.com>2018-04-30 08:19:12 -0700
commitc76ab936c859d7da1e87d6f6ad4bbec2740fe57f (patch)
tree331dc22d58608102d9c775422b4e0cb0e996c688
parent3aeaf4e3ea6c590ea2c75946d2d0b04f1dfa59a9 (diff)
downloadqmk_firmware-c76ab936c859d7da1e87d6f6ad4bbec2740fe57f.tar.gz
qmk_firmware-c76ab936c859d7da1e87d6f6ad4bbec2740fe57f.zip
Changed KEYMAP to LAYOUT for HHKB (#2857)
Diffstat
-rw-r--r--keyboards/hhkb/hhkb.h4
-rw-r--r--keyboards/hhkb/info.json155
-rw-r--r--keyboards/hhkb/keymaps/blakedietz/keymap.c69
-rw-r--r--keyboards/hhkb/keymaps/cinaeco/keymap.c104
-rw-r--r--keyboards/hhkb/keymaps/dbroqua/keymap.c126
-rw-r--r--keyboards/hhkb/keymaps/dbroqua/readme.md8
-rw-r--r--keyboards/hhkb/keymaps/default/keymap.c47
-rw-r--r--keyboards/hhkb/keymaps/enoch_jp/keymap.c35
-rw-r--r--keyboards/hhkb/keymaps/eric/keymap.c47
-rw-r--r--keyboards/hhkb/keymaps/jp/keymap.c39
-rw-r--r--keyboards/hhkb/keymaps/jp_mac/keymap.c39
-rw-r--r--keyboards/hhkb/keymaps/krusli/keymap.c47
-rw-r--r--keyboards/hhkb/keymaps/lxol/keymap.c114
-rw-r--r--keyboards/hhkb/keymaps/mjt/keymap.c85
-rw-r--r--keyboards/hhkb/keymaps/rdg_jp/keymap.c64
-rw-r--r--keyboards/hhkb/keymaps/sh_jp/keymap.c94
-rw-r--r--keyboards/hhkb/keymaps/shela/keymap.c90
-rw-r--r--keyboards/hhkb/keymaps/shela/keymap_jis2us.h4
-rw-r--r--keyboards/hhkb/keymaps/smt/keymap.c144
19 files changed, 722 insertions, 593 deletions
diff --git a/keyboards/hhkb/hhkb.h b/keyboards/hhkb/hhkb.h
index e95125efc..30dc039a4 100644
--- a/keyboards/hhkb/hhkb.h
+++ b/keyboards/hhkb/hhkb.h
@@ -3,7 +3,7 @@
3 3
4#include "quantum.h" 4#include "quantum.h"
5 5
6#define KEYMAP( \ 6#define LAYOUT( \
7 K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \ 7 K31, K30, K00, K10, K11, K20, K21, K40, K41, K60, K61, K70, K71, K50, K51, \
8 K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \ 8 K32, K01, K02, K13, K12, K23, K22, K42, K43, K62, K63, K73, K72, K52, \
9 K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \ 9 K33, K04, K03, K14, K15, K24, K25, K45, K44, K65, K64, K74, K53, \
@@ -22,7 +22,7 @@
22} 22}
23 23
24 24
25#define KEYMAP_JP( \ 25#define LAYOUT_JP( \
26 K02, K32, K62, K22, K12, K52, K72, KA2, K92, K82, KB2, KE2, KF2, KD2, KC2, \ 26 K02, K32, K62, K22, K12, K52, K72, KA2, K92, K82, KB2, KE2, KF2, KD2, KC2, \
27 K03, K63, K23, K13, K53, K73, KA3, K93, K83, KB3, KE3, KF3, KD3, \ 27 K03, K63, K23, K13, K53, K73, KA3, K93, K83, KB3, KE3, KF3, KD3, \
28 K06, K66, K26, K16, K56, K76, KA6, K96, K86, KB6, KE6, KF6, KD6, KC6, \ 28 K06, K66, K26, K16, K56, K76, KA6, K96, K86, KB6, KE6, KF6, KD6, KC6, \
diff --git a/keyboards/hhkb/info.json b/keyboards/hhkb/info.json
index bce1bfce1..3beaff83d 100644
--- a/keyboards/hhkb/info.json
+++ b/keyboards/hhkb/info.json
@@ -1,16 +1,147 @@
1{ 1{
2 "keyboard_name": "hhkb", 2 "keyboard_name": "hhkb",
3 "url": "", 3 "url": "",
4 "maintainer": "qmk", 4 "maintainer": "qmk",
5 "width": 15, 5 "width": 15,
6 "height": 5, 6 "height": 5,
7 "layouts": { 7 "layouts": {
8 "KEYMAP": { 8 "LAYOUT": {
9 "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}] 9 "layout": [
10 }, 10 { "label": "Esc", "x": 0, "y": 0 },
11 { "label": "!", "x": 1, "y": 0 },
12 { "label": "@", "x": 2, "y": 0 },
13 { "label": "#", "x": 3, "y": 0 },
14 { "label": "$", "x": 4, "y": 0 },
15 { "label": "%", "x": 5, "y": 0 },
16 { "label": "^", "x": 6, "y": 0 },
17 { "label": "&", "x": 7, "y": 0 },
18 { "label": "*", "x": 8, "y": 0 },
19 { "label": "(", "x": 9, "y": 0 },
20 { "label": ")", "x": 10, "y": 0 },
21 { "label": "_", "x": 11, "y": 0 },
22 { "label": "+", "x": 12, "y": 0 },
23 { "label": "|", "x": 13, "y": 0 },
24 { "label": "~", "x": 14, "y": 0 },
25 { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
26 { "label": "Q", "x": 1.5, "y": 1 },
27 { "label": "W", "x": 2.5, "y": 1 },
28 { "label": "E", "x": 3.5, "y": 1 },
29 { "label": "R", "x": 4.5, "y": 1 },
30 { "label": "T", "x": 5.5, "y": 1 },
31 { "label": "Y", "x": 6.5, "y": 1 },
32 { "label": "U", "x": 7.5, "y": 1 },
33 { "label": "I", "x": 8.5, "y": 1 },
34 { "label": "O", "x": 9.5, "y": 1 },
35 { "label": "P", "x": 10.5, "y": 1 },
36 { "label": "{", "x": 11.5, "y": 1 },
37 { "label": "}", "x": 12.5, "y": 1 },
38 { "label": "Delete", "x": 13.5, "y": 1, "w": 1.5 },
39 { "label": "Control", "x": 0, "y": 2, "w": 1.75 },
40 { "label": "A", "x": 1.75, "y": 2 },
41 { "label": "S", "x": 2.75, "y": 2 },
42 { "label": "D", "x": 3.75, "y": 2 },
43 { "label": "F", "x": 4.75, "y": 2 },
44 { "label": "G", "x": 5.75, "y": 2 },
45 { "label": "H", "x": 6.75, "y": 2 },
46 { "label": "J", "x": 7.75, "y": 2 },
47 { "label": "K", "x": 8.75, "y": 2 },
48 { "label": "L", "x": 9.75, "y": 2 },
49 { "label": ":", "x": 10.75, "y": 2 },
50 { "label": "\"", "x": 11.75, "y": 2 },
51 { "label": "Return", "x": 12.75, "y": 2, "w": 2.25 },
52 { "label": "Shift", "x": 0, "y": 3, "w": 2.25 },
53 { "label": "Z", "x": 2.25, "y": 3 },
54 { "label": "X", "x": 3.25, "y": 3 },
55 { "label": "C", "x": 4.25, "y": 3 },
56 { "label": "V", "x": 5.25, "y": 3 },
57 { "label": "B", "x": 6.25, "y": 3 },
58 { "label": "N", "x": 7.25, "y": 3 },
59 { "label": "M", "x": 8.25, "y": 3 },
60 { "label": "<", "x": 9.25, "y": 3 },
61 { "label": ">", "x": 10.25, "y": 3 },
62 { "label": "?", "x": 11.25, "y": 3 },
63 { "label": "Shift", "x": 12.25, "y": 3, "w": 1.75 },
64 { "label": "Fn", "x": 14, "y": 3 },
65 { "label": "", "x": 1.5, "y": 4 },
66 { "label": "", "x": 2.5, "y": 4, "w": 1.5 },
67 { "x": 4, "y": 4, "w": 6 },
68 { "label": "", "x": 10, "y": 4, "w": 1.5 },
69 { "label": "", "x": 11.5, "y": 4 }
70 ]
71 },
11 72
12 "KEYMAP_JP": { 73 "LAYOUT_JP": {
13 "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":"BS", "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":"Enter", "x":13.75, "y":1, "w":1.25, "h":2}, {"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":"}", "x":12.75, "y":2}, {"label":"Shift", "x":0, "y":3, "w":2}, {"label":"Z", "x":2, "y":3}, {"label":"X", "x":3, "y":3}, {"label":"C", "x":4, "y":3}, {"label":"V", "x":5, "y":3}, {"label":"B", "x":6, "y":3}, {"label":"N", "x":7, "y":3}, {"label":"M", "x":8, "y":3}, {"label":"<", "x":9, "y":3}, {"label":">", "x":10, "y":3}, {"label":"?", "x":11, "y":3}, {"label":"_", "x":12, "y":3}, {"label":"\u2191", "x":13, "y":3}, {"label":"Shift", "x":14, "y":3}, {"label":"Fn", "x":0, "y":4}, {"label":"HH", "x":1.25, "y":4}, {"label":"\u2662", "x":2.25, "y":4}, {"label":"", "x":3.25, "y":4}, {"label":"NN", "x":4.25, "y":4}, {"x":5.25, "y":4, "w":2.5}, {"label":"\u25cc", "x":7.75, "y":4}, {"label":"Kana", "x":8.75, "y":4}, {"label":"", "x":9.75, "y":4}, {"label":"Fn", "x":10.75, "y":4}, {"label":"\u2190", "x":12, "y":4}, {"label":"\u2193", "x":13, "y":4}, {"label":"\u2192", "x":14, "y":4}] 74 "layout": [
14 } 75 { "label": "Esc", "x": 0, "y": 0 },
76 { "label": "!", "x": 1, "y": 0 },
77 { "label": "\"", "x": 2, "y": 0 },
78 { "label": "#", "x": 3, "y": 0 },
79 { "label": "$", "x": 4, "y": 0 },
80 { "label": "%", "x": 5, "y": 0 },
81 { "label": "&", "x": 6, "y": 0 },
82 { "label": "'", "x": 7, "y": 0 },
83 { "label": "(", "x": 8, "y": 0 },
84 { "label": ")", "x": 9, "y": 0 },
85 { "label": "", "x": 10, "y": 0 },
86 { "label": "=", "x": 11, "y": 0 },
87 { "label": "~", "x": 12, "y": 0 },
88 { "label": "|", "x": 13, "y": 0 },
89 { "label": "BS", "x": 14, "y": 0 },
90 { "label": "Tab", "x": 0, "y": 1, "w": 1.5 },
91 { "label": "Q", "x": 1.5, "y": 1 },
92 { "label": "W", "x": 2.5, "y": 1 },
93 { "label": "E", "x": 3.5, "y": 1 },
94 { "label": "R", "x": 4.5, "y": 1 },
95 { "label": "T", "x": 5.5, "y": 1 },
96 { "label": "Y", "x": 6.5, "y": 1 },
97 { "label": "U", "x": 7.5, "y": 1 },
98 { "label": "I", "x": 8.5, "y": 1 },
99 { "label": "O", "x": 9.5, "y": 1 },
100 { "label": "P", "x": 10.5, "y": 1 },
101 { "label": "`", "x": 11.5, "y": 1 },
102 { "label": "{", "x": 12.5, "y": 1 },
103 { "label": "Enter", "x": 13.75, "y": 1, "w": 1.25, "h": 2 },
104 { "label": "Control", "x": 0, "y": 2, "w": 1.75 },
105 { "label": "A", "x": 1.75, "y": 2 },
106 { "label": "S", "x": 2.75, "y": 2 },
107 { "label": "D", "x": 3.75, "y": 2 },
108 { "label": "F", "x": 4.75, "y": 2 },
109 { "label": "G", "x": 5.75, "y": 2 },
110 { "label": "H", "x": 6.75, "y": 2 },
111 { "label": "J", "x": 7.75, "y": 2 },
112 { "label": "K", "x": 8.75, "y": 2 },
113 { "label": "L", "x": 9.75, "y": 2 },
114 { "label": "+", "x": 10.75, "y": 2 },
115 { "label": "*", "x": 11.75, "y": 2 },
116 { "label": "}", "x": 12.75, "y": 2 },
117 { "label": "Shift", "x": 0, "y": 3, "w": 2 },
118 { "label": "Z", "x": 2, "y": 3 },
119 { "label": "X", "x": 3, "y": 3 },
120 { "label": "C", "x": 4, "y": 3 },
121 { "label": "V", "x": 5, "y": 3 },
122 { "label": "B", "x": 6, "y": 3 },
123 { "label": "N", "x": 7, "y": 3 },
124 { "label": "M", "x": 8, "y": 3 },
125 { "label": "<", "x": 9, "y": 3 },
126 { "label": ">", "x": 10, "y": 3 },
127 { "label": "?", "x": 11, "y": 3 },
128 { "label": "_", "x": 12, "y": 3 },
129 { "label": "\u2191", "x": 13, "y": 3 },
130 { "label": "Shift", "x": 14, "y": 3 },
131 { "label": "Fn", "x": 0, "y": 4 },
132 { "label": "HH", "x": 1.25, "y": 4 },
133 { "label": "\u2662", "x": 2.25, "y": 4 },
134 { "label": "", "x": 3.25, "y": 4 },
135 { "label": "NN", "x": 4.25, "y": 4 },
136 { "x": 5.25, "y": 4, "w": 2.5 },
137 { "label": "\u25cc", "x": 7.75, "y": 4 },
138 { "label": "Kana", "x": 8.75, "y": 4 },
139 { "label": "", "x": 9.75, "y": 4 },
140 { "label": "Fn", "x": 10.75, "y": 4 },
141 { "label": "\u2190", "x": 12, "y": 4 },
142 { "label": "\u2193", "x": 13, "y": 4 },
143 { "label": "\u2192", "x": 14, "y": 4 }
144 ]
15 } 145 }
146 }
16} 147}
diff --git a/keyboards/hhkb/keymaps/blakedietz/keymap.c b/keyboards/hhkb/keymaps/blakedietz/keymap.c
index ef29a5c80..a9146a4a0 100644
--- a/keyboards/hhkb/keymaps/blakedietz/keymap.c
+++ b/keyboards/hhkb/keymaps/blakedietz/keymap.c
@@ -1,4 +1,4 @@
1#include "hhkb.h" 1#include QMK_KEYBOARD_H
2 2
3// Layer names 3// Layer names
4#define BASE 0 4#define BASE 0
@@ -27,12 +27,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
27 |------+------+-----------------------+------+------| 27 |------+------+-----------------------+------+------|
28 */ 28 */
29 29
30 [BASE] = KEYMAP( // default layer 30 [BASE] = LAYOUT( // default layer
31 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, \ 31 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,
32 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, \ 32 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,
33 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), \ 33 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),
34 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), \ 34 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),
35 TG(DEV), TG(MOUSE), LT(DEV, KC_SPC), TG(MOUSE), TG(DEV)), 35 TG(DEV), TG(MOUSE), LT(DEV, KC_SPC), TG(MOUSE), TG(DEV)),
36 36
37 /* Layer DEV: DEV mode (DEV Fn) 37 /* Layer DEV: DEV mode (DEV Fn)
38 TODO: Add a cmd/tab function to the developer layer for quick switching between different applications when debugging 38 TODO: Add a cmd/tab function to the developer layer for quick switching between different applications when debugging
@@ -51,12 +51,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
51 |------+------+----------------------+------+------+ 51 |------+------+----------------------+------+------+
52 */ 52 */
53 53
54 [DEV] = KEYMAP( 54 [DEV] = LAYOUT(
55 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, \ 55 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,
56 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, \ 56 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,
57 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, \ 57 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,
58 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), \ 58 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),
59 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 59 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
60 60
61 /* Layer MOUSE: MOUSE mode (MOUSE Fn) 61 /* Layer MOUSE: MOUSE mode (MOUSE Fn)
62 |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----| 62 |------+-----+-----+-----+----+----+--------+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
@@ -74,12 +74,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
74 |------+------+----------------------+------+------+ 74 |------+------+----------------------+------+------+
75 */ 75 */
76 76
77 [MOUSE] = KEYMAP( 77 [MOUSE] = LAYOUT(
78 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, \ 78 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,
79 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, \ 79 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,
80 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, \ 80 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,
81 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), \ 81 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),
82 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 82 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
83 83
84 /* Layer MEDIA: mode (Hold Semi-colon) 84 /* Layer MEDIA: mode (Hold Semi-colon)
85 |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----| 85 |------+-----+-----+-----+----+----+----+----------------+--------------+-----------+-------------+-----+-------+-------+-----|
@@ -98,25 +98,28 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
98 98
99 */ 99 */
100 100
101 [MEDIA] = KEYMAP( 101 [MEDIA] = LAYOUT(
102 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, \ 102 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,
103 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, \ 103 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,
104 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, \ 104 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,
105 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), \ 105 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),
106 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS) 106 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
107};
108 107
109const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 108const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
110{ 109{
111 // MACRODOWN only works in this function 110 // MACRODOWN only works in this function
112 switch(id) { 111 switch (id)
113 case 0: 112 {
114 if (record->event.pressed) { 113 case 0:
114 if (record->event.pressed)
115 {
115 register_code(KC_RSFT); 116 register_code(KC_RSFT);
116 } else { 117 }
118 else
119 {
117 unregister_code(KC_RSFT); 120 unregister_code(KC_RSFT);
118 } 121 }
119 break; 122 break;
120 } 123 }
121 return MACRO_NONE; 124 return MACRO_NONE;
122}; 125};
diff --git a/keyboards/hhkb/keymaps/cinaeco/keymap.c b/keyboards/hhkb/keymaps/cinaeco/keymap.c
index 0b204600d..f50f90a84 100644
--- a/keyboards/hhkb/keymaps/cinaeco/keymap.c
+++ b/keyboards/hhkb/keymaps/cinaeco/keymap.c
@@ -1,7 +1,7 @@
1/* -*- eval: (turn-on-orgtbl); -*- 1/* -*- eval: (turn-on-orgtbl); -*-
2 * cinaeco's HHKB Layout 2 * cinaeco's HHKB Layout
3 */ 3 */
4#include "hhkb.h" 4#include QMK_KEYBOARD_H
5 5
6// Layers. 6// Layers.
7#define QWER 0 7#define QWER 0
@@ -14,15 +14,15 @@
14// Easier-to-read Layer Arrays. 14// Easier-to-read Layer Arrays.
15#define ____ KC_TRNS 15#define ____ KC_TRNS
16 16
17enum hhkb_keycodes { 17enum hhkb_keycodes
18 DYNAMIC_MACRO_RANGE = SAFE_RANGE, 18{
19 DYNAMIC_MACRO_RANGE = SAFE_RANGE,
19}; 20};
20 21
21#include "dynamic_macro.h" 22#include "dynamic_macro.h"
22 23
23const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 24const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
24 25
25
26 /* QWER Layer: Qwerty Default 26 /* QWER Layer: Qwerty Default
27 * 27 *
28 * ,--------------------------------------------------------------. 28 * ,--------------------------------------------------------------.
@@ -39,13 +39,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39 * 39 *
40 */ 40 */
41 41
42 [QWER] = KEYMAP( 42 [QWER] = LAYOUT(
43 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, \ 43 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,
44 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, \ 44 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,
45 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), \ 45 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),
46 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), \ 46 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),
47 KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT), 47 KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT),
48
49 48
50 /* COLE Layer: Colemak 49 /* COLE Layer: Colemak
51 * 50 *
@@ -63,13 +62,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
63 * 62 *
64 */ 63 */
65 64
66 [COLE] = KEYMAP( 65 [COLE] = LAYOUT(
67 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, \ 66 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,
68 KC_TAB, LT(MREC, KC_Q), KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC, \ 67 KC_TAB, LT(MREC, KC_Q), KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC,
69 KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, CTL_T(KC_ENT), \ 68 KC_LCTL, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, CTL_T(KC_ENT),
70 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_K, KC_B, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(HHKB), \ 69 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_K, KC_B, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(HHKB),
71 KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT), 70 KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT),
72
73 71
74 /* DVOR Layer: Dvorak 72 /* DVOR Layer: Dvorak
75 * 73 *
@@ -87,13 +85,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
87 * 85 *
88 */ 86 */
89 87
90 [DVOR] = KEYMAP( 88 [DVOR] = LAYOUT(
91 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV, \ 89 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSLS, KC_GRV,
92 KC_TAB, LT(MREC, KC_QUOT), KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC, \ 90 KC_TAB, LT(MREC, KC_QUOT), KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC,
93 KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, CTL_T(KC_ENT), \ 91 KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, CTL_T(KC_ENT),
94 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, MO(HHKB), \ 92 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, MO(HHKB),
95 KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT), 93 KC_LALT, KC_LGUI, LT(UTIL, KC_SPC), KC_RGUI, KC_RALT),
96
97 94
98 /* HHKB Layer: HHKB mode (HHKB Fn) 95 /* HHKB Layer: HHKB mode (HHKB Fn)
99 * 96 *
@@ -110,13 +107,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
110 * `-------------------------------------------' 107 * `-------------------------------------------'
111 */ 108 */
112 109
113 [HHKB] = KEYMAP( 110 [HHKB] = LAYOUT(
114 KC_PWR, 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, \ 111 KC_PWR, 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,
115 KC_CAPS, KC_MPLY, KC_MPRV, KC_MNXT, ____, ____, ____, ____, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ____, KC_BSPC, \ 112 KC_CAPS, KC_MPLY, KC_MPRV, KC_MNXT, ____, ____, ____, ____, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, ____, KC_BSPC,
116 ____, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, ____, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ 113 ____, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, ____, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
117 ____, ____, ____, ____, ____, ____, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, ____, ____, \ 114 ____, ____, ____, ____, ____, ____, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, ____, ____,
118 ____, ____, ____, KC_MSTP, ____), 115 ____, ____, ____, KC_MSTP, ____),
119
120 116
121 /* UTIL Layer: Extra utilities 117 /* UTIL Layer: Extra utilities
122 * 118 *
@@ -134,13 +130,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
134 * 130 *
135 */ 131 */
136 132
137 [UTIL] = KEYMAP( 133 [UTIL] = LAYOUT(
138 RESET, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, ____, ____, ____, ____, ____, ____, ____, ____, DF(QWER), DF(COLE), DF(DVOR), DEBUG, \ 134 RESET, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, ____, ____, ____, ____, ____, ____, ____, ____, DF(QWER), DF(COLE), DF(DVOR), DEBUG,
139 ____, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, ____, KC_HOME, KC_PGDN, KC_PGUP, KC_END, ____, ____, ____, ____, \ 135 ____, KC_BTN1, KC_MS_U, KC_BTN2, KC_WH_U, ____, KC_HOME, KC_PGDN, KC_PGUP, KC_END, ____, ____, ____, ____,
140 ____, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, ____, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, ____, ____, ____, \ 136 ____, KC_MS_L, KC_MS_D, KC_MS_R, KC_WH_D, ____, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, ____, ____, ____,
141 ____, ____, ____, ____, ____, KC_SPC, ____, ____, ____, ____, ____, ____, ____, \ 137 ____, ____, ____, ____, ____, KC_SPC, ____, ____, ____, ____, ____, ____, ____,
142 ____, ____, ____, ____, ____), 138 ____, ____, ____, ____, ____),
143
144 139
145 /* MREC Layer: Record macros with `q` 140 /* MREC Layer: Record macros with `q`
146 * 141 *
@@ -158,29 +153,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
158 * 153 *
159 */ 154 */
160 155
161 [MREC] = KEYMAP( 156 [MREC] = LAYOUT(
162 ____, DYN_REC_START1, DYN_REC_START2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ 157 ____, DYN_REC_START1, DYN_REC_START2, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
163 ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ 158 ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
164 ____, ____, DYN_REC_STOP, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ 159 ____, ____, DYN_REC_STOP, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
165 ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, \ 160 ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____, ____,
166 ____, ____, ____, ____, ____) 161 ____, ____, ____, ____, ____)
167 162
168}; 163};
169 164
170
171
172const uint16_t PROGMEM fn_actions[] = { 165const uint16_t PROGMEM fn_actions[] = {
173 166
174}; 167};
175 168
176const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { 169const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
177 return MACRO_NONE; 170{
171 return MACRO_NONE;
178}; 172};
179 173
180// For Dynamic Macros. 174// For Dynamic Macros.
181bool process_record_user(uint16_t keycode, keyrecord_t *record) { 175bool process_record_user(uint16_t keycode, keyrecord_t *record)
182 if (!process_record_dynamic_macro(keycode, record)) { 176{
183 return false; 177 if (!process_record_dynamic_macro(keycode, record))
184 } 178 {
185 return true; 179 return false;
180 }
181 return true;
186} 182}
diff --git a/keyboards/hhkb/keymaps/dbroqua/keymap.c b/keyboards/hhkb/keymaps/dbroqua/keymap.c
index 91faea942..666471a03 100644
--- a/keyboards/hhkb/keymaps/dbroqua/keymap.c
+++ b/keyboards/hhkb/keymaps/dbroqua/keymap.c
@@ -1,18 +1,20 @@
1/* 1/*
2 * dbroqua HHKB Layout 2 * dbroqua HHKB Layout
3 */ 3 */
4#include "hhkb.h" 4#include QMK_KEYBOARD_H
5 5
6enum planck_layers { 6enum planck_layers
7 _DEFAULT, 7{
8 _ALTERNATE, 8 _DEFAULT,
9 _FN, 9 _ALTERNATE,
10 _ADJUST 10 _FN,
11 _ADJUST
11}; 12};
12 13
13enum planck_keycodes { 14enum planck_keycodes
14 DEF = SAFE_RANGE, 15{
15 ALT 16 DEF = SAFE_RANGE,
17 ALT
16}; 18};
17 19
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 20const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
@@ -29,13 +31,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
29 * | Alt | Gui | Space | Gui | Alt | 31 * | Alt | Gui | Space | Gui | Alt |
30 * `----------------------------------------------------------------´ 32 * `----------------------------------------------------------------´
31 */ 33 */
32 [_DEFAULT] = KEYMAP( 34 [_DEFAULT] = LAYOUT(
33 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, \ 35 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,
34 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_BSPC, \ 36 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_BSPC,
35 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ 37 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
36 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(_FN), \ 38 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(_FN),
37 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT 39 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT),
38 ),
39 /* Alternamte layer: swap alt/gui 40 /* Alternamte layer: swap alt/gui
40 * ,-----------------------------------------------------------------------------------------. 41 * ,-----------------------------------------------------------------------------------------.
41 * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` | 42 * | Esc | 1 | 2 | 3 | 4 | 5 | 6 | 7 | 8 | 9 | 0 | - | = | \ | ` |
@@ -49,13 +50,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
49 * | Gui | Alt | Space | AltGr | RGui| 50 * | Gui | Alt | Space | AltGr | RGui|
50 * `----------------------------------------------------------------´ 51 * `----------------------------------------------------------------´
51 */ 52 */
52 [_ALTERNATE] = KEYMAP( 53 [_ALTERNATE] = LAYOUT(
53 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, \ 54 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,
54 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_BSPC, \ 55 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_BSPC,
55 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ 56 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
56 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(_FN), \ 57 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(_FN),
57 KC_LGUI, KC_LALT, /* */ KC_SPC, KC_RALT, KC_RGUI 58 KC_LGUI, KC_LALT, /* */ KC_SPC, KC_RALT, KC_RGUI),
58 ),
59 59
60 /* FN Layer 60 /* FN Layer
61 * ,-----------------------------------------------------------------------------------------. 61 * ,-----------------------------------------------------------------------------------------.
@@ -70,13 +70,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
70 * | | | Adjust | Stop | | 70 * | | | Adjust | Stop | |
71 * `----------------------------------------------------------------´ 71 * `----------------------------------------------------------------´
72 */ 72 */
73 [_FN] = KEYMAP( 73 [_FN] = LAYOUT(
74 KC_PWR, 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, \ 74 KC_PWR, 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,
75 KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS, \ 75 KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
76 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, \ 76 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
77 KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, \ 77 KC_TRNS, KC_MPRV, KC_MPLY, KC_MNXT, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
78 KC_TRNS, KC_TRNS, TG(_ADJUST), KC_MSTP, KC_TRNS 78 KC_TRNS, KC_TRNS, TG(_ADJUST), KC_MSTP, KC_TRNS),
79 ),
80 79
81 /* SWITCH LAYOUT 80 /* SWITCH LAYOUT
82 * ,-----------------------------------------------------------------------------------------. 81 * ,-----------------------------------------------------------------------------------------.
@@ -91,14 +90,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
91 * | | | | | | 90 * | | | | | |
92 * `----------------------------------------------------------------´ 91 * `----------------------------------------------------------------´
93 */ 92 */
94 [_ADJUST] = KEYMAP( 93 [_ADJUST] = LAYOUT(
95 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, \ 94 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,
96 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, \ 95 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,
97 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, \ 96 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,
98 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, \ 97 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,
99 DEF, ALT, KC_TRNS, KC_TRNS, KC_TRNS 98 DEF, ALT, KC_TRNS, KC_TRNS, KC_TRNS)};
100 )
101};
102 99
103const uint16_t PROGMEM fn_actions[] = { 100const uint16_t PROGMEM fn_actions[] = {
104 101
@@ -106,35 +103,42 @@ const uint16_t PROGMEM fn_actions[] = {
106 103
107const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 104const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
108{ 105{
109 // MACRODOWN only works in this function 106 // MACRODOWN only works in this function
110 switch(id) { 107 switch (id)
111 case 0: 108 {
112 if (record->event.pressed) { 109 case 0:
110 if (record->event.pressed)
111 {
113 register_code(KC_RSFT); 112 register_code(KC_RSFT);
114 } else { 113 }
114 else
115 {
115 unregister_code(KC_RSFT); 116 unregister_code(KC_RSFT);
116 } 117 }
117 break; 118 break;
118 } 119 }
119 return MACRO_NONE; 120 return MACRO_NONE;
120}; 121};
121 122
122 123bool process_record_user(uint16_t keycode, keyrecord_t *record)
123bool process_record_user(uint16_t keycode, keyrecord_t *record) { 124{
124 switch (keycode) { 125 switch (keycode)
126 {
125 case DEF: 127 case DEF:
126 if (record->event.pressed) { 128 if (record->event.pressed)
127 print("mode just switched to qwerty and this is a huge string\n"); 129 {
128 set_single_persistent_default_layer(_DEFAULT); 130 print("mode just switched to qwerty and this is a huge string\n");
129 } 131 set_single_persistent_default_layer(_DEFAULT);
130 return false; 132 }
131 break; 133 return false;
134 break;
132 case ALT: 135 case ALT:
133 if (record->event.pressed) { 136 if (record->event.pressed)
134 set_single_persistent_default_layer(_ALTERNATE); 137 {
135 } 138 set_single_persistent_default_layer(_ALTERNATE);
136 return false; 139 }
137 break; 140 return false;
138 } 141 break;
139 return true; 142 }
143 return true;
140} 144}
diff --git a/keyboards/hhkb/keymaps/dbroqua/readme.md b/keyboards/hhkb/keymaps/dbroqua/readme.md
index 0afebc84c..05ae9ff42 100644
--- a/keyboards/hhkb/keymaps/dbroqua/readme.md
+++ b/keyboards/hhkb/keymaps/dbroqua/readme.md
@@ -1,9 +1,11 @@
1# Dbroqua Layout 1# Dbroqua Layout
2 2
3* Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/78eaf35e80bb714eea80cb4049dedb01 3* Online keyboard layout editor: http://www.keyboard-layout-editor.com/#/gists/78eaf35e80bb714eea80cb4049dedb01
4 4
5# Programming Instructions: 5# Programming Instructions:
6
6Enter into programming mode and run the following command. 7Enter into programming mode and run the following command.
8
9```
10$ sudo LAYOUT=dbroqua make dfu
7``` 11```
8$ sudo KEYMAP=dbroqua make dfu
9``` \ No newline at end of file
diff --git a/keyboards/hhkb/keymaps/default/keymap.c b/keyboards/hhkb/keymaps/default/keymap.c
index bd5dd8372..3a01fd802 100644
--- a/keyboards/hhkb/keymaps/default/keymap.c
+++ b/keyboards/hhkb/keymaps/default/keymap.c
@@ -1,7 +1,7 @@
1/* -*- eval: (turn-on-orgtbl); -*- 1/* -*- eval: (turn-on-orgtbl); -*-
2 * default HHKB Layout 2 * default HHKB Layout
3 */ 3 */
4#include "hhkb.h" 4#include QMK_KEYBOARD_H
5 5
6#define BASE 0 6#define BASE 0
7#define HHKB 1 7#define HHKB 1
@@ -24,14 +24,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
24 |------+------+-----------------------+------+------| 24 |------+------+-----------------------+------+------|
25 */ 25 */
26 26
27 [BASE] = KEYMAP( // default layer 27 [BASE] = LAYOUT( // default layer
28 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, \ 28 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,
29 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_BSPC, \ 29 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_BSPC,
30 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ 30 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
31 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), \ 31 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),
32 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT), 32 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT),
33
34
35 33
36 /* Layer HHKB: HHKB mode (HHKB Fn) 34 /* Layer HHKB: HHKB mode (HHKB Fn)
37 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----| 35 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
@@ -50,13 +48,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
50 48
51 */ 49 */
52 50
53 [HHKB] = KEYMAP( 51 [HHKB] = LAYOUT(
54 KC_PWR, 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, \ 52 KC_PWR, 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,
55 KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \ 53 KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
56 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ 54 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
57 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, \ 55 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)}; 56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
59
60 57
61const uint16_t PROGMEM fn_actions[] = { 58const uint16_t PROGMEM fn_actions[] = {
62 59
@@ -64,15 +61,19 @@ const uint16_t PROGMEM fn_actions[] = {
64 61
65const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 62const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
66{ 63{
67 // MACRODOWN only works in this function 64 // MACRODOWN only works in this function
68 switch(id) { 65 switch (id)
69 case 0: 66 {
70 if (record->event.pressed) { 67 case 0:
68 if (record->event.pressed)
69 {
71 register_code(KC_RSFT); 70 register_code(KC_RSFT);
72 } else { 71 }
72 else
73 {
73 unregister_code(KC_RSFT); 74 unregister_code(KC_RSFT);
74 } 75 }
75 break; 76 break;
76 } 77 }
77 return MACRO_NONE; 78 return MACRO_NONE;
78}; 79};
diff --git a/keyboards/hhkb/keymaps/enoch_jp/keymap.c b/keyboards/hhkb/keymaps/enoch_jp/keymap.c
index 4068e579c..60bf832a7 100644
--- a/keyboards/hhkb/keymaps/enoch_jp/keymap.c
+++ b/keyboards/hhkb/keymaps/enoch_jp/keymap.c
@@ -1,7 +1,6 @@
1#include "hhkb.h" 1#include QMK_KEYBOARD_H
2#define _______ KC_TRNS 2#define _______ KC_TRNS
3 3
4
5/* Layer 0: HHKB JP 4/* Layer 0: HHKB JP
6* ,-----------------------------------------------------------. 5* ,-----------------------------------------------------------.
7* |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| -| =|Yen|Bsp| 6* |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| -| =|Yen|Bsp|
@@ -31,29 +30,27 @@
31*/ 30*/
32 31
33const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 32const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34 [0] = KEYMAP_JP( 33 [0] = LAYOUT_JP(
35 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_GRAVE, KC_BSPC, 34 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_GRAVE, KC_BSPC,
36 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, 35 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,
37 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT, 36 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_DEL, KC_ENT,
38 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_BSLS, 37 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_BSLS,
39 KC_BSPC, KC_ZKHK, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_BSPC, KC_RSFT, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT 38 KC_BSPC, KC_ZKHK, KC_LGUI, KC_LALT, MO(1), KC_SPC, KC_BSPC, KC_RSFT, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
40 ),
41 39
42 [1] = KEYMAP_JP( 40 [1] = LAYOUT_JP(
43 _______, 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, 41 _______, 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,
44 KC_CAPS, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, 42 KC_CAPS, KC_MEDIA_PREV_TRACK, KC_MEDIA_PLAY_PAUSE, KC_MEDIA_NEXT_TRACK, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
45 _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, _______, KC_PENT, 43 _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PSCR, _______, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LEFT, KC_RGHT, _______, KC_PENT,
46 _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, 44 _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
47 _______, _______, _______, _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______ 45 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)};
48 )
49};
50 46
51const uint16_t PROGMEM fn_actions[] = { 47const uint16_t PROGMEM fn_actions[] = {
52 48
53}; 49};
54 50
55const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) { 51const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
56 return MACRO_NONE; 52{
53 return MACRO_NONE;
57}; 54};
58 55
59/*void matrix_scan_user(void) { 56/*void matrix_scan_user(void) {
diff --git a/keyboards/hhkb/keymaps/eric/keymap.c b/keyboards/hhkb/keymaps/eric/keymap.c
index 496ead346..46dcd95c0 100644
--- a/keyboards/hhkb/keymaps/eric/keymap.c
+++ b/keyboards/hhkb/keymaps/eric/keymap.c
@@ -1,7 +1,7 @@
1/* -*- eval: (turn-on-orgtbl); -*- 1/* -*- eval: (turn-on-orgtbl); -*-
2 * default HHKB Layout 2 * default HHKB Layout
3 */ 3 */
4#include "hhkb.h" 4#include QMK_KEYBOARD_H
5 5
6#define BASE 0 6#define BASE 0
7#define HHKB 1 7#define HHKB 1
@@ -23,14 +23,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
23 |------+------+-----------------------+------+------| 23 |------+------+-----------------------+------+------|
24 */ 24 */
25 25
26 [BASE] = KEYMAP( // default layer 26 [BASE] = LAYOUT( // default layer
27 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, \ 27 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,
28 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_BSPC, \ 28 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_BSPC,
29 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ 29 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
30 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), \ 30 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),
31 KC_LGUI, KC_LALT, /* */ KC_SPC, KC_RALT, KC_RGUI), 31 KC_LGUI, KC_LALT, /* */ KC_SPC, KC_RALT, KC_RGUI),
32
33
34 32
35 /* Layer HHKB: HHKB mode (HHKB Fn) 33 /* Layer HHKB: HHKB mode (HHKB Fn)
36 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----| 34 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
@@ -48,13 +46,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
48 46
49 */ 47 */
50 48
51 [HHKB] = KEYMAP( 49 [HHKB] = LAYOUT(
52 KC_CAPS, 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, \ 50 KC_CAPS, 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,
53 KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_AMPR, KC_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_DEL, KC_BSPC, \ 51 KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_AMPR, KC_TILD, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_DEL, KC_BSPC,
54 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_ASTR, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_LEFT, KC_RGHT, KC_TRNS, \ 52 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_END, KC_ASTR, KC_TRNS, KC_TRNS, KC_PGUP, KC_HOME, KC_LEFT, KC_RGHT, KC_TRNS,
55 KC_TRNS, KC_UNDS, KC_PLUS, KC_LPRN, KC_RPRN, KC_PIPE, KC_TRNS, KC_TRNS, KC_PGDN, KC_END, KC_DOWN, KC_TRNS, KC_TRNS, \ 53 KC_TRNS, KC_UNDS, KC_PLUS, KC_LPRN, KC_RPRN, KC_PIPE, KC_TRNS, KC_TRNS, KC_PGDN, KC_END, KC_DOWN, KC_TRNS, KC_TRNS,
56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)}; 54 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
57
58 55
59const uint16_t PROGMEM fn_actions[] = { 56const uint16_t PROGMEM fn_actions[] = {
60 57
@@ -62,15 +59,19 @@ const uint16_t PROGMEM fn_actions[] = {
62 59
63const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 60const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
64{ 61{
65 // MACRODOWN only works in this function 62 // MACRODOWN only works in this function
66 switch(id) { 63 switch (id)
67 case 0: 64 {
68 if (record->event.pressed) { 65 case 0:
66 if (record->event.pressed)
67 {
69 register_code(KC_RSFT); 68 register_code(KC_RSFT);
70 } else { 69 }
70 else
71 {
71 unregister_code(KC_RSFT); 72 unregister_code(KC_RSFT);
72 } 73 }
73 break; 74 break;
74 } 75 }
75 return MACRO_NONE; 76 return MACRO_NONE;
76}; 77};
diff --git a/keyboards/hhkb/keymaps/jp/keymap.c b/keyboards/hhkb/keymaps/jp/keymap.c
index 8525adce5..24e4a04a5 100644
--- a/keyboards/hhkb/keymaps/jp/keymap.c
+++ b/keyboards/hhkb/keymaps/jp/keymap.c
@@ -1,8 +1,7 @@
1#include "hhkb.h" 1#include QMK_KEYBOARD_H
2 2
3#define _______ KC_TRNS 3#define _______ KC_TRNS
4 4
5
6/* Layer 0: HHKB JP 5/* Layer 0: HHKB JP
7 * ,-----------------------------------------------------------. 6 * ,-----------------------------------------------------------.
8 * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| -| =|Yen|Bsp| 7 * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| -| =|Yen|Bsp|
@@ -32,25 +31,23 @@
32 */ 31 */
33 32
34const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 33const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 [0] = KEYMAP_JP( 34 [0] = LAYOUT_JP(
36 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_JYEN, KC_BSPC, 35 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_JYEN, KC_BSPC,
37 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, 36 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,
38 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, 37 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
39 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT, 38 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
40 MO(1), KC_ZKHK, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_HENK, KC_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT 39 MO(1), KC_ZKHK, KC_LGUI, KC_LALT, KC_MHEN, KC_SPC, KC_HENK, KC_KANA, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
41 ), 40
42 41 [1] = LAYOUT_JP(
43 [1] = KEYMAP_JP( 42 KC_PWR, 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,
44 KC_PWR, 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, 43 KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
45 KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, 44 _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
46 _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT, 45 _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
47 _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, 46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)};
48 _______, _______, _______, _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______ 47
49 ) 48const macro_t *action_get_macro(keyrecord_t *record, uint8_t macro_id, uint8_t opt)
50}; 49{
51 50 return MACRO_NONE;
52const macro_t *action_get_macro(keyrecord_t *record, uint8_t macro_id, uint8_t opt) {
53 return MACRO_NONE;
54} 51}
55 52
56const uint16_t PROGMEM fn_actions[] = { 53const uint16_t PROGMEM fn_actions[] = {
diff --git a/keyboards/hhkb/keymaps/jp_mac/keymap.c b/keyboards/hhkb/keymaps/jp_mac/keymap.c
index e08bf33df..326f22cd1 100644
--- a/keyboards/hhkb/keymaps/jp_mac/keymap.c
+++ b/keyboards/hhkb/keymaps/jp_mac/keymap.c
@@ -1,8 +1,7 @@
1#include "hhkb.h" 1#include QMK_KEYBOARD_H
2 2
3#define _______ KC_TRNS 3#define _______ KC_TRNS
4 4
5
6/* Layer 0: HHKB JP 5/* Layer 0: HHKB JP
7 * ,-----------------------------------------------------------. 6 * ,-----------------------------------------------------------.
8 * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| -| =|Yen|Bsp| 7 * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| -| =|Yen|Bsp|
@@ -32,25 +31,23 @@
32 */ 31 */
33 32
34const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 33const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 [0] = KEYMAP_JP( 34 [0] = LAYOUT_JP(
36 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_JYEN, KC_BSPC, 35 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_JYEN, KC_BSPC,
37 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, 36 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,
38 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, 37 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
39 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT, 38 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
40 MO(1), KC_GRV, KC_LALT, KC_LGUI, KC_MHEN, KC_SPC, KC_HENK, KC_RGUI, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT 39 MO(1), KC_GRV, KC_LALT, KC_LGUI, KC_MHEN, KC_SPC, KC_HENK, KC_RGUI, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT),
41 ), 40
42 41 [1] = LAYOUT_JP(
43 [1] = KEYMAP_JP( 42 KC_PWR, 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,
44 KC_PWR, 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, 43 KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
45 KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, 44 _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
46 _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT, 45 _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
47 _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, 46 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_DEL, _______, _______)};
48 _______, _______, _______, _______, _______, _______ , _______, _______, _______, _______, KC_DEL, _______, _______ 47
49 ) 48const macro_t *action_get_macro(keyrecord_t *record, uint8_t macro_id, uint8_t opt)
50}; 49{
51 50 return MACRO_NONE;
52const macro_t *action_get_macro(keyrecord_t *record, uint8_t macro_id, uint8_t opt) {
53 return MACRO_NONE;
54} 51}
55 52
56const uint16_t PROGMEM fn_actions[] = { 53const uint16_t PROGMEM fn_actions[] = {
diff --git a/keyboards/hhkb/keymaps/krusli/keymap.c b/keyboards/hhkb/keymaps/krusli/keymap.c
index bd5dd8372..3a01fd802 100644
--- a/keyboards/hhkb/keymaps/krusli/keymap.c
+++ b/keyboards/hhkb/keymaps/krusli/keymap.c
@@ -1,7 +1,7 @@
1/* -*- eval: (turn-on-orgtbl); -*- 1/* -*- eval: (turn-on-orgtbl); -*-
2 * default HHKB Layout 2 * default HHKB Layout
3 */ 3 */
4#include "hhkb.h" 4#include QMK_KEYBOARD_H
5 5
6#define BASE 0 6#define BASE 0
7#define HHKB 1 7#define HHKB 1
@@ -24,14 +24,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
24 |------+------+-----------------------+------+------| 24 |------+------+-----------------------+------+------|
25 */ 25 */
26 26
27 [BASE] = KEYMAP( // default layer 27 [BASE] = LAYOUT( // default layer
28 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, \ 28 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,
29 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_BSPC, \ 29 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_BSPC,
30 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ 30 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
31 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), \ 31 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),
32 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT), 32 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT),
33
34
35 33
36 /* Layer HHKB: HHKB mode (HHKB Fn) 34 /* Layer HHKB: HHKB mode (HHKB Fn)
37 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----| 35 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
@@ -50,13 +48,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
50 48
51 */ 49 */
52 50
53 [HHKB] = KEYMAP( 51 [HHKB] = LAYOUT(
54 KC_PWR, 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, \ 52 KC_PWR, 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,
55 KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \ 53 KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
56 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ 54 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
57 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, \ 55 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)}; 56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
59
60 57
61const uint16_t PROGMEM fn_actions[] = { 58const uint16_t PROGMEM fn_actions[] = {
62 59
@@ -64,15 +61,19 @@ const uint16_t PROGMEM fn_actions[] = {
64 61
65const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 62const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
66{ 63{
67 // MACRODOWN only works in this function 64 // MACRODOWN only works in this function
68 switch(id) { 65 switch (id)
69 case 0: 66 {
70 if (record->event.pressed) { 67 case 0:
68 if (record->event.pressed)
69 {
71 register_code(KC_RSFT); 70 register_code(KC_RSFT);
72 } else { 71 }
72 else
73 {
73 unregister_code(KC_RSFT); 74 unregister_code(KC_RSFT);
74 } 75 }
75 break; 76 break;
76 } 77 }
77 return MACRO_NONE; 78 return MACRO_NONE;
78}; 79};
diff --git a/keyboards/hhkb/keymaps/lxol/keymap.c b/keyboards/hhkb/keymaps/lxol/keymap.c
index ccf1e0704..3e3b3d2ed 100644
--- a/keyboards/hhkb/keymaps/lxol/keymap.c
+++ b/keyboards/hhkb/keymaps/lxol/keymap.c
@@ -1,7 +1,7 @@
1/* -*- eval: (turn-on-orgtbl); -*- 1/* -*- eval: (turn-on-orgtbl); -*-
2 * lxol HHKB Layout 2 * lxol HHKB Layout
3 */ 3 */
4#include "hhkb.h" 4#include QMK_KEYBOARD_H
5 5
6#define BASE 0 6#define BASE 0
7#define WIN 1 7#define WIN 1
@@ -11,7 +11,6 @@
11#define RALTLEV 5 11#define RALTLEV 5
12#define LALTLEV 6 12#define LALTLEV 6
13 13
14
15const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 14const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
16 15
17 /* Layer 0: Default Layer 16 /* Layer 0: Default Layer
@@ -30,16 +29,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
30 |------+------+-------+------+------| 29 |------+------+-------+------+------|
31 */ 30 */
32 31
33 [BASE] = KEYMAP( // layer 0 : default 32 [BASE] = LAYOUT( // layer 0 : default
34
35
36 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, \
37 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_BSPC, \
38 KC_LCTL, LT(LALTLEV,KC_A), LT(LGUILEV,KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, LT(RGUILEV,KC_L), LT(RALTLEV,KC_SCLN), KC_QUOT, KC_FN0, \
39 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), \
40 KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT),
41
42 33
34 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,
35 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_BSPC,
36 KC_LCTL, LT(LALTLEV, KC_A), LT(LGUILEV, KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, LT(RGUILEV, KC_L), LT(RALTLEV, KC_SCLN), KC_QUOT, KC_FN0,
37 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),
38 KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT),
43 39
44 /* Layer 1: HHKB mode (HHKB Fn) 40 /* Layer 1: HHKB mode (HHKB Fn)
45 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----| 41 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
@@ -57,13 +53,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
57 |---+---+---+---+---| 53 |---+---+---+---+---|
58 */ 54 */
59 55
60 [HHKB] = KEYMAP( 56 [HHKB] = LAYOUT(
61 KC_PWR, 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, \ 57 KC_PWR, 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,
62 KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \ 58 KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
63 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ 59 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
64 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, \ 60 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
65 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 61 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
66
67 62
68 /* Layer LGUI: All keys with RGUI modifier 63 /* Layer LGUI: All keys with RGUI modifier
69 |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---| 64 |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
@@ -81,13 +76,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
81 |------+------+-------+------+------| 76 |------+------+-------+------+------|
82 */ 77 */
83 78
84 [RGUILEV] = KEYMAP( // Right GUI layer by KC_L 79 [RGUILEV] = LAYOUT( // Right GUI layer by KC_L
85 80
86 RGUI(KC_ESC), RGUI(KC_1), RGUI(KC_2), RGUI(KC_3), RGUI(KC_4), RGUI(KC_5), RGUI(KC_6), RGUI(KC_7), RGUI(KC_8), RGUI(KC_9), RGUI(KC_0), RGUI(KC_MINS), RGUI(KC_EQL), RGUI(KC_BSLS), RGUI(KC_GRV), \ 81 RGUI(KC_ESC), RGUI(KC_1), RGUI(KC_2), RGUI(KC_3), RGUI(KC_4), RGUI(KC_5), RGUI(KC_6), RGUI(KC_7), RGUI(KC_8), RGUI(KC_9), RGUI(KC_0), RGUI(KC_MINS), RGUI(KC_EQL), RGUI(KC_BSLS), RGUI(KC_GRV),
87 RGUI(KC_TAB), RGUI(KC_Q), RGUI(KC_W), RGUI(KC_E), RGUI(KC_R), RGUI(KC_T), RGUI(KC_Y), RGUI(KC_U), RGUI(KC_I), RGUI(KC_O), RGUI(KC_P), RGUI(KC_LBRC), RGUI(KC_RBRC), RGUI(KC_BSPC), \ 82 RGUI(KC_TAB), RGUI(KC_Q), RGUI(KC_W), RGUI(KC_E), RGUI(KC_R), RGUI(KC_T), RGUI(KC_Y), RGUI(KC_U), RGUI(KC_I), RGUI(KC_O), RGUI(KC_P), RGUI(KC_LBRC), RGUI(KC_RBRC), RGUI(KC_BSPC),
88 RGUI(KC_LCTL), RGUI(KC_A), RGUI(KC_S), RGUI(KC_D), RGUI(KC_F), RGUI(KC_G), RGUI(KC_H), RGUI(KC_J), RGUI(KC_K), KC_TRNS, KC_TRNS, RGUI(KC_QUOT), KC_FN0, \ 83 RGUI(KC_LCTL), RGUI(KC_A), RGUI(KC_S), RGUI(KC_D), RGUI(KC_F), RGUI(KC_G), RGUI(KC_H), RGUI(KC_J), RGUI(KC_K), KC_TRNS, KC_TRNS, RGUI(KC_QUOT), KC_FN0,
89 RGUI(KC_LSFT), RGUI(KC_Z), RGUI(KC_X), RGUI(KC_C), RGUI(KC_V), RGUI(KC_B), RGUI(KC_N), RGUI(KC_M), RGUI(KC_COMM), RGUI(KC_DOT), RGUI(KC_SLSH), RGUI(KC_RSFT), KC_TRNS, \ 84 RGUI(KC_LSFT), RGUI(KC_Z), RGUI(KC_X), RGUI(KC_C), RGUI(KC_V), RGUI(KC_B), RGUI(KC_N), RGUI(KC_M), RGUI(KC_COMM), RGUI(KC_DOT), RGUI(KC_SLSH), RGUI(KC_RSFT), KC_TRNS,
90 KC_LALT, KC_LGUI, RGUI(KC_SPC), KC_RGUI, KC_RALT), 85 KC_LALT, KC_LGUI, RGUI(KC_SPC), KC_RGUI, KC_RALT),
91 86
92 /* Layer LGUI: All keys with LGUI modifier 87 /* Layer LGUI: All keys with LGUI modifier
93 |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---| 88 |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
@@ -105,13 +100,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
105 |------+------+-------+------+------| 100 |------+------+-------+------+------|
106 */ 101 */
107 102
108 [LGUILEV] = KEYMAP( // Right GUI layer by KC_L 103 [LGUILEV] = LAYOUT( // Right GUI layer by KC_L
109 104
110 LGUI(KC_ESC), LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), LGUI(KC_0), LGUI(KC_MINS), LGUI(KC_EQL), LGUI(KC_BSLS), LGUI(KC_GRV), \ 105 LGUI(KC_ESC), LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), LGUI(KC_0), LGUI(KC_MINS), LGUI(KC_EQL), LGUI(KC_BSLS), LGUI(KC_GRV),
111 LGUI(KC_TAB), LGUI(KC_Q), LGUI(KC_W), LGUI(KC_E), LGUI(KC_R), LGUI(KC_T), LGUI(KC_Y), LGUI(KC_U), LGUI(KC_I), LGUI(KC_O), LGUI(KC_P), LGUI(KC_LBRC), LGUI(KC_RBRC), LGUI(KC_BSPC), \ 106 LGUI(KC_TAB), LGUI(KC_Q), LGUI(KC_W), LGUI(KC_E), LGUI(KC_R), LGUI(KC_T), LGUI(KC_Y), LGUI(KC_U), LGUI(KC_I), LGUI(KC_O), LGUI(KC_P), LGUI(KC_LBRC), LGUI(KC_RBRC), LGUI(KC_BSPC),
112 LGUI(KC_LCTL), KC_TRNS, KC_TRNS, LGUI(KC_D), LGUI(KC_F), LGUI(KC_G), LGUI(KC_H), LGUI(KC_J), LGUI(KC_K), LGUI(KC_L), LGUI(KC_SCLN), LGUI(KC_QUOT), KC_FN0, \ 107 LGUI(KC_LCTL), KC_TRNS, KC_TRNS, LGUI(KC_D), LGUI(KC_F), LGUI(KC_G), LGUI(KC_H), LGUI(KC_J), LGUI(KC_K), LGUI(KC_L), LGUI(KC_SCLN), LGUI(KC_QUOT), KC_FN0,
113 KC_LSFT, LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), LGUI(KC_B), LGUI(KC_N), LGUI(KC_M), LGUI(KC_COMM), LGUI(KC_DOT), LGUI(KC_SLSH), KC_RSFT, KC_TRNS, \ 108 KC_LSFT, LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), LGUI(KC_B), LGUI(KC_N), LGUI(KC_M), LGUI(KC_COMM), LGUI(KC_DOT), LGUI(KC_SLSH), KC_RSFT, KC_TRNS,
114 KC_LALT, KC_LGUI, LGUI(KC_SPC), KC_LGUI, KC_RALT), 109 KC_LALT, KC_LGUI, LGUI(KC_SPC), KC_LGUI, KC_RALT),
115 110
116 /* Layer LALT: All keys with RALT modifier 111 /* Layer LALT: All keys with RALT modifier
117 |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---| 112 |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
@@ -129,13 +124,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
129 |------+------+-------+------+------| 124 |------+------+-------+------+------|
130 */ 125 */
131 126
132 [RALTLEV] = KEYMAP( // Right ALT layer by KC_L 127 [RALTLEV] = LAYOUT( // Right ALT layer by KC_L
133 128
134 RALT(KC_ESC), RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_5), RALT(KC_6), RALT(KC_7), RALT(KC_8), RALT(KC_9), RALT(KC_0), RALT(KC_MINS), RALT(KC_EQL), RALT(KC_BSLS), RALT(KC_GRV), \ 129 RALT(KC_ESC), RALT(KC_1), RALT(KC_2), RALT(KC_3), RALT(KC_4), RALT(KC_5), RALT(KC_6), RALT(KC_7), RALT(KC_8), RALT(KC_9), RALT(KC_0), RALT(KC_MINS), RALT(KC_EQL), RALT(KC_BSLS), RALT(KC_GRV),
135 RALT(KC_TAB), RALT(KC_Q), RALT(KC_W), RALT(KC_E), RALT(KC_R), RALT(KC_T), RALT(KC_Y), RALT(KC_U), RALT(KC_I), RALT(KC_O), RALT(KC_P), RALT(KC_LBRC), RALT(KC_RBRC), RALT(KC_BSPC), \ 130 RALT(KC_TAB), RALT(KC_Q), RALT(KC_W), RALT(KC_E), RALT(KC_R), RALT(KC_T), RALT(KC_Y), RALT(KC_U), RALT(KC_I), RALT(KC_O), RALT(KC_P), RALT(KC_LBRC), RALT(KC_RBRC), RALT(KC_BSPC),
136 RALT(KC_LCTL), RALT(KC_A), RALT(KC_S), RALT(KC_D), RALT(KC_F), RALT(KC_G), RALT(KC_H), RALT(KC_J), RALT(KC_K), KC_TRNS, KC_TRNS, RALT(KC_QUOT), KC_FN0, \ 131 RALT(KC_LCTL), RALT(KC_A), RALT(KC_S), RALT(KC_D), RALT(KC_F), RALT(KC_G), RALT(KC_H), RALT(KC_J), RALT(KC_K), KC_TRNS, KC_TRNS, RALT(KC_QUOT), KC_FN0,
137 RALT(KC_LSFT), RALT(KC_Z), RALT(KC_X), RALT(KC_C), RALT(KC_V), RALT(KC_B), RALT(KC_N), RALT(KC_M), RALT(KC_COMM), RALT(KC_DOT), RALT(KC_SLSH), RALT(KC_RSFT), KC_TRNS, \ 132 RALT(KC_LSFT), RALT(KC_Z), RALT(KC_X), RALT(KC_C), RALT(KC_V), RALT(KC_B), RALT(KC_N), RALT(KC_M), RALT(KC_COMM), RALT(KC_DOT), RALT(KC_SLSH), RALT(KC_RSFT), KC_TRNS,
138 KC_LALT, KC_LGUI, RALT(KC_SPC), KC_RGUI, KC_RALT), 133 KC_LALT, KC_LGUI, RALT(KC_SPC), KC_RGUI, KC_RALT),
139 134
140 /* Layer LALT: All keys with LALT modifier 135 /* Layer LALT: All keys with LALT modifier
141 |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---| 136 |--------+---+---+---+---+---+---+---+---+---+-----+-------+----------+-------+---|
@@ -153,14 +148,13 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
153 |------+------+-------+------+------| 148 |------+------+-------+------+------|
154 */ 149 */
155 150
156 [LALTLEV] = KEYMAP( // Right ALT layer by KC_L 151 [LALTLEV] = LAYOUT( // Right ALT layer by KC_L
157
158 LALT(KC_ESC), LALT(KC_1), LALT(KC_2), LALT(KC_3), LALT(KC_4), LALT(KC_5), LALT(KC_6), LALT(KC_7), LALT(KC_8), LALT(KC_9), LALT(KC_0), LALT(KC_MINS), LALT(KC_EQL), LALT(KC_BSLS), LALT(KC_GRV), \
159 LALT(KC_TAB), LALT(KC_Q), LALT(KC_W), LALT(KC_E), LALT(KC_R), LALT(KC_T), LALT(KC_Y), LALT(KC_U), LALT(KC_I), LALT(KC_O), LALT(KC_P), LALT(KC_LBRC), LALT(KC_RBRC), LALT(KC_BSPC), \
160 LALT(KC_LCTL), KC_TRNS, KC_TRNS, LALT(KC_D), LALT(KC_F), LALT(KC_G), LALT(KC_H), LALT(KC_J), LALT(KC_K), LALT(KC_L), LALT(KC_SCLN), LALT(KC_QUOT), KC_FN0, \
161 KC_LSFT, LALT(KC_Z), LALT(KC_X), LALT(KC_C), LALT(KC_V), LALT(KC_B), LALT(KC_N), LALT(KC_M), LALT(KC_COMM), LALT(KC_DOT), LALT(KC_SLSH), KC_RSFT, KC_TRNS, \
162 KC_LALT, KC_LGUI, LALT(KC_SPC), KC_LGUI, KC_RALT),
163 152
153 LALT(KC_ESC), LALT(KC_1), LALT(KC_2), LALT(KC_3), LALT(KC_4), LALT(KC_5), LALT(KC_6), LALT(KC_7), LALT(KC_8), LALT(KC_9), LALT(KC_0), LALT(KC_MINS), LALT(KC_EQL), LALT(KC_BSLS), LALT(KC_GRV),
154 LALT(KC_TAB), LALT(KC_Q), LALT(KC_W), LALT(KC_E), LALT(KC_R), LALT(KC_T), LALT(KC_Y), LALT(KC_U), LALT(KC_I), LALT(KC_O), LALT(KC_P), LALT(KC_LBRC), LALT(KC_RBRC), LALT(KC_BSPC),
155 LALT(KC_LCTL), KC_TRNS, KC_TRNS, LALT(KC_D), LALT(KC_F), LALT(KC_G), LALT(KC_H), LALT(KC_J), LALT(KC_K), LALT(KC_L), LALT(KC_SCLN), LALT(KC_QUOT), KC_FN0,
156 KC_LSFT, LALT(KC_Z), LALT(KC_X), LALT(KC_C), LALT(KC_V), LALT(KC_B), LALT(KC_N), LALT(KC_M), LALT(KC_COMM), LALT(KC_DOT), LALT(KC_SLSH), KC_RSFT, KC_TRNS,
157 KC_LALT, KC_LGUI, LALT(KC_SPC), KC_LGUI, KC_RALT),
164 158
165 /* Layer WIN: Win layer 159 /* Layer WIN: Win layer
166 |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---| 160 |--------+---+---+---+---+---+---+---+---+---+---+-------+----------+-------+---|
@@ -178,31 +172,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
178 |------+------+-------+------+------| 172 |------+------+-------+------+------|
179 */ 173 */
180 174
181 [WIN] = KEYMAP( // BASE level with swapped GUI/ALT 175 [WIN] = LAYOUT( // BASE level with swapped GUI/ALT
182
183
184 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, \
185 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_BSPC, \
186 KC_LCTL, LT(LGUILEV,KC_A), LT(LALTLEV,KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, LT(RALTLEV,KC_L), LT(RGUILEV,KC_SCLN), KC_QUOT, KC_FN0, \
187 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), \
188 KC_RGUI, KC_RALT, KC_SPC, KC_RALT, KC_RGUI)};
189 176
177 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,
178 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_BSPC,
179 KC_LCTL, LT(LGUILEV, KC_A), LT(LALTLEV, KC_S), KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, LT(RALTLEV, KC_L), LT(RGUILEV, KC_SCLN), KC_QUOT, KC_FN0,
180 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),
181 KC_RGUI, KC_RALT, KC_SPC, KC_RALT, KC_RGUI)};
190 182
191const uint16_t PROGMEM fn_actions[] = { 183const uint16_t PROGMEM fn_actions[] = {
192 [0] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENT) // RControl with tap Enter* 184 [0] = ACTION_MODS_TAP_KEY(MOD_RCTL, KC_ENT) // RControl with tap Enter*
193}; 185};
194 186
195const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 187const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
196{ 188{
197 // MACRODOWN only works in this function 189 // MACRODOWN only works in this function
198 switch(id) { 190 switch (id)
199 case 0: 191 {
200 if (record->event.pressed) { 192 case 0:
193 if (record->event.pressed)
194 {
201 register_code(KC_RSFT); 195 register_code(KC_RSFT);
202 } else { 196 }
197 else
198 {
203 unregister_code(KC_RSFT); 199 unregister_code(KC_RSFT);
204 } 200 }
205 break; 201 break;
206 } 202 }
207 return MACRO_NONE; 203 return MACRO_NONE;
208}; 204};
diff --git a/keyboards/hhkb/keymaps/mjt/keymap.c b/keyboards/hhkb/keymaps/mjt/keymap.c
index b5cd99714..d1725f5c7 100644
--- a/keyboards/hhkb/keymaps/mjt/keymap.c
+++ b/keyboards/hhkb/keymaps/mjt/keymap.c
@@ -1,7 +1,7 @@
1/* -*- eval: (turn-on-orgtbl); -*- 1/* -*- eval: (turn-on-orgtbl); -*-
2 * default HHKB Layout 2 * default HHKB Layout
3 */ 3 */
4#include "hhkb.h" 4#include QMK_KEYBOARD_H
5 5
6#define BASE 0 6#define BASE 0
7#define HHKB 1 7#define HHKB 1
@@ -10,10 +10,11 @@
10#define CTL_ESC CTL_T(KC_ESC) 10#define CTL_ESC CTL_T(KC_ESC)
11#define MACSLEEP LCTL(LSFT(KC_POWER)) 11#define MACSLEEP LCTL(LSFT(KC_POWER))
12 12
13enum hhkb_keycodes { 13enum hhkb_keycodes
14 QWERTY = SAFE_RANGE, 14{
15 DYNKEY, 15 QWERTY = SAFE_RANGE,
16 DYNAMIC_MACRO_RANGE, 16 DYNKEY,
17 DYNAMIC_MACRO_RANGE,
17}; 18};
18 19
19#include "dynamic_macro.h" 20#include "dynamic_macro.h"
@@ -36,14 +37,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
36 |------+------+-----------------------+------+------| 37 |------+------+-----------------------+------+------|
37 */ 38 */
38 39
39 [BASE] = KEYMAP( // default layer 40 [BASE] = LAYOUT( // default layer
40 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_BSLS, KC_DEL, \ 41 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_BSLS, KC_DEL,
41 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_BSPC, \ 42 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_BSPC,
42 CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT, \ 43 CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
43 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT), TT(FUNK), \ 44 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, SFT_T(KC_ENT), TT(FUNK),
44 KC_LALT, KC_LGUI, /* */ KC_SPC, MO(DYN), KC_RALT), 45 KC_LALT, KC_LGUI, /* */ KC_SPC, MO(DYN), KC_RALT),
45
46
47 46
48 /* Layer HHKB: HHKB mode (HHKB Fn) 47 /* Layer HHKB: HHKB mode (HHKB Fn)
49 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----| 48 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
@@ -62,7 +61,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
62 61
63 62
64 63
65 [HHKB] = KEYMAP( 64 [HHKB] = LAYOUT(
66 KC_PWR, 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, \ 65 KC_PWR, 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, \
67 KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \ 66 KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \
68 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ 67 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \
@@ -70,20 +69,18 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
70 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 69 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
71 70
72 */ 71 */
73 [FUNK] = KEYMAP( 72 [FUNK] = LAYOUT(
74 KC_PWR, 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, \ 73 KC_PWR, 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,
75 KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC, \ 74 KC_CAPS, KC_TRNS, KC_UP, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
76 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ 75 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
77 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS, \ 76 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
78 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 77 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
79[DYN] = KEYMAP( 78 [DYN] = LAYOUT(
80KC_TRNS, DYN_REC_START1, DYN_REC_START2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2, \ 79 KC_TRNS, DYN_REC_START1, DYN_REC_START2, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DYN_MACRO_PLAY1, DYN_MACRO_PLAY2,
81KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS, \ 80 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGUP, KC_TRNS, KC_TRNS,
82KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MACSLEEP, KC_HOME, KC_END , KC_TRNS, \ 81 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MACSLEEP, KC_HOME, KC_END, KC_TRNS,
83KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS, \ 82 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PGDN, KC_TRNS, KC_TRNS,
84 KC_TRNS, KC_TRNS, DYN_REC_STOP, KC_TRNS, KC_TRNS) 83 KC_TRNS, KC_TRNS, DYN_REC_STOP, KC_TRNS, KC_TRNS)};
85 };
86
87 84
88const uint16_t PROGMEM fn_actions[] = { 85const uint16_t PROGMEM fn_actions[] = {
89 86
@@ -91,24 +88,30 @@ const uint16_t PROGMEM fn_actions[] = {
91 88
92const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 89const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
93{ 90{
94 // MACRODOWN only works in this function 91 // MACRODOWN only works in this function
95 switch(id) { 92 switch (id)
96 case 0: 93 {
97 if (record->event.pressed) { 94 case 0:
95 if (record->event.pressed)
96 {
98 register_code(KC_RSFT); 97 register_code(KC_RSFT);
99 } else { 98 }
99 else
100 {
100 unregister_code(KC_RSFT); 101 unregister_code(KC_RSFT);
101 } 102 }
102 break; 103 break;
103 } 104 }
104 return MACRO_NONE; 105 return MACRO_NONE;
105}; 106};
106 107
107bool process_record_user(uint16_t keycode, keyrecord_t *record) { 108bool process_record_user(uint16_t keycode, keyrecord_t *record)
108 uint16_t macro_kc = (keycode == MO(DYN) ? DYN_REC_STOP : keycode); 109{
109 if (!process_record_dynamic_macro(macro_kc, record)) { 110 uint16_t macro_kc = (keycode == MO(DYN) ? DYN_REC_STOP : keycode);
110 return false; 111 if (!process_record_dynamic_macro(macro_kc, record))
111 } 112 {
113 return false;
114 }
112 115
113 return true; 116 return true;
114} 117}
diff --git a/keyboards/hhkb/keymaps/rdg_jp/keymap.c b/keyboards/hhkb/keymaps/rdg_jp/keymap.c
index 700ba3a0b..2afac7a0b 100644
--- a/keyboards/hhkb/keymaps/rdg_jp/keymap.c
+++ b/keyboards/hhkb/keymaps/rdg_jp/keymap.c
@@ -1,21 +1,20 @@
1#include "hhkb.h" 1#include QMK_KEYBOARD_H
2 2
3#define _______ KC_TRNS 3#define _______ KC_TRNS
4 4
5enum { 5enum
6 ZER, 6{
7 HDN, 7 ZER,
8 OSY 8 HDN,
9 OSY
9}; 10};
10 11
11
12#define CTL_ESC CTL_T(KC_ESC) 12#define CTL_ESC CTL_T(KC_ESC)
13#define SFT_BSP SFT_T(KC_BSPC) 13#define SFT_BSP SFT_T(KC_BSPC)
14 14
15#define SCRNS3 LGUI(LCTL(LSFT(KC_3))) 15#define SCRNS3 LGUI(LCTL(LSFT(KC_3)))
16#define SCRNS4 LGUI(LCTL(LSFT(KC_4))) 16#define SCRNS4 LGUI(LCTL(LSFT(KC_4)))
17 17
18
19/* hhkb jp ~ layout 18/* hhkb jp ~ layout
20 * ,-----------------------------------------------------------. 19 * ,-----------------------------------------------------------.
21 * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| -| =|Yen|Bsp| 20 * |Esc| 1| 2| 3| 4| 5| 6| 7| 8| 9| 10| -| =|Yen|Bsp|
@@ -31,33 +30,30 @@ enum {
31 */ 30 */
32 31
33const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 32const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
34 [ZER] = KEYMAP_JP( 33 [ZER] = LAYOUT_JP(
35 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_INS, KC_BSPC, 34 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_INS, KC_BSPC,
36 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, 35 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,
37 CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_GRV, KC_ENT, 36 CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_GRV, KC_ENT,
38 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, KC_UP, KC_RSFT, 37 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_BSLS, KC_UP, KC_RSFT,
39 MO(HDN), KC_LCTL, KC_LALT, KC_LGUI, MO(HDN), KC_SPC, SFT_BSP, MO(HDN), MO(OSY), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT 38 MO(HDN), KC_LCTL, KC_LALT, KC_LGUI, MO(HDN), KC_SPC, SFT_BSP, MO(HDN), MO(OSY), KC_NO, KC_LEFT, KC_DOWN, KC_RGHT),
40 ), 39
41 40 [HDN] = LAYOUT_JP(
42 [HDN] = KEYMAP_JP( 41 KC_GRV, 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_DEL,
43 KC_GRV, 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_DEL, 42 _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______,
44 _______, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_LPRN, KC_RPRN, _______, _______, 43 _______, KC_TILD, KC_GRV, KC_BSLS, KC_PIPE, KC_MINS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TILD, KC_GRV, _______, _______,
45 _______, KC_TILD, KC_GRV, KC_BSLS, KC_PIPE, KC_MINS, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_TILD, KC_GRV, _______, _______, 44 _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, _______, KC_ENT, _______, _______, _______, _______, KC_PGUP, _______,
46 _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, _______, KC_ENT, _______, _______, _______, _______, KC_PGUP, _______, 45 _______, _______, _______, _______, _______, KC_UNDS, KC_DEL, _______, _______, _______, KC_HOME, KC_PGDN, KC_END),
47 _______, _______, _______, _______, _______, KC_UNDS , KC_DEL, _______, _______, _______, KC_HOME, KC_PGDN, KC_END 46
48 ), 47 [OSY] = LAYOUT_JP(
49 48 _______, _______, _______, SCRNS3, SCRNS4, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
50 [OSY] = KEYMAP_JP( 49 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
51 _______, _______, _______, SCRNS3, SCRNS4, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 50 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
52 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 51 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
53 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 52 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)};
54 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 53
55 _______, _______, _______, _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______ 54const macro_t *action_get_macro(keyrecord_t *record, uint8_t macro_id, uint8_t opt)
56 ) 55{
57}; 56 return MACRO_NONE;
58
59const macro_t *action_get_macro(keyrecord_t *record, uint8_t macro_id, uint8_t opt) {
60 return MACRO_NONE;
61} 57}
62 58
63const uint16_t PROGMEM fn_actions[] = { 59const uint16_t PROGMEM fn_actions[] = {
diff --git a/keyboards/hhkb/keymaps/sh_jp/keymap.c b/keyboards/hhkb/keymaps/sh_jp/keymap.c
index d4cb3b041..39710a654 100644
--- a/keyboards/hhkb/keymaps/sh_jp/keymap.c
+++ b/keyboards/hhkb/keymaps/sh_jp/keymap.c
@@ -1,58 +1,54 @@
1#include "hhkb.h" 1#include QMK_KEYBOARD_H
2 2
3#define _______ KC_TRNS 3#define _______ KC_TRNS
4 4
5enum { 5enum
6 DVOR, 6{
7 QWER, 7 DVOR,
8 NEW_CMD, 8 QWER,
9 SYMB, 9 NEW_CMD,
10 FUNC 10 SYMB,
11 FUNC
11}; 12};
12 13
13const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 14const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
14 [DVOR] = KEYMAP_JP( 15 [DVOR] = LAYOUT_JP(
15 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_JYEN, KC_BSPC, 16 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_JYEN, KC_BSPC,
16 KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, 17 KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL,
17 KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_BSLS, KC_ENT, 18 KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_BSLS, KC_ENT,
18 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RO, KC_UP, KC_RSFT, 19 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RO, KC_UP, KC_RSFT,
19 MO(FUNC), KC_ZKHK, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, TG(QWER), KC_LEFT, KC_DOWN, KC_RGHT 20 MO(FUNC), KC_ZKHK, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, TG(QWER), KC_LEFT, KC_DOWN, KC_RGHT),
20 ), 21 [QWER] = LAYOUT_JP(
21 [QWER] = KEYMAP_JP( 22 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_JYEN, KC_BSPC,
22 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_JYEN, KC_BSPC, 23 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,
23 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, 24 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT,
24 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_BSLS, KC_ENT, 25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT,
25 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RO, KC_UP, KC_RSFT, 26 MO(FUNC), KC_ZKHK, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, _______, KC_LEFT, KC_DOWN, KC_RGHT),
26 MO(FUNC), KC_ZKHK, KC_LALT, MO(NEW_CMD), MO(SYMB), MT(MOD_LSFT, KC_SPC), MO(SYMB), KC_TAB, KC_RGUI, _______, KC_LEFT, KC_DOWN, KC_RGHT 27
27 ), 28 [NEW_CMD] = LAYOUT_JP(
28 29 _______, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), LGUI(KC_0), _______, _______, _______, LGUI(KC_BSPC),
29 [NEW_CMD] = KEYMAP_JP( 30 _______, LGUI(KC_Q), LGUI(KC_W), LGUI(KC_E), LGUI(KC_R), LGUI(KC_T), LGUI(KC_Y), LGUI(KC_U), LGUI(KC_I), LGUI(KC_O), LGUI(KC_P), LGUI(KC_LBRC), LGUI(KC_RBRC),
30 _______, LGUI(KC_1), LGUI(KC_2), LGUI(KC_3), LGUI(KC_4), LGUI(KC_5), LGUI(KC_6), LGUI(KC_7), LGUI(KC_8), LGUI(KC_9), LGUI(KC_0), _______, _______, _______, LGUI(KC_BSPC), 31 _______, LGUI(KC_A), LGUI(KC_S), LGUI(KC_D), LGUI(KC_F), LGUI(KC_G), LGUI(KC_H), LGUI(KC_J), LGUI(KC_K), LGUI(KC_L), _______, _______, _______, _______,
31 _______, LGUI(KC_Q), LGUI(KC_W), LGUI(KC_E), LGUI(KC_R), LGUI(KC_T), LGUI(KC_Y), LGUI(KC_U), LGUI(KC_I), LGUI(KC_O), LGUI(KC_P), LGUI(KC_LBRC), LGUI(KC_RBRC), 32 LGUI(KC_LSFT), LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), LGUI(KC_B), LGUI(KC_N), LGUI(KC_M), LGUI(KC_COMM), LGUI(KC_DOT), LGUI(KC_SLSH), _______, _______, _______,
32 _______, LGUI(KC_A), LGUI(KC_S), LGUI(KC_D), LGUI(KC_F), LGUI(KC_G), LGUI(KC_H), LGUI(KC_J), LGUI(KC_K), LGUI(KC_L), _______, _______, _______, _______, 33 _______, _______, _______, _______, _______, LGUI(KC_SPC), _______, _______, _______, _______, LGUI(KC_LEFT), LGUI(KC_DOWN), LGUI(KC_RGHT)),
33 LGUI(KC_LSFT), LGUI(KC_Z), LGUI(KC_X), LGUI(KC_C), LGUI(KC_V), LGUI(KC_B), LGUI(KC_N), LGUI(KC_M), LGUI(KC_COMM), LGUI(KC_DOT), LGUI(KC_SLSH), _______, _______, _______, 34
34 _______, _______, _______, _______, _______, LGUI(KC_SPC), _______, _______, _______, _______, LGUI(KC_LEFT), LGUI(KC_DOWN), LGUI(KC_RGHT) 35 [SYMB] = LAYOUT_JP(
35 ), 36 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
36 37 _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, LSFT(KC_LBRC), LSFT(KC_RBRC), _______, _______, _______, _______,
37 [SYMB] = KEYMAP_JP( 38 _______, LSFT(KC_1), LSFT(KC_2), LSFT(KC_3), LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9), LSFT(KC_0), _______, _______, _______,
38 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 39 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
39 _______, _______, _______, KC_LBRC, KC_RBRC, _______, _______, LSFT(KC_LBRC), LSFT(KC_RBRC), _______, _______,_______, _______, 40 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______),
40 _______, LSFT(KC_1),LSFT(KC_2),LSFT(KC_3),LSFT(KC_4), LSFT(KC_5), LSFT(KC_6), LSFT(KC_7), LSFT(KC_8), LSFT(KC_9), LSFT(KC_0), _______, _______, _______, 41
41 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, 42 [FUNC] = LAYOUT_JP(
42 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ 43 KC_PWR, 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,
43 ), 44 KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______,
44 45 _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT,
45 [FUNC] = KEYMAP_JP( 46 _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______,
46 KC_PWR, 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, 47 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______)};
47 KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, 48
48 _______, KC_VOLD, KC_VOLU, KC_MUTE, KC_PWR, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, _______, KC_PENT, 49const macro_t *action_get_macro(keyrecord_t *record, uint8_t macro_id, uint8_t opt)
49 _______, _______, _______, _______, _______, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, _______, 50{
50 _______, _______, _______, _______, _______, _______ , _______, _______, _______, _______, _______, _______, _______ 51 return MACRO_NONE;
51 )
52};
53
54const macro_t *action_get_macro(keyrecord_t *record, uint8_t macro_id, uint8_t opt) {
55 return MACRO_NONE;
56} 52}
57 53
58const uint16_t PROGMEM fn_actions[] = { 54const uint16_t PROGMEM fn_actions[] = {
diff --git a/keyboards/hhkb/keymaps/shela/keymap.c b/keyboards/hhkb/keymaps/shela/keymap.c
index f0700d7ba..5f3881539 100644
--- a/keyboards/hhkb/keymaps/shela/keymap.c
+++ b/keyboards/hhkb/keymaps/shela/keymap.c
@@ -1,11 +1,12 @@
1/* 1/*
2 * HHKB Pro 2 US Layout for shela 2 * HHKB Pro 2 US Layout for shela
3 */ 3 */
4#include "hhkb.h" 4#include QMK_KEYBOARD_H
5#include "keymap_jis2us.h" 5#include "keymap_jis2us.h"
6#include "action_pseudo_lut.h" 6#include "action_pseudo_lut.h"
7 7
8enum keymap_layout { 8enum keymap_layout
9{
9 BASE = 0, 10 BASE = 0,
10 PSEUDO_US, 11 PSEUDO_US,
11 DVORAK, 12 DVORAK,
@@ -31,11 +32,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
31 * `-----------------------------------------------------------------' 32 * `-----------------------------------------------------------------'
32 */ 33 */
33 [BASE] = 34 [BASE] =
34 KEYMAP(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_GRV, KC_BSPC, \ 35 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_GRV, KC_BSPC,
35 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, \ 36 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,
36 KC_LCTL,KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_ENT, \ 37 KC_LCTL, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, KC_ENT,
37 OSM(MOD_LSFT),KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH,KC_RSFT,KC_FN0, \ 38 OSM(MOD_LSFT), KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_FN0,
38 KC_LALT,KC_LGUI, KC_FN2, KC_RGUI,KC_RALT), 39 KC_LALT, KC_LGUI, KC_FN2, KC_RGUI, KC_RALT),
39 40
40 /* Layer 1: Pseudo US Layout Layer 41 /* Layer 1: Pseudo US Layout Layer
41 * ,-----------------------------------------------------------------------------------------. 42 * ,-----------------------------------------------------------------------------------------.
@@ -51,11 +52,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
51 * `-----------------------------------------------------------------' 52 * `-----------------------------------------------------------------'
52 */ 53 */
53 [PSEUDO_US] = 54 [PSEUDO_US] =
54 KEYMAP(KC_ESC, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_BSPC, \ 55 LAYOUT(KC_ESC, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_BSPC,
55 KC_TAB, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, \ 56 KC_TAB, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1,
56 KC_LCTL,KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_ENT, \ 57 KC_LCTL, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_ENT,
57 KC_LSFT,KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_RSFT,KC_FN0, \ 58 KC_LSFT, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_FN1, KC_RSFT, KC_FN0,
58 KC_LGUI,KC_FN3, KC_FN2, KC_FN4 ,KC_RGUI), 59 KC_LGUI, KC_FN3, KC_FN2, KC_FN4, KC_RGUI),
59 60
60 /* Layer 2: Dvorak Layer 61 /* Layer 2: Dvorak Layer
61 * ,-----------------------------------------------------------------------------------------. 62 * ,-----------------------------------------------------------------------------------------.
@@ -71,11 +72,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
71 * `-----------------------------------------------------------------' 72 * `-----------------------------------------------------------------'
72 */ 73 */
73 [DVORAK] = 74 [DVORAK] =
74 KEYMAP(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC,KC_RBRC,KC_GRV, KC_BSPC, \ 75 LAYOUT(KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_GRV, KC_BSPC,
75 KC_TAB, KC_QUOT,KC_COMM,KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH,KC_EQL, KC_BSLS, \ 76 KC_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSLS,
76 KC_LCTL,KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS,KC_ENT, \ 77 KC_LCTL, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, KC_ENT,
77 KC_LSFT,KC_SCLN,KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT,KC_FN0, \ 78 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, KC_FN0,
78 KC_LALT,KC_LGUI, KC_FN2, KC_RGUI,KC_RALT), 79 KC_LALT, KC_LGUI, KC_FN2, KC_RGUI, KC_RALT),
79 80
80 /* Layer 3: Mouse layer 81 /* Layer 3: Mouse layer
81 * ,-----------------------------------------------------------------------------------------. 82 * ,-----------------------------------------------------------------------------------------.
@@ -91,11 +92,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
91 * `-----------------------------------------------------------------' 92 * `-----------------------------------------------------------------'
92 */ 93 */
93 [MOUSE] = 94 [MOUSE] =
94 KEYMAP(KC_ESC, 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_NO, KC_TRNS, \ 95 LAYOUT(KC_ESC, 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_NO, KC_TRNS,
95 KC_TRNS,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L,KC_WH_D,KC_WH_U,KC_WH_R,KC_NO, KC_NO, KC_NO, KC_NO, \ 96 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_WH_L, KC_WH_D, KC_WH_U, KC_WH_R, KC_NO, KC_NO, KC_NO, KC_NO,
96 KC_TRNS,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L,KC_MS_D,KC_MS_U,KC_MS_R,KC_NO, KC_NO, KC_TRNS, \ 97 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MS_L, KC_MS_D, KC_MS_U, KC_MS_R, KC_NO, KC_NO, KC_TRNS,
97 KC_TRNS,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1,KC_BTN2,KC_BTN3,KC_NO, KC_NO, KC_TRNS,KC_FN0, \ 98 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_BTN1, KC_BTN2, KC_BTN3, KC_NO, KC_NO, KC_TRNS, KC_FN0,
98 KC_TRNS,KC_TRNS, KC_BTN1, KC_TRNS,KC_TRNS), 99 KC_TRNS, KC_TRNS, KC_BTN1, KC_TRNS, KC_TRNS),
99 100
100 /* Layer 4: Tenkey layer 101 /* Layer 4: Tenkey layer
101 * ,-----------------------------------------------------------------------------------------. 102 * ,-----------------------------------------------------------------------------------------.
@@ -111,11 +112,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
111 * `-----------------------------------------------------------------' 112 * `-----------------------------------------------------------------'
112 */ 113 */
113 [TENKEY] = 114 [TENKEY] =
114 KEYMAP(KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSLS,KC_PAST,KC_PMNS,KC_NO, KC_BSPC, \ 115 LAYOUT(KC_ESC, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_PSLS, KC_PAST, KC_PMNS, KC_NO, KC_BSPC,
115 KC_TRNS,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_KP_7,KC_KP_8,KC_KP_9,KC_PPLS,KC_NO, \ 116 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_KP_7, KC_KP_8, KC_KP_9, KC_PPLS, KC_NO,
116 KC_TRNS,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_KP_4,KC_KP_5,KC_KP_6,KC_PENT, \ 117 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_KP_4, KC_KP_5, KC_KP_6, KC_PENT,
117 KC_TRNS,KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_KP_1,KC_KP_2,KC_KP_3,KC_PPLS,KC_FN0, \ 118 KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_KP_1, KC_KP_2, KC_KP_3, KC_PPLS, KC_FN0,
118 KC_TRNS,KC_TRNS, KC_FN2, KC_KP_0,KC_PDOT), 119 KC_TRNS, KC_TRNS, KC_FN2, KC_KP_0, KC_PDOT),
119 120
120 /* Layer 5: HHKB mode (HHKB Fn) 121 /* Layer 5: HHKB mode (HHKB Fn)
121 * ,-----------------------------------------------------------------------------------------. 122 * ,-----------------------------------------------------------------------------------------.
@@ -131,11 +132,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
131 * `-----------------------------------------------------------------' 132 * `-----------------------------------------------------------------'
132 */ 133 */
133 [HHKB] = 134 [HHKB] =
134 KEYMAP(KC_PWR, 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, \ 135 LAYOUT(KC_PWR, 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,
135 KC_CAPS,KC_FN5, KC_FN6, KC_FN7, KC_FN8, KC_FN9, KC_TRNS,KC_TRNS,KC_PSCR,KC_SLCK,KC_PAUS,KC_UP, KC_TRNS,KC_BSPC, \ 136 KC_CAPS, KC_FN5, KC_FN6, KC_FN7, KC_FN8, KC_FN9, KC_TRNS, KC_TRNS, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, KC_TRNS, KC_BSPC,
136 KC_TRNS,KC_VOLD,KC_VOLU,KC_MUTE,KC_TRNS,KC_TRNS,KC_PAST,KC_PSLS,KC_HOME,KC_PGUP,KC_LEFT,KC_RGHT,KC_PENT, \ 137 KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_TRNS, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
137 KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_PPLS,KC_PMNS,KC_END, KC_PGDN,KC_DOWN,KC_TRNS,KC_TRNS, \ 138 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, KC_TRNS, KC_TRNS,
138 KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS), 139 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
139 140
140 /* Layer 6: SpaceFN 141 /* Layer 6: SpaceFN
141 * ,-----------------------------------------------------------------------------------------. 142 * ,-----------------------------------------------------------------------------------------.
@@ -151,26 +152,29 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
151 * `-----------------------------------------------------------------' 152 * `-----------------------------------------------------------------'
152 */ 153 */
153 [SPACE_FN] = 154 [SPACE_FN] =
154 KEYMAP(KC_TRNS,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_NO, KC_DEL, \ 155 LAYOUT(KC_TRNS, 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_NO, KC_DEL,
155 KC_TRNS,KC_HOME,KC_UP, KC_END, KC_NO, KC_NO, KC_NO, KC_HOME,KC_END, KC_NO, KC_PSCR,KC_SLCK,KC_PAUS,KC_INS, \ 156 KC_TRNS, KC_HOME, KC_UP, KC_END, KC_NO, KC_NO, KC_NO, KC_HOME, KC_END, KC_NO, KC_PSCR, KC_SLCK, KC_PAUS, KC_INS,
156 KC_TRNS,KC_LEFT,KC_DOWN,KC_RGHT,KC_PGUP,KC_NO, KC_LEFT,KC_DOWN,KC_UP, KC_RGHT,KC_NO, KC_NO, KC_TRNS, \ 157 KC_TRNS, KC_LEFT, KC_DOWN, KC_RGHT, KC_PGUP, KC_NO, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_NO, KC_NO, KC_TRNS,
157 KC_TRNS,KC_NO, KC_NO, KC_PGDN,KC_NO, KC_SPC, KC_NO, KC_PGDN,KC_PGUP,KC_NO, KC_NO, KC_TRNS,KC_NO, \ 158 KC_TRNS, KC_NO, KC_NO, KC_PGDN, KC_NO, KC_SPC, KC_NO, KC_PGDN, KC_PGUP, KC_NO, KC_NO, KC_TRNS, KC_NO,
158 KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS), 159 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
159}; 160};
160 161
161/* 162/*
162 * user defined action function 163 * user defined action function
163 */ 164 */
164enum function_id { 165enum function_id
166{
165 PSEUDO_US_FUNCTION, 167 PSEUDO_US_FUNCTION,
166}; 168};
167 169
168void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { 170void action_function(keyrecord_t *record, uint8_t id, uint8_t opt)
171{
169 172
170 switch (id) { 173 switch (id)
171 case PSEUDO_US_FUNCTION: 174 {
172 action_pseudo_lut(record, BASE, keymap_jis2us); 175 case PSEUDO_US_FUNCTION:
173 break; 176 action_pseudo_lut(record, BASE, keymap_jis2us);
177 break;
174 } 178 }
175} 179}
176 180
diff --git a/keyboards/hhkb/keymaps/shela/keymap_jis2us.h b/keyboards/hhkb/keymaps/shela/keymap_jis2us.h
index cf2bd4f0e..edc1e6d86 100644
--- a/keyboards/hhkb/keymaps/shela/keymap_jis2us.h
+++ b/keyboards/hhkb/keymaps/shela/keymap_jis2us.h
@@ -1,5 +1,5 @@
1#ifndef KEYMAP_JIS2US_H 1#ifndef LAYOUT_JIS2US_H
2#define KEYMAP_JIS2US_H 2#define LAYOUT_JIS2US_H
3 3
4/* keymap for convert from JIS to US */ 4/* keymap for convert from JIS to US */
5const uint16_t PROGMEM keymap_jis2us[][2] = { 5const uint16_t PROGMEM keymap_jis2us[][2] = {
diff --git a/keyboards/hhkb/keymaps/smt/keymap.c b/keyboards/hhkb/keymaps/smt/keymap.c
index 484df851a..428861640 100644
--- a/keyboards/hhkb/keymaps/smt/keymap.c
+++ b/keyboards/hhkb/keymaps/smt/keymap.c
@@ -1,18 +1,19 @@
1/* -*- eval: (turn-on-orgtbl); -*- 1/* -*- eval: (turn-on-orgtbl); -*-
2 * default HHKB Layout 2 * default HHKB Layout
3 */ 3 */
4#include "hhkb.h" 4#include QMK_KEYBOARD_H
5 5
6#define _QWERTY 0 6#define _QWERTY 0
7#define _COLEMAK 1 7#define _COLEMAK 1
8#define _DVORAK 2 8#define _DVORAK 2
9#define _HHKB 3 9#define _HHKB 3
10 10
11enum planck_keycodes { 11enum planck_keycodes
12 QWERTY = SAFE_RANGE, 12{
13 COLEMAK, 13 QWERTY = SAFE_RANGE,
14 DVORAK, 14 COLEMAK,
15 HHKB 15 DVORAK,
16 HHKB
16}; 17};
17 18
18// Fillers to make layering more clear 19// Fillers to make layering more clear
@@ -20,10 +21,10 @@ enum planck_keycodes {
20#define XXXXXXX KC_NO 21#define XXXXXXX KC_NO
21 22
22// Custom macros 23// Custom macros
23#define CTL_ESC CTL_T(KC_ESC) // Tap for Esc, hold for Ctrl 24#define CTL_ESC CTL_T(KC_ESC) // Tap for Esc, hold for Ctrl
24#define SFT_ENT SFT_T(KC_ENT) // Tap for Enter, hold for Shift 25#define SFT_ENT SFT_T(KC_ENT) // Tap for Enter, hold for Shift
25#define HPR_TAB ALL_T(KC_TAB) // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift) 26#define HPR_TAB ALL_T(KC_TAB) // Tap for Tab, hold for Hyper (Super+Ctrl+Alt+Shift)
26#define MEH_GRV MEH_T(KC_GRV) // Tap for Backtick, hold for Meh (Ctrl+Alt+Shift) 27#define MEH_GRV MEH_T(KC_GRV) // Tap for Backtick, hold for Meh (Ctrl+Alt+Shift)
27 28
28const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { 29const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
29 30
@@ -43,14 +44,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
43 |------+------+-----------------------+------+------| 44 |------+------+-----------------------+------+------|
44 */ 45 */
45 46
46 [_QWERTY] = KEYMAP( // Qwerty layer 47 [_QWERTY] = LAYOUT( // Qwerty layer
47 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, MEH_GRV, \ 48 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, MEH_GRV,
48 HPR_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_BSPC, \ 49 HPR_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_BSPC,
49 CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, SFT_ENT, \ 50 CTL_ESC, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, SFT_ENT,
50 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), \ 51 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),
51 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT), 52 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT),
52
53
54 53
55 /* Layer COLEMAK: Colemak Layer 54 /* Layer COLEMAK: Colemak Layer
56 |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---| 55 |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
@@ -68,14 +67,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
68 |------+------+-----------------------+------+------| 67 |------+------+-----------------------+------+------|
69 */ 68 */
70 69
71 [_COLEMAK] = KEYMAP( // Colemak layer 70 [_COLEMAK] = LAYOUT( // Colemak layer
72 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, MEH_GRV, \ 71 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, MEH_GRV,
73 HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC, \ 72 HPR_TAB, KC_Q, KC_W, KC_F, KC_P, KC_G, KC_J, KC_L, KC_U, KC_Y, KC_SCLN, KC_LBRC, KC_RBRC, KC_BSPC,
74 CTL_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, SFT_ENT, \ 73 CTL_ESC, KC_A, KC_R, KC_S, KC_T, KC_D, KC_H, KC_N, KC_E, KC_I, KC_O, KC_QUOT, SFT_ENT,
75 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_HHKB), \ 74 KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_K, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(_HHKB),
76 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT), 75 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT),
77
78
79 76
80 /* Layer DVORAK: Dvorak Layer 77 /* Layer DVORAK: Dvorak Layer
81 |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---| 78 |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
@@ -93,14 +90,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
93 |------+------+-----------------------+------+------| 90 |------+------+-----------------------+------+------|
94 */ 91 */
95 92
96 [_DVORAK] = KEYMAP( // Dvorak layer 93 [_DVORAK] = LAYOUT( // Dvorak layer
97 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSLS, MEH_GRV, \ 94 KC_ESC, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC, KC_BSLS, MEH_GRV,
98 HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC, \ 95 HPR_TAB, KC_QUOT, KC_COMM, KC_DOT, KC_P, KC_Y, KC_F, KC_G, KC_C, KC_R, KC_L, KC_SLSH, KC_EQL, KC_BSPC,
99 CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, SFT_ENT, \ 96 CTL_ESC, KC_A, KC_O, KC_E, KC_U, KC_I, KC_D, KC_H, KC_T, KC_N, KC_S, KC_MINS, SFT_ENT,
100 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, MO(_HHKB), \ 97 KC_LSFT, KC_SCLN, KC_Q, KC_J, KC_K, KC_X, KC_B, KC_M, KC_W, KC_V, KC_Z, KC_RSFT, MO(_HHKB),
101 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT), 98 KC_LALT, KC_LGUI, /* */ KC_SPC, KC_RGUI, KC_RALT),
102
103
104 99
105 /* Layer HHKB: HHKB mode (HHKB Fn) 100 /* Layer HHKB: HHKB mode (HHKB Fn)
106 |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------+-------+-----| 101 |------+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-----+-------+-------+-----|
@@ -119,13 +114,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
119 114
120 */ 115 */
121 116
122 [_HHKB] = KEYMAP( 117 [_HHKB] = LAYOUT(
123 KC_PWR, 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, \ 118 KC_PWR, 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,
124 KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_BSPC, \ 119 KC_CAPS, _______, _______, _______, _______, _______, _______, _______, KC_PSCR, KC_SLCK, KC_PAUS, KC_UP, _______, KC_BSPC,
125 _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT, \ 120 _______, KC_VOLD, KC_VOLU, KC_MUTE, _______, _______, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_PENT,
126 _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______, \ 121 _______, _______, QWERTY, COLEMAK, DVORAK, _______, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, _______, _______,
127 _______, _______, _______, _______, _______)}; 122 _______, _______, _______, _______, _______)};
128
129 123
130const uint16_t PROGMEM fn_actions[] = { 124const uint16_t PROGMEM fn_actions[] = {
131 125
@@ -133,44 +127,54 @@ const uint16_t PROGMEM fn_actions[] = {
133 127
134const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt) 128const macro_t *action_get_macro(keyrecord_t *record, uint8_t id, uint8_t opt)
135{ 129{
136 // MACRODOWN only works in this function 130 // MACRODOWN only works in this function
137 switch(id) { 131 switch (id)
138 case 0: 132 {
139 if (record->event.pressed) { 133 case 0:
134 if (record->event.pressed)
135 {
140 register_code(KC_RSFT); 136 register_code(KC_RSFT);
141 } else { 137 }
138 else
139 {
142 unregister_code(KC_RSFT); 140 unregister_code(KC_RSFT);
143 } 141 }
144 break; 142 break;
145 } 143 }
146 return MACRO_NONE; 144 return MACRO_NONE;
147}; 145};
148 146
149void persistent_default_layer_set(uint16_t default_layer) { 147void persistent_default_layer_set(uint16_t default_layer)
150 eeconfig_update_default_layer(default_layer); 148{
151 default_layer_set(default_layer); 149 eeconfig_update_default_layer(default_layer);
150 default_layer_set(default_layer);
152} 151}
153 152
154bool process_record_user(uint16_t keycode, keyrecord_t *record) { 153bool process_record_user(uint16_t keycode, keyrecord_t *record)
155 switch (keycode) { 154{
155 switch (keycode)
156 {
156 case QWERTY: 157 case QWERTY:
157 if (record->event.pressed) { 158 if (record->event.pressed)
158 persistent_default_layer_set(1UL<<_QWERTY); 159 {
159 } 160 persistent_default_layer_set(1UL << _QWERTY);
160 return false; 161 }
161 break; 162 return false;
163 break;
162 case COLEMAK: 164 case COLEMAK:
163 if (record->event.pressed) { 165 if (record->event.pressed)
164 persistent_default_layer_set(1UL<<_COLEMAK); 166 {
165 } 167 persistent_default_layer_set(1UL << _COLEMAK);
166 return false; 168 }
167 break; 169 return false;
170 break;
168 case DVORAK: 171 case DVORAK:
169 if (record->event.pressed) { 172 if (record->event.pressed)
170 persistent_default_layer_set(1UL<<_DVORAK); 173 {
171 } 174 persistent_default_layer_set(1UL << _DVORAK);
172 return false; 175 }
173 break; 176 return false;
174 } 177 break;
175 return true; 178 }
179 return true;
176} 180}
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-03 19:02:47 +0000