summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorYan-Fa Li <yanfali@gmail.com>2019-09-25 21:35:54 -0700
committerDrashna Jaelre <drashna@live.com>2019-09-25 21:35:54 -0700
commitd143ddc06265652b2e9eb01e454ead135169712d (patch)
tree6b83981991dbc1a8b6f63c41d203fdbc459e239e
parentb3d41d9d6dd2af73e526c3c83ad9b623c97bfc38 (diff)
[Keymap] Port personal keymap to 60_tsangan_hhkb (#6820)
* Port personal keymap to 60_tsangan_hhkb - add 60_tsangan_hhkb layout to plain60 - Fix bug in split rs in plain60 - use community and user based layout for 60_tsangan_hhkb - set up audio for plain60 only * Add LAYOUT_60_ansi_split_bs_rshift
-rw-r--r--keyboards/clueboard/60/keymaps/yanfali/keymap.c132
-rw-r--r--keyboards/clueboard/60/keymaps/yanfali/readme.md14
-rw-r--r--keyboards/maartenwut/plain60/keymaps/yanfali/keymap.c25
-rw-r--r--keyboards/maartenwut/plain60/keymaps/yanfali/readme.md9
-rw-r--r--keyboards/maartenwut/plain60/plain60.h17
-rw-r--r--keyboards/maartenwut/plain60/rules.mk2
-rw-r--r--layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c31
-rw-r--r--layouts/community/60_tsangan_hhkb/yanfali/keymap.c25
-rw-r--r--users/yanfali/config.h10
-rw-r--r--users/yanfali/rules.mk (renamed from keyboards/maartenwut/plain60/keymaps/yanfali/rules.mk)2
10 files changed, 85 insertions, 182 deletions
diff --git a/keyboards/clueboard/60/keymaps/yanfali/keymap.c b/keyboards/clueboard/60/keymaps/yanfali/keymap.c
deleted file mode 100644
index 7c81ea028b..0000000000
--- a/keyboards/clueboard/60/keymaps/yanfali/keymap.c
+++ /dev/null
@@ -1,132 +0,0 @@
1#include QMK_KEYBOARD_H
2
3enum keyboard_layers {
4 _BL,
5 _FL,
6 _CL,
7 _YF
8};
9
10enum custom_keycodes {
11 S_BSKTC = SAFE_RANGE,
12 S_ODEJY,
13 S_RCKBY,
14 S_DOEDR,
15 S_SCALE,
16 S_ONEUP,
17 S_COIN,
18 S_SONIC,
19 S_ZELDA
20};
21
22#ifdef AUDIO_ENABLE
23 float song_basketcase[][2] = SONG(BASKET_CASE);
24 float song_ode_to_joy[][2] = SONG(ODE_TO_JOY);
25 float song_rock_a_bye_baby[][2] = SONG(ROCK_A_BYE_BABY);
26 float song_doe_a_deer[][2] = SONG(DOE_A_DEER);
27 float song_scale[][2] = SONG(MUSIC_SCALE_SOUND);
28 float song_coin[][2] = SONG(COIN_SOUND);
29 float song_one_up[][2] = SONG(ONE_UP_SOUND);
30 float song_sonic_ring[][2] = SONG(SONIC_RING);
31 float song_zelda_puzzle[][2] = SONG(ZELDA_PUZZLE);
32#endif
33
34const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
35 /* Layer 0: Default Layer
36 * ,-----------------------------------------------------------------.
37 * |Esc | 1| 2| 3| 4| 5| 6| 7| 8| 9| 0| -| =| `|BSp|
38 * |-----------------------------------------------------------------|
39 * |Tab | Q| W| E| R| T| Y| U| I| O| P| [| ]| \|
40 * |-----------------------------------------------------------------|
41 * |MT(CTL, ESC)| A| S| D| F| G| H| J| K| L| ;| '|Enter |
42 * |-----------------------------------------------------------------|
43 * |Shift | Z| X| C| V| B| N| M| ,| .| /|Shift |Fn0|
44 * |-----------------------------------------------------------------'
45 * |Ctrl |Alt|Gui | Space |Alt |Gui|Fn |Ctrl |
46 * `-----------------------------------------------------------------'
47 */
48 [_BL] = LAYOUT_all(
49 KC_GESC,KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_MINS,KC_EQL, KC_GRV, KC_BSPC,\
50 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, \
51 MT(MOD_LCTL, KC_ESC), KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,KC_QUOT,KC_NUHS, KC_ENT, \
52 KC_LSFT, KC_NUBS,KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM,KC_DOT, KC_SLSH, KC_RSFT, MO(_YF), \
53 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RALT, KC_RGUI, MO(_FL), KC_RCTL),
54 [_FL] = LAYOUT_all(
55 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, _______,_______,\
56 _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
57 _______, _______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \
58 _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, MO(_YF), \
59 _______,_______,_______, _______, _______, _______, MO(_FL), _______),
60 [_CL] = LAYOUT_all(
61 BL_STEP,S_BSKTC,S_ODEJY,S_RCKBY,S_DOEDR,S_SCALE,S_ONEUP,S_COIN, S_SONIC,S_ZELDA,_______,_______,_______,_______,_______,\
62 _______, _______,_______,_______,RESET, _______,_______,_______,_______,_______,_______,_______,_______,_______, \
63 _______, _______,MO(_CL),_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \
64 _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, MO(_YF), \
65 _______, _______, _______, _______, _______, _______, MO(_FL), _______),
66 [_YF] = LAYOUT_all(
67 _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,\
68 _______,_______,KC_UP ,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, \
69 _______,KC_LEFT,KC_DOWN,KC_RIGHT,_______,_______,_______,_______,_______,_______,_______,_______,_______, _______, \
70 _______, _______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______,_______, MO(_YF), \
71 _______, _______, _______, _______, _______, _______, MO(_FL), _______)
72};
73
74bool process_record_user(uint16_t keycode, keyrecord_t *record) {
75 switch (keycode) {
76 case S_BSKTC:
77 if (record->event.pressed) {
78 stop_all_notes();
79 PLAY_SONG(song_basketcase);
80 }
81 return false;
82 case S_ODEJY:
83 if (record->event.pressed) {
84 stop_all_notes();
85 PLAY_SONG(song_ode_to_joy);
86 }
87 return false;
88 case S_RCKBY:
89 if (record->event.pressed) {
90 stop_all_notes();
91 PLAY_SONG(song_rock_a_bye_baby);
92 }
93 return false;
94 case S_DOEDR:
95 if (record->event.pressed) {
96 stop_all_notes();
97 PLAY_SONG(song_doe_a_deer);
98 }
99 return false;
100 case S_SCALE:
101 if (record->event.pressed) {
102 stop_all_notes();
103 PLAY_SONG(song_scale);
104 }
105 return false;
106 case S_ONEUP:
107 if (record->event.pressed) {
108 stop_all_notes();
109 PLAY_SONG(song_one_up);
110 }
111 return false;
112 case S_COIN:
113 if (record->event.pressed) {
114 stop_all_notes();
115 PLAY_SONG(song_coin);
116 }
117 return false;
118 case S_SONIC:
119 if (record->event.pressed) {
120 stop_all_notes();
121 PLAY_SONG(song_sonic_ring);
122 }
123 return false;
124 case S_ZELDA:
125 if (record->event.pressed) {
126 stop_all_notes();
127 PLAY_SONG(song_zelda_puzzle);
128 }
129 return false;
130 }
131 return true;
132}
diff --git a/keyboards/clueboard/60/keymaps/yanfali/readme.md b/keyboards/clueboard/60/keymaps/yanfali/readme.md
deleted file mode 100644
index 8b87051762..0000000000
--- a/keyboards/clueboard/60/keymaps/yanfali/readme.md
+++ /dev/null
@@ -1,14 +0,0 @@
1# /u/yanfali keymap for clueboard 60%
2
3Almost the same as default but differs in the following ways
4
5 1. `Caps Lock` -> `MT(KC_LCTL, KC_ESC)`.
6 I'm a heavy vim user and I prefer escape to be closer than default. I also move `Control` to this key if you hold it.
7 1. Switch Alt and GUI.
8 I spend most of my time on OSX, so I reverse Alt and GUI to be
9 more comfortable on OSX.
10 1. Added a custom layer.
11 I use this to map the cursor keys to WASD, the familiar directional
12 gaming keys. As I use a split right shift, this naturally leads
13 to the left hand being used for navigation. This is also the
14 best place to add custom mappings, macros and combo keys.
diff --git a/keyboards/maartenwut/plain60/keymaps/yanfali/keymap.c b/keyboards/maartenwut/plain60/keymaps/yanfali/keymap.c
deleted file mode 100644
index 3a0bc634f3..0000000000
--- a/keyboards/maartenwut/plain60/keymaps/yanfali/keymap.c
+++ /dev/null
@@ -1,25 +0,0 @@
1#include QMK_KEYBOARD_H
2
3// Each layer gets a name for readability, which is then used in the keymap matrix below.
4// The underscores don't mean anything - you can have a layer called STUFF or any other name.
5// Layer names don't all need to be of the same length, obviously, and you can also skip them
6// entirely and just use numbers.
7#define _MA 0
8#define _FN 1
9
10const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
11
12[_FN] = LAYOUT(
13 _______, 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, \
14 _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, RESET, \
15 KC_CAPS, KC_LEFT, KC_DOWN, KC_RIGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
16 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
17 _______, _______, _______, _______, _______, _______, _______, _______),
18
19[_MA] = LAYOUT(
20 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, \
21 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, \
22 LCTL_T(KC_ESC), 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, \
23 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(_FN) , \
24 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_NO, KC_RGUI, KC_RALT, KC_RCTRL)
25};
diff --git a/keyboards/maartenwut/plain60/keymaps/yanfali/readme.md b/keyboards/maartenwut/plain60/keymaps/yanfali/readme.md
deleted file mode 100644
index 790f3af5d9..0000000000
--- a/keyboards/maartenwut/plain60/keymaps/yanfali/readme.md
+++ /dev/null
@@ -1,9 +0,0 @@
1- Disable VIA
2- Tsangan bottom row
3- Split Backspace
4- Split Right shift
5- RESET, F keys, and Cursors (WASD), DEL, Capslock on layer
6- Capslock -> LCTL_T(KC_ESC)
7- Bootmagic lite
8- Command enabled
9- Console enabled
diff --git a/keyboards/maartenwut/plain60/plain60.h b/keyboards/maartenwut/plain60/plain60.h
index 4893e7ad79..2e3fc2cc31 100644
--- a/keyboards/maartenwut/plain60/plain60.h
+++ b/keyboards/maartenwut/plain60/plain60.h
@@ -61,10 +61,25 @@
61 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \ 61 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
62 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \ 62 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
63 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \ 63 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
64 {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, XXX, XXX}, \ 64 {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
65 {XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, k4c, XXX, XXX} \ 65 {XXX, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, k4c, XXX, XXX} \
66} 66}
67 67
68#define LAYOUT_60_tsangan_hhkb( \
69 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
70 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, \
71 k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, k2d, \
72 k30, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, \
73 k40, k41, k42, k46, k4b, k4c, k4d \
74) \
75{ \
76 {k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e}, \
77 {k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, XXX}, \
78 {k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, k2a, k2b, XXX, k2d, XXX}, \
79 {k30, XXX, k32, k33, k34, k35, k36, k37, k38, k39, k3a, k3b, k3c, k3d, XXX}, \
80 {k40, k41, k42, XXX, XXX, XXX, k46, XXX, XXX, XXX, XXX, k4b, k4c, k4d, XXX} \
81}
82
68#define LAYOUT_60_iso( \ 83#define LAYOUT_60_iso( \
69 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \ 84 k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0e, \
70 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \ 85 k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, \
diff --git a/keyboards/maartenwut/plain60/rules.mk b/keyboards/maartenwut/plain60/rules.mk
index da9cb9fbd4..d91b0255b3 100644
--- a/keyboards/maartenwut/plain60/rules.mk
+++ b/keyboards/maartenwut/plain60/rules.mk
@@ -65,4 +65,4 @@ BLUETOOTH_ENABLE = no # Enable Bluetooth with the Adafruit EZ-Key HID
65RAW_ENABLE = yes 65RAW_ENABLE = yes
66DYNAMIC_KEYMAP_ENABLE = yes 66DYNAMIC_KEYMAP_ENABLE = yes
67 67
68LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_hhkb 60_iso 68LAYOUTS = 60_ansi 60_ansi_split_bs_rshift 60_hhkb 60_iso 60_tsangan_hhkb
diff --git a/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c b/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c
new file mode 100644
index 0000000000..73d6789c1b
--- /dev/null
+++ b/layouts/community/60_ansi_split_bs_rshift/yanfali/keymap.c
@@ -0,0 +1,31 @@
1#include QMK_KEYBOARD_H
2
3enum {
4 BASE,
5 FN,
6 YFL
7};
8
9const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
10
11[BASE] = LAYOUT_60_ansi_split_bs_rshift(
12 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, \
13 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, \
14 LCTL_T(KC_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, \
15 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(YFL), \
16 KC_LCTL, KC_LGUI, KC_LALT, KC_SPACE, KC_RGUI, KC_RALT, MO(FN), KC_RCTL),
17
18[FN] = LAYOUT_60_ansi_split_bs_rshift(
19 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, KC_DEL, \
20 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
21 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
22 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
23 _______, _______, _______, _______, _______, _______, _______, _______),
24
25[YFL] = LAYOUT_60_ansi_split_bs_rshift(
26 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
27 _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, RESET, \
28 KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
29 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, \
30 _______, _______, _______, _______, _______, _______, _______, _______),
31};
diff --git a/layouts/community/60_tsangan_hhkb/yanfali/keymap.c b/layouts/community/60_tsangan_hhkb/yanfali/keymap.c
new file mode 100644
index 0000000000..a6cd15f4e2
--- /dev/null
+++ b/layouts/community/60_tsangan_hhkb/yanfali/keymap.c
@@ -0,0 +1,25 @@
1#include QMK_KEYBOARD_H
2
3enum layer {
4 BASE,
5 FN,
6};
7
8const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
9 [BASE] = LAYOUT_60_tsangan_hhkb(
10 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,
11 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,
12 LCTL_T(KC_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,
13 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),
14 KC_LCTL, KC_LALT, KC_LGUI, KC_SPC, KC_RGUI, KC_RALT, KC_RCTL
15 ),
16
17 [FN] = LAYOUT_60_tsangan_hhkb(
18 _______, 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,
19 _______, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, EEP_RST, RESET,
20 KC_CAPS, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______,
21 _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
22 _______, _______, _______, _______, _______, _______, _______
23 ),
24
25};
diff --git a/users/yanfali/config.h b/users/yanfali/config.h
new file mode 100644
index 0000000000..f14bea2f84
--- /dev/null
+++ b/users/yanfali/config.h
@@ -0,0 +1,10 @@
1#pragma once
2
3#ifdef KEYBOARD_maartenwut_plain60
4
5#define B7_AUDIO
6#ifdef AUDIO_ENABLE
7 #define STARTUP_SONG SONG(GUITAR_SOUND)
8#endif
9
10#endif
diff --git a/keyboards/maartenwut/plain60/keymaps/yanfali/rules.mk b/users/yanfali/rules.mk
index 3d1f67763e..bbd4d4bba6 100644
--- a/keyboards/maartenwut/plain60/keymaps/yanfali/rules.mk
+++ b/users/yanfali/rules.mk
@@ -2,3 +2,5 @@ BOOTMAGIC = lite
2DYNAMIC_KEYMAP_ENABLE = no 2DYNAMIC_KEYMAP_ENABLE = no
3CONSOLE_ENABLE = yes 3CONSOLE_ENABLE = yes
4COMMAND_ENABLE = yes 4COMMAND_ENABLE = yes
5AUDIO_ENABLE = yes
6LINK_TIME_OPTIMIZATION_ENABLE = yes