aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEric <22215921+ericywl@users.noreply.github.com>2018-04-25 00:27:33 +0800
committerDrashna Jaelre <drashna@live.com>2018-04-24 09:27:33 -0700
commiteef75b82bdba9fa7e4f19b0f4cf1ffa7afe0c005 (patch)
tree5f11171d44d6f5ae3bcd42558b8b82771b50753a
parent6beb9d3ac2dd7984c0a26ecb13df8e3628de1cc8 (diff)
downloadqmk_firmware-eef75b82bdba9fa7e4f19b0f4cf1ffa7afe0c005.tar.gz
qmk_firmware-eef75b82bdba9fa7e4f19b0f4cf1ffa7afe0c005.zip
Edited keymaps for eric/dz60 (#2793)
* added hhkb eric * dz60 and hhkb * editted eric hhkb and dz60
Diffstat
-rw-r--r--keyboards/dz60/keymaps/eric/keymap.c81
-rw-r--r--keyboards/hhkb/keymaps/eric/keymap.c10
2 files changed, 48 insertions, 43 deletions
diff --git a/keyboards/dz60/keymaps/eric/keymap.c b/keyboards/dz60/keymaps/eric/keymap.c
index 730d750c4..56abcc25f 100644
--- a/keyboards/dz60/keymaps/eric/keymap.c
+++ b/keyboards/dz60/keymaps/eric/keymap.c
@@ -10,20 +10,20 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
10* |-----------------------------------------------------------------------------------------+ 10* |-----------------------------------------------------------------------------------------+
11* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bkspc | 11* | Tab | Q | W | E | R | T | Y | U | I | O | P | [ | ] | Bkspc |
12* |-----------------------------------------------------------------------------------------+ 12* |-----------------------------------------------------------------------------------------+
13* | Caps | A | S | D | F | G | H | J | K | L | ; | ' | Enter | 13* | Ctrl | A | S | D | F | G | H | J | K | L | ; | ' | Enter |
14* |-----------------------------------------------------------------------------------------+ 14* |-----------------------------------------------------------------------------------------+
15* | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | Fn | 15* | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | Fn |
16* |-----------------------------------------------------------------------------------------+ 16* |-----------------------------------------------------------------------------------------+
17* | Ctrl | GUI | Alt | Space | Alt | GUI | Ctrl | 17* | Caps | GUI | Alt | Space | Alt | GUI | Ctrl |
18* `-----------------------------------------------------------------------------------------' 18* `-----------------------------------------------------------------------------------------'
19*/ 19*/
20 20
21 KEYMAP_2_SHIFTS( 21 LAYOUT(
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_BSLS, KC_GRV, 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_BSLS, KC_GRV,
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, 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, KC_BSPC,
24 KC_CAPS, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_QUOT, 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_ENT,
25 KC_LSFT, KC_TRNS, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_RSFT, MO(1), 25 KC_LSFT, KC_NO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
26 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, MO(2)), 26 KC_CAPS, KC_LGUI, KC_LALT, KC_SPC, KC_SPC, KC_SPC, KC_SPC, KC_RALT, KC_RGUI, KC_RGUI, KC_RCTL),
27 27
28 28
29 29
@@ -31,23 +31,30 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
31* ,-----------------------------------------------------------------------------------------. 31* ,-----------------------------------------------------------------------------------------.
32* | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | INS | Del | 32* | | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | INS | Del |
33* |-----------------------------------------------------------------------------------------+ 33* |-----------------------------------------------------------------------------------------+
34* | | PGUP | UP | PGDN | HOME | & | | | | | Prnt | UP | Del | Bkspc | 34* | | PGUP | UP | PGDN | HOME | & | ~ | | | | Prnt | UP | Del | Bkspc |
35* |-----------------------------------------------------------------------------------------+ 35* |-----------------------------------------------------------------------------------------+
36* | | LEFT | DWN | RGHT | END | * | | | PGUP | HOME | LEFT | RGHT | | 36* | | LEFT | DWN | RGHT | END | * | | | PGUP | HOME | LEFT | RGHT | |
37* |-----------------------------------------------------------------------------------------+ 37* |-----------------------------------------------------------------------------------------+
38* | | _ | + | ( | ) | | | ~ | | PGDN | END | DWN | | | 38* | | _ | + | ( | ) | | | | | PGDN | END | DWN | | |
39* |-----------------------------------------------------------------------------------------+ 39* |-----------------------------------------------------------------------------------------+
40* | | | | | | | | 40* | | | | | | | |
41* `-----------------------------------------------------------------------------------------' 41* `-----------------------------------------------------------------------------------------'
42*/ 42*/
43 43
44 44
45 KEYMAP_2_SHIFTS( 45 LAYOUT(
46 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_INS, KC_DEL, 46 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,
47 KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_DEL, KC_BSPC, 47 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,
48 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, 48 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,
49 KC_TRNS, KC_TRNS, KC_UNDS, KC_PLUS, KC_LPRN, KC_RPRN, KC_PIPE, KC_TILD, KC_TRNS, KC_PGDN, KC_END, KC_DOWN, KC_TRNS, KC_TRNS, KC_TRNS, 49 KC_TRNS, 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,
50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS), 50 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, MO(2), KC_TRNS, KC_TRNS, KC_TRNS),
51
52 LAYOUT(
53 RESET, KC_A, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
54 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
55 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
56 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
57 KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO),
51}; 58};
52 59
53enum function_id { 60enum function_id {
@@ -55,31 +62,31 @@ enum function_id {
55}; 62};
56 63
57const uint16_t PROGMEM fn_actions[] = { 64const uint16_t PROGMEM fn_actions[] = {
58 [0] = ACTION_FUNCTION(SHIFT_ESC), 65 [0] = ACTION_FUNCTION(SHIFT_ESC)
59}; 66};
60 67
61void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) { 68void action_function(keyrecord_t *record, uint8_t id, uint8_t opt) {
62 static uint8_t shift_esc_shift_mask; 69 static uint8_t shift_esc_shift_mask;
63 switch (id) { 70 switch (id) {
64 case SHIFT_ESC: 71 case SHIFT_ESC:
65 shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK; 72 shift_esc_shift_mask = get_mods()&MODS_CTRL_MASK;
66 if (record->event.pressed) { 73 if (record->event.pressed) {
67 if (shift_esc_shift_mask) { 74 if (shift_esc_shift_mask) {
68 add_key(KC_GRV); 75 add_key(KC_GRV);
69 send_keyboard_report(); 76 send_keyboard_report();
70 } else { 77 } else {
71 add_key(KC_ESC); 78 add_key(KC_ESC);
72 send_keyboard_report(); 79 send_keyboard_report();
73 } 80 }
74 } else { 81 } else {
75 if (shift_esc_shift_mask) { 82 if (shift_esc_shift_mask) {
76 del_key(KC_GRV); 83 del_key(KC_GRV);
77 send_keyboard_report(); 84 send_keyboard_report();
78 } else { 85 } else {
79 del_key(KC_ESC); 86 del_key(KC_ESC);
80 send_keyboard_report(); 87 send_keyboard_report();
81 } 88 }
82 } 89 }
83 break; 90 break;
84 } 91 }
85} \ No newline at end of file 92}
diff --git a/keyboards/hhkb/keymaps/eric/keymap.c b/keyboards/hhkb/keymaps/eric/keymap.c
index 17351ba01..496ead346 100644
--- a/keyboards/hhkb/keymaps/eric/keymap.c
+++ b/keyboards/hhkb/keymaps/eric/keymap.c
@@ -18,7 +18,6 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
18 |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---| 18 |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
19 | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | Fn0 | | | 19 | Shift | Z | X | C | V | B | N | M | , | . | / | Shift | Fn0 | | |
20 |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---| 20 |-------+---+---+---+---+---+---+---+---+---+---+-------+-----+-------+---|
21
22 |------+------+-----------------------+------+------| 21 |------+------+-----------------------+------+------|
23 | LAlt | LGUI | ******* Space ******* | RGUI | RAlt | 22 | LAlt | LGUI | ******* Space ******* | RGUI | RAlt |
24 |------+------+-----------------------+------+------| 23 |------+------+-----------------------+------+------|
@@ -37,13 +36,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
37 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----| 36 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
38 | Caps | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del | 37 | Caps | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 | F10 | F11 | F12 | Ins | Del |
39 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----| 38 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
40 | | PgU | Up | PgD | Hm | & | | | | | Psc | Up | Del | Backs | | 39 | | PgU | Up | PgD | Hm | & | ~ | | | | Psc | Up | Del | Backs | |
41 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----| 40 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
42 | | Lef | Dow | Rig | En | * | | | PgU | Hom | Lef | Rig | Enter | | | 41 | | Lef | Dow | Rig | En | * | | | PgU | Hom | Lef | Rig | Enter | | |
43 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----| 42 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
44 | | _ | + | ( | ) | | | ~ | | PgD | End | Dow | | | | | 43 | | _ | + | ( | ) | | | | | PgD | End | Dow | | | | |
45 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----| 44 |------+-----+-----+-----+----+----+----+----+-----+-----+-----+-----+-------+-------+-----|
46
47 |------+------+----------------------+------+------+ 45 |------+------+----------------------+------+------+
48 | **** | **** | ******************** | **** | **** | 46 | **** | **** | ******************** | **** | **** |
49 |------+------+----------------------+------+------+ 47 |------+------+----------------------+------+------+
@@ -52,9 +50,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
52 50
53 [HHKB] = KEYMAP( 51 [HHKB] = KEYMAP(
54 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, \ 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, \
55 KC_TRNS, KC_PGUP, KC_UP, KC_PGDN, KC_HOME, KC_AMPR, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_UP, KC_DEL, KC_BSPC, \ 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, \
56 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, \ 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, \
57 KC_TRNS, KC_UNDS, KC_PLUS, KC_LPRN, KC_RPRN, KC_PIPE, KC_TILD, KC_TRNS, KC_PGDN, KC_END, KC_DOWN, KC_TRNS, 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, \
58 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)}; 56 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS)};
59 57
60 58
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-22 19:43:20 +0000