diff options
author | Danny <nooges@users.noreply.github.com> | 2020-03-31 18:21:05 -0400 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-31 23:21:05 +0100 |
commit | 8c80475fcc568e04f637ae973086b65a31b5254d (patch) | |
tree | baad35e04977fdcf70aebc68695a1f9aa04e3813 | |
parent | 3e18bb914cbdba36b574aaf020afe0e93d3d87fd (diff) | |
download | qmk_firmware-8c80475fcc568e04f637ae973086b65a31b5254d.tar.gz qmk_firmware-8c80475fcc568e04f637ae973086b65a31b5254d.zip |
Update Quefrency (#8623)
* Add Quefrency Rev. 2 VIA support
* Fix matrix mapping
* Add Rev. 1 VIA support
* Flip encoder pinout
* Drop trailing backslashes
* Remove layer names
* Remove unneeded extern
Co-Authored-By: Ryan <fauxpark@gmail.com>
* Fix bracket alignment
Co-Authored-By: Ryan <fauxpark@gmail.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
-rw-r--r-- | keyboards/keebio/quefrency/keymaps/via/keymap.c | 51 | ||||
-rw-r--r-- | keyboards/keebio/quefrency/keymaps/via/rules.mk | 3 | ||||
-rw-r--r-- | keyboards/keebio/quefrency/rev1/config.h | 2 | ||||
-rw-r--r-- | keyboards/keebio/quefrency/rev1/rev1.h | 23 | ||||
-rw-r--r-- | keyboards/keebio/quefrency/rev2/config.h | 12 | ||||
-rw-r--r-- | keyboards/keebio/quefrency/rev2/rev2.h | 36 |
6 files changed, 101 insertions, 26 deletions
diff --git a/keyboards/keebio/quefrency/keymaps/via/keymap.c b/keyboards/keebio/quefrency/keymaps/via/keymap.c new file mode 100644 index 000000000..f70a5bab9 --- /dev/null +++ b/keyboards/keebio/quefrency/keymaps/via/keymap.c | |||
@@ -0,0 +1,51 @@ | |||
1 | #include QMK_KEYBOARD_H | ||
2 | |||
3 | const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { | ||
4 | [0] = LAYOUT_all( | ||
5 | KC_F1, KC_F2, 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_DEL, KC_BSPC, KC_HOME, | ||
6 | KC_F3, KC_F4, 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, KC_END, | ||
7 | KC_F5, KC_F6, 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_NUHS, KC_ENT, KC_PGUP, | ||
8 | KC_F7, KC_F8, 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, KC_UP, KC_PGDN, | ||
9 | KC_F9, KC_F10, KC_LCTL, KC_LALT, KC_LGUI, MO(1), KC_SPC, KC_SPC, MO(1), KC_SPC, KC_RALT, KC_RCTL, KC_RGUI, KC_LEFT, KC_DOWN, KC_RGHT | ||
10 | ), | ||
11 | |||
12 | [1] = LAYOUT_all( | ||
13 | _______, _______, KC_GESC, 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_BSPC, _______, | ||
14 | _______, _______, RGB_TOG, RGB_MOD, _______, KC_UP, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
15 | _______, _______, _______, _______, KC_LEFT, KC_DOWN, KC_RGHT, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
16 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
17 | _______, _______, KC_TILD, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
18 | ), | ||
19 | |||
20 | [2] = LAYOUT_all( | ||
21 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
22 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
23 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
24 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
25 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
26 | ), | ||
27 | |||
28 | [3] = LAYOUT_all( | ||
29 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
30 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
31 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
32 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, | ||
33 | _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______ | ||
34 | ) | ||
35 | }; | ||
36 | |||
37 | void encoder_update_user(uint8_t index, bool clockwise) { | ||
38 | if (index == 0) { | ||
39 | if (clockwise) { | ||
40 | tap_code(KC_PGDN); | ||
41 | } else { | ||
42 | tap_code(KC_PGUP); | ||
43 | } | ||
44 | } else if (index == 1) { | ||
45 | if (clockwise) { | ||
46 | tap_code(KC_VOLU); | ||
47 | } else { | ||
48 | tap_code(KC_VOLD); | ||
49 | } | ||
50 | } | ||
51 | } | ||
diff --git a/keyboards/keebio/quefrency/keymaps/via/rules.mk b/keyboards/keebio/quefrency/keymaps/via/rules.mk new file mode 100644 index 000000000..540fc2ac3 --- /dev/null +++ b/keyboards/keebio/quefrency/keymaps/via/rules.mk | |||
@@ -0,0 +1,3 @@ | |||
1 | VIA_ENABLE = yes | ||
2 | CONSOLE_ENABLE = yes | ||
3 | LINK_TIME_OPTIMIZATION_ENABLE = yes | ||
diff --git a/keyboards/keebio/quefrency/rev1/config.h b/keyboards/keebio/quefrency/rev1/config.h index 1e3be6347..15771f531 100644 --- a/keyboards/keebio/quefrency/rev1/config.h +++ b/keyboards/keebio/quefrency/rev1/config.h | |||
@@ -23,7 +23,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
23 | #define PRODUCT_ID 0x1257 | 23 | #define PRODUCT_ID 0x1257 |
24 | #define DEVICE_VER 0x0100 | 24 | #define DEVICE_VER 0x0100 |
25 | #define MANUFACTURER Keebio | 25 | #define MANUFACTURER Keebio |
26 | #define PRODUCT Quefrency | 26 | #define PRODUCT Quefrency Rev. 1 |
27 | #define DESCRIPTION Split 60/65 percent staggered keyboard | 27 | #define DESCRIPTION Split 60/65 percent staggered keyboard |
28 | 28 | ||
29 | /* key matrix size */ | 29 | /* key matrix size */ |
diff --git a/keyboards/keebio/quefrency/rev1/rev1.h b/keyboards/keebio/quefrency/rev1/rev1.h index 137aa41c2..da62f904c 100644 --- a/keyboards/keebio/quefrency/rev1/rev1.h +++ b/keyboards/keebio/quefrency/rev1/rev1.h | |||
@@ -79,7 +79,6 @@ | |||
79 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ | 79 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO } \ |
80 | } | 80 | } |
81 | 81 | ||
82 | |||
83 | #define LAYOUT_65_with_macro( \ | 82 | #define LAYOUT_65_with_macro( \ |
84 | LA9, LA8, LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \ | 83 | LA9, LA8, LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \ |
85 | LB9, LB8, LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \ | 84 | LB9, LB8, LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \ |
@@ -101,3 +100,25 @@ | |||
101 | { RE1, RE2, RE9, RE4, RE5, RE6, RE7, RE8 }, \ | 100 | { RE1, RE2, RE9, RE4, RE5, RE6, RE7, RE8 }, \ |
102 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RA9, RB9 } \ | 101 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RA9, RB9 } \ |
103 | } | 102 | } |
103 | |||
104 | #define LAYOUT_all( \ | ||
105 | LA9, LA8, LA1, LA2, LA3, LA4, LA5, LA6, LA7, RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8, RA9, \ | ||
106 | LB9, LB8, LB1, LB2, LB3, LB4, LB5, LB6, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \ | ||
107 | LC9, LC8, LC1, LC2, LC3, LC4, LC5, LC6, RC1, RC2, RC3, RC4, RC5, RC6, RC7x,RC8, RC9, \ | ||
108 | LD9, LD8, LD1, LD2x,LD3, LD4, LD5, LD6, LD7, RD1, RD2, RD3, RD4, RD6, RD7, RD8, RD9, \ | ||
109 | LE9, LE8, LE1, LE2, LE3, LE5, LE6x,LE7, RE1, RE2, RE4, RE5, RE6, RE7, RE8, RE9 \ | ||
110 | ) \ | ||
111 | { \ | ||
112 | { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8 }, \ | ||
113 | { LB1, LB2, LB3, LB4, LB5, LB6, LB9, LB8 }, \ | ||
114 | { LC1, LC2, LC3, LC4, LC5, LC6, LC9, LC8 }, \ | ||
115 | { LD1, LD9, LD3, LD4, LD5, LD6, LD7, LD8 }, \ | ||
116 | { LE1, LE2, LE3, LA9, LE5, LE9, LE7, LE8 }, \ | ||
117 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \ | ||
118 | { RA1, RA2, RA3, RA4, RA5, RA6, RA7, RA8 }, \ | ||
119 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8 }, \ | ||
120 | { RC1, RC2, RC3, RC4, RC5, RC6, RC9, RC8 }, \ | ||
121 | { RD1, RD2, RD3, RD4, RD9, RD6, RD7, RD8 }, \ | ||
122 | { RE1, RE2, RE9, RE4, RE5, RE6, RE7, RE8 }, \ | ||
123 | { KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RA9, RB9 } \ | ||
124 | } | ||
diff --git a/keyboards/keebio/quefrency/rev2/config.h b/keyboards/keebio/quefrency/rev2/config.h index 4463eb739..d18b7be1f 100644 --- a/keyboards/keebio/quefrency/rev2/config.h +++ b/keyboards/keebio/quefrency/rev2/config.h | |||
@@ -20,10 +20,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
20 | 20 | ||
21 | /* USB Device descriptor parameter */ | 21 | /* USB Device descriptor parameter */ |
22 | #define VENDOR_ID 0xCB10 | 22 | #define VENDOR_ID 0xCB10 |
23 | #define PRODUCT_ID 0x1257 | 23 | #define PRODUCT_ID 0x2257 |
24 | #define DEVICE_VER 0x0200 | 24 | #define DEVICE_VER 0x0200 |
25 | #define MANUFACTURER Keebio | 25 | #define MANUFACTURER Keebio |
26 | #define PRODUCT Quefrency | 26 | #define PRODUCT Quefrency Rev. 2 |
27 | #define DESCRIPTION Split 60/65 percent staggered keyboard | 27 | #define DESCRIPTION Split 60/65 percent staggered keyboard |
28 | 28 | ||
29 | /* key matrix size */ | 29 | /* key matrix size */ |
@@ -38,10 +38,10 @@ along with this program. If not, see <http://www.gnu.org/licenses/>. | |||
38 | #define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 } | 38 | #define MATRIX_ROW_PINS_RIGHT { B3, B2, B6, B4, D7 } |
39 | #define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 } | 39 | #define MATRIX_COL_PINS_RIGHT { F1, F0, F4, F5, F6, D5, C7, D3, B7 } |
40 | #define SPLIT_HAND_PIN F7 | 40 | #define SPLIT_HAND_PIN F7 |
41 | #define ENCODERS_PAD_A { F6 } | 41 | #define ENCODERS_PAD_A { F5 } |
42 | #define ENCODERS_PAD_B { F5 } | 42 | #define ENCODERS_PAD_B { F6 } |
43 | #define ENCODERS_PAD_A_RIGHT { D4 } | 43 | #define ENCODERS_PAD_A_RIGHT { D6 } |
44 | #define ENCODERS_PAD_B_RIGHT { D6 } | 44 | #define ENCODERS_PAD_B_RIGHT { D4 } |
45 | 45 | ||
46 | /* Set 0 if debouncing isn't needed */ | 46 | /* Set 0 if debouncing isn't needed */ |
47 | #define DEBOUNCE 5 | 47 | #define DEBOUNCE 5 |
diff --git a/keyboards/keebio/quefrency/rev2/rev2.h b/keyboards/keebio/quefrency/rev2/rev2.h index 6d3db5584..b9c2ef6b4 100644 --- a/keyboards/keebio/quefrency/rev2/rev2.h +++ b/keyboards/keebio/quefrency/rev2/rev2.h | |||
@@ -16,7 +16,7 @@ | |||
16 | LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \ | 16 | LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \ |
17 | LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC8, \ | 17 | LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC8, \ |
18 | LD3, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, \ | 18 | LD3, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, \ |
19 | LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE4, RE5, RE6, RE7, RE8 \ | 19 | LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8 \ |
20 | ) \ | 20 | ) \ |
21 | { \ | 21 | { \ |
22 | { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ | 22 | { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ |
@@ -28,7 +28,7 @@ | |||
28 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \ | 28 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \ |
29 | { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \ | 29 | { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \ |
30 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \ | 30 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \ |
31 | { RE1, RE2, KC_NO, RE4, RE5, RE6, RE7, RE8, KC_NO } \ | 31 | { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \ |
32 | } | 32 | } |
33 | 33 | ||
34 | #define LAYOUT LAYOUT_60 // For backwards compatibility with Rev. 1 | 34 | #define LAYOUT LAYOUT_60 // For backwards compatibility with Rev. 1 |
@@ -38,7 +38,7 @@ | |||
38 | LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \ | 38 | LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \ |
39 | LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC8, RC9, \ | 39 | LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC8, RC9, \ |
40 | LD3, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, RD9, \ | 40 | LD3, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, RD9, \ |
41 | LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE4, RE5, RE6, RE7, RE8, RE9 \ | 41 | LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8, RE9 \ |
42 | ) \ | 42 | ) \ |
43 | { \ | 43 | { \ |
44 | { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ | 44 | { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ |
@@ -50,7 +50,7 @@ | |||
50 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \ | 50 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \ |
51 | { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \ | 51 | { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \ |
52 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \ | 52 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \ |
53 | { RE1, RE2, KC_NO, RE4, RE5, RE6, RE7, RE8, RE9 } \ | 53 | { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \ |
54 | } | 54 | } |
55 | 55 | ||
56 | #define LAYOUT_60_with_macro( \ | 56 | #define LAYOUT_60_with_macro( \ |
@@ -58,7 +58,7 @@ | |||
58 | LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \ | 58 | LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, \ |
59 | LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC8, \ | 59 | LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC8, \ |
60 | LD1, LD2, LD3, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, \ | 60 | LD1, LD2, LD3, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, \ |
61 | LE1, LE2, LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE4, RE5, RE6, RE7, RE8 \ | 61 | LE1, LE2, LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8 \ |
62 | ) \ | 62 | ) \ |
63 | { \ | 63 | { \ |
64 | { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ | 64 | { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ |
@@ -70,7 +70,7 @@ | |||
70 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \ | 70 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, KC_NO }, \ |
71 | { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \ | 71 | { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, KC_NO }, \ |
72 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \ | 72 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \ |
73 | { RE1, RE2, KC_NO, RE4, RE5, RE6, RE7, RE8, KC_NO } \ | 73 | { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \ |
74 | } | 74 | } |
75 | 75 | ||
76 | #define LAYOUT_65_with_macro( \ | 76 | #define LAYOUT_65_with_macro( \ |
@@ -78,7 +78,7 @@ | |||
78 | LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \ | 78 | LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \ |
79 | LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC8, RC9, \ | 79 | LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC8, RC9, \ |
80 | LD1, LD2, LD3, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, RD9, \ | 80 | LD1, LD2, LD3, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, RD9, \ |
81 | LE1, LE2, LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE4, RE5, RE6, RE7, RE8, RE9 \ | 81 | LE1, LE2, LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8, RE9 \ |
82 | ) \ | 82 | ) \ |
83 | { \ | 83 | { \ |
84 | { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ | 84 | { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ |
@@ -90,7 +90,7 @@ | |||
90 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \ | 90 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \ |
91 | { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \ | 91 | { RC1, RC2, RC3, RC4, RC5, RC6, KC_NO, RC8, RC9 }, \ |
92 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \ | 92 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \ |
93 | { RE1, RE2, KC_NO, RE4, RE5, RE6, RE7, RE8, RE9 } \ | 93 | { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \ |
94 | } | 94 | } |
95 | 95 | ||
96 | #define LAYOUT_60_iso( \ | 96 | #define LAYOUT_60_iso( \ |
@@ -98,7 +98,7 @@ | |||
98 | LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, \ | 98 | LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, \ |
99 | LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \ | 99 | LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \ |
100 | LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, \ | 100 | LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, \ |
101 | LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE4, RE5, RE6, RE7, RE8 \ | 101 | LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8 \ |
102 | ) \ | 102 | ) \ |
103 | { \ | 103 | { \ |
104 | { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ | 104 | { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ |
@@ -110,7 +110,7 @@ | |||
110 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \ | 110 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \ |
111 | { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \ | 111 | { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \ |
112 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \ | 112 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \ |
113 | { RE1, RE2, KC_NO, RE4, RE5, RE6, RE7, RE8, KC_NO } \ | 113 | { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \ |
114 | } | 114 | } |
115 | 115 | ||
116 | #define LAYOUT_65_iso( \ | 116 | #define LAYOUT_65_iso( \ |
@@ -118,7 +118,7 @@ | |||
118 | LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB9, \ | 118 | LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB9, \ |
119 | LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \ | 119 | LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \ |
120 | LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, RD9, \ | 120 | LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, RD9, \ |
121 | LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE4, RE5, RE6, RE7, RE8, RE9 \ | 121 | LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8, RE9 \ |
122 | ) \ | 122 | ) \ |
123 | { \ | 123 | { \ |
124 | { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ | 124 | { KC_NO, KC_NO, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ |
@@ -130,7 +130,7 @@ | |||
130 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \ | 130 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \ |
131 | { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \ | 131 | { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \ |
132 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \ | 132 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \ |
133 | { RE1, RE2, KC_NO, RE4, RE5, RE6, RE7, RE8, RE9 } \ | 133 | { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \ |
134 | } | 134 | } |
135 | 135 | ||
136 | #define LAYOUT_60_iso_with_macro( \ | 136 | #define LAYOUT_60_iso_with_macro( \ |
@@ -138,7 +138,7 @@ | |||
138 | LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, \ | 138 | LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, \ |
139 | LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \ | 139 | LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, \ |
140 | LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, \ | 140 | LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, \ |
141 | LE1, LE2, LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE4, RE5, RE6, RE7, RE8 \ | 141 | LE1, LE2, LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8 \ |
142 | ) \ | 142 | ) \ |
143 | { \ | 143 | { \ |
144 | { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ | 144 | { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ |
@@ -150,7 +150,7 @@ | |||
150 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \ | 150 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, KC_NO }, \ |
151 | { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \ | 151 | { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, KC_NO }, \ |
152 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \ | 152 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, KC_NO }, \ |
153 | { RE1, RE2, KC_NO, RE4, RE5, RE6, RE7, RE8, KC_NO } \ | 153 | { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, KC_NO } \ |
154 | } | 154 | } |
155 | 155 | ||
156 | #define LAYOUT_65_iso_with_macro( \ | 156 | #define LAYOUT_65_iso_with_macro( \ |
@@ -158,7 +158,7 @@ | |||
158 | LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB9, \ | 158 | LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB9, \ |
159 | LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \ | 159 | LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \ |
160 | LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, RD9, \ | 160 | LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, RD9, \ |
161 | LE1, LE2, LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE4, RE5, RE6, RE7, RE8, RE9 \ | 161 | LE1, LE2, LE3, LE4, LE5, LE6, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8, RE9 \ |
162 | ) \ | 162 | ) \ |
163 | { \ | 163 | { \ |
164 | { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ | 164 | { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ |
@@ -170,7 +170,7 @@ | |||
170 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \ | 170 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, KC_NO, RB9 }, \ |
171 | { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \ | 171 | { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \ |
172 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \ | 172 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \ |
173 | { RE1, RE2, KC_NO, RE4, RE5, RE6, RE7, RE8, RE9 } \ | 173 | { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \ |
174 | } | 174 | } |
175 | 175 | ||
176 | #define LAYOUT_all( \ | 176 | #define LAYOUT_all( \ |
@@ -178,7 +178,7 @@ | |||
178 | LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \ | 178 | LB1, LB2, LB3, LB4, LB5, LB6, LB7, LB8, RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9, \ |
179 | LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \ | 179 | LC1, LC2, LC3, LC4, LC5, LC6, LC7, LC8, RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9, \ |
180 | LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, RD9, \ | 180 | LD1, LD2, LD3, LD4, LD5, LD6, LD7, LD8, LD9, RD1, RD2, RD3, RD4, RD5, RD7, RD8, RD9, \ |
181 | LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, RE1, RE2, RE4, RE5, RE6, RE7, RE8, RE9 \ | 181 | LE1, LE2, LE3, LE4, LE5, LE6, LE7, LE8, RE1, RE2, RE3, RE4, RE5, RE7, RE8, RE9 \ |
182 | ) \ | 182 | ) \ |
183 | { \ | 183 | { \ |
184 | { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ | 184 | { LA1, LA2, LA3, LA4, LA5, LA6, LA7, LA8, LA9 }, \ |
@@ -190,5 +190,5 @@ | |||
190 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \ | 190 | { RB1, RB2, RB3, RB4, RB5, RB6, RB7, RB8, RB9 }, \ |
191 | { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \ | 191 | { RC1, RC2, RC3, RC4, RC5, RC6, RC7, RC8, RC9 }, \ |
192 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \ | 192 | { RD1, RD2, RD3, RD4, RD5, KC_NO, RD7, RD8, RD9 }, \ |
193 | { RE1, RE2, KC_NO, RE4, RE5, RE6, RE7, RE8, RE9 } \ | 193 | { RE1, RE2, RE3, RE4, RE5, KC_NO, RE7, RE8, RE9 } \ |
194 | } | 194 | } |