aboutsummaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-08-07 06:52:44 +0000
committerQMK Bot <hello@qmk.fm>2021-08-07 06:52:44 +0000
commit0bc9090b1f98038b2bf4f648618d6143dcd93c82 (patch)
treef442236c95ad19e85b3c6a98c2d135c2d7ef293e /keyboards
parent7b709aaecc4e27dc289c67b90203810df3debe49 (diff)
parent85c32da9896f6f7fb16b911c3cd49cec80655139 (diff)
downloadqmk_firmware-0bc9090b1f98038b2bf4f648618d6143dcd93c82.tar.gz
qmk_firmware-0bc9090b1f98038b2bf4f648618d6143dcd93c82.zip
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/kb_elmo/67mk_e/67mk_e.c17
-rw-r--r--keyboards/kb_elmo/67mk_e/67mk_e.h105
-rw-r--r--keyboards/kb_elmo/67mk_e/config.h44
-rw-r--r--keyboards/kb_elmo/67mk_e/info.json440
-rw-r--r--keyboards/kb_elmo/67mk_e/keymaps/default/keymap.c33
-rw-r--r--keyboards/kb_elmo/67mk_e/keymaps/via/keymap.c47
-rw-r--r--keyboards/kb_elmo/67mk_e/keymaps/via/rules.mk2
-rw-r--r--keyboards/kb_elmo/67mk_e/readme.md21
-rw-r--r--keyboards/kb_elmo/67mk_e/rules.mk24
-rwxr-xr-xkeyboards/melgeek/mojo68/rev1/config.h2
10 files changed, 734 insertions, 1 deletions
diff --git a/keyboards/kb_elmo/67mk_e/67mk_e.c b/keyboards/kb_elmo/67mk_e/67mk_e.c
new file mode 100644
index 000000000..31254fe96
--- /dev/null
+++ b/keyboards/kb_elmo/67mk_e/67mk_e.c
@@ -0,0 +1,17 @@
1/* Copyright 2021 kb-elmo<mail@elmo.space>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#include "67mk_e.h"
diff --git a/keyboards/kb_elmo/67mk_e/67mk_e.h b/keyboards/kb_elmo/67mk_e/67mk_e.h
new file mode 100644
index 000000000..5cf13408a
--- /dev/null
+++ b/keyboards/kb_elmo/67mk_e/67mk_e.h
@@ -0,0 +1,105 @@
1/* Copyright 2021 kb-elmo<mail@elmo.space>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16
17#pragma once
18
19#include "quantum.h"
20
21#define ____ KC_NO
22
23#define LAYOUT_all( \
24 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
25 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
26 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \
27 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
28 k400, k401, k402, k406, k411, k412, k413, k414, k415 \
29) { \
30 { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 }, \
31 { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
32 { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
33 { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
34 { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 } \
35}
36
37#define LAYOUT_65_ansi_blocker( \
38 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k015, \
39 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
40 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \
41 k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
42 k400, k401, k402, k406, k411, k412, k413, k414, k415 \
43) { \
44 { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, ____, k015 }, \
45 { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
46 { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
47 { k300, ____, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
48 { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 } \
49}
50
51#define LAYOUT_65_ansi_blocker_split_bs( \
52 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
53 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
54 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \
55 k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
56 k400, k401, k402, k406, k411, k412, k413, k414, k415 \
57) { \
58 { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 }, \
59 { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
60 { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
61 { k300, ____, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
62 { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 } \
63}
64
65#define LAYOUT_65_ansi_blocker_tsangan( \
66 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k015, \
67 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k115, \
68 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k213, k215, \
69 k300, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
70 k400, k401, k402, k406, k412, k413, k414, k415 \
71) { \
72 { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, ____, k015 }, \
73 { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
74 { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
75 { k300, ____, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
76 { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, ____, k412, k413, k414, k415 } \
77}
78
79#define LAYOUT_65_iso_blocker( \
80 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k015, \
81 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k115, \
82 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k113, k213, k215, \
83 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
84 k400, k401, k402, k406, k411, k412, k413, k414, k415 \
85) { \
86 { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, ____, k015 }, \
87 { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
88 { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
89 { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
90 { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 } \
91}
92
93#define LAYOUT_65_iso_blocker_split_bs( \
94 k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015, \
95 k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k115, \
96 k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, k113, k213, k215, \
97 k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, k114, \
98 k400, k401, k402, k406, k411, k412, k413, k414, k415 \
99) { \
100 { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k012, k013, k014, k015 }, \
101 { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, k112, k113, k114, k115 }, \
102 { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, ____, k213, ____, k215 }, \
103 { k300, k301, k302, k303, k304, k305, k306, k307, k308, k309, k310, k311, k312, k313, ____, ____ }, \
104 { k400, k401, k402, ____, ____, ____, k406, ____, ____, ____, ____, k411, k412, k413, k414, k415 } \
105}
diff --git a/keyboards/kb_elmo/67mk_e/config.h b/keyboards/kb_elmo/67mk_e/config.h
new file mode 100644
index 000000000..60c90ed52
--- /dev/null
+++ b/keyboards/kb_elmo/67mk_e/config.h
@@ -0,0 +1,44 @@
1/*
2Copyright 2021 kb-elmo<mail@elmo.space>
3
4This program is free software: you can redistribute it and/or modify
5it under the terms of the GNU General Public License as published by
6the Free Software Foundation, either version 2 of the License, or
7(at your option) any later version.
8
9This program is distributed in the hope that it will be useful,
10but WITHOUT ANY WARRANTY; without even the implied warranty of
11MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
12GNU General Public License for more details.
13
14You should have received a copy of the GNU General Public License
15along with this program. If not, see <http://www.gnu.org/licenses/>.
16*/
17
18#pragma once
19
20#include "config_common.h"
21
22/* USB Device descriptor parameter */
23#define VENDOR_ID 0xA68C
24#define PRODUCT_ID 0xD03E
25#define DEVICE_VER 0x0001
26#define MANUFACTURER kb_elmo
27#define PRODUCT 67mk_E
28
29/* key matrix size */
30#define MATRIX_ROWS 5
31#define MATRIX_COLS 16
32
33/* Keyboard Matrix Assignments */
34#define MATRIX_ROW_PINS { D7, B4, D6, D5, B0 }
35#define MATRIX_COL_PINS { B3, B2, B1, D4, D2, D3, C7, C6, B5, B6, F7, F6, F5, F0, F1, F4 }
36
37/* COL2ROW, ROW2COL */
38#define DIODE_DIRECTION COL2ROW
39
40/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
41#define DEBOUNCE 5
42
43/* Indicator LEDs */
44#define LED_CAPS_LOCK_PIN B7
diff --git a/keyboards/kb_elmo/67mk_e/info.json b/keyboards/kb_elmo/67mk_e/info.json
new file mode 100644
index 000000000..3cb6cd04e
--- /dev/null
+++ b/keyboards/kb_elmo/67mk_e/info.json
@@ -0,0 +1,440 @@
1{
2 "keyboard_name": "67mk_e",
3 "url": "",
4 "maintainer": "kb-elmo",
5 "width": 16,
6 "height": 5,
7 "layouts": {
8 "LAYOUT_all": {
9 "layout": [
10 {"x":0, "y":0},
11 {"x":1, "y":0},
12 {"x":2, "y":0},
13 {"x":3, "y":0},
14 {"x":4, "y":0},
15 {"x":5, "y":0},
16 {"x":6, "y":0},
17 {"x":7, "y":0},
18 {"x":8, "y":0},
19 {"x":9, "y":0},
20 {"x":10, "y":0},
21 {"x":11, "y":0},
22 {"x":12, "y":0},
23 {"x":13, "y":0},
24 {"x":14, "y":0},
25 {"x":15, "y":0},
26 {"x":0, "y":1, "w":1.5},
27 {"x":1.5, "y":1},
28 {"x":2.5, "y":1},
29 {"x":3.5, "y":1},
30 {"x":4.5, "y":1},
31 {"x":5.5, "y":1},
32 {"x":6.5, "y":1},
33 {"x":7.5, "y":1},
34 {"x":8.5, "y":1},
35 {"x":9.5, "y":1},
36 {"x":10.5, "y":1},
37 {"x":11.5, "y":1},
38 {"x":12.5, "y":1},
39 {"x":13.5, "y":1, "w":1.5},
40 {"x":15, "y":1},
41 {"x":0, "y":2, "w":1.75},
42 {"x":1.75, "y":2},
43 {"x":2.75, "y":2},
44 {"x":3.75, "y":2},
45 {"x":4.75, "y":2},
46 {"x":5.75, "y":2},
47 {"x":6.75, "y":2},
48 {"x":7.75, "y":2},
49 {"x":8.75, "y":2},
50 {"x":9.75, "y":2},
51 {"x":10.75, "y":2},
52 {"x":11.75, "y":2},
53 {"x":12.75, "y":2, "w":2.25},
54 {"x":15, "y":2},
55 {"x":0, "y":3, "w":1.25},
56 {"x":1.25, "y":3},
57 {"x":2.25, "y":3},
58 {"x":3.25, "y":3},
59 {"x":4.25, "y":3},
60 {"x":5.25, "y":3},
61 {"x":6.25, "y":3},
62 {"x":7.25, "y":3},
63 {"x":8.25, "y":3},
64 {"x":9.25, "y":3},
65 {"x":10.25, "y":3},
66 {"x":11.25, "y":3},
67 {"x":12.25, "y":3, "w":1.75},
68 {"x":14, "y":3},
69 {"x":15, "y":3},
70 {"x":0, "y":4, "w":1.25},
71 {"x":1.25, "y":4, "w":1.25},
72 {"x":2.5, "y":4, "w":1.25},
73 {"x":3.75, "y":4, "w":6.25},
74 {"x":10, "y":4, "w":1.25},
75 {"x":11.25, "y":4, "w":1.25},
76 {"x":13, "y":4},
77 {"x":14, "y":4},
78 {"x":15, "y":4}
79 ]
80 },
81 "LAYOUT_65_ansi_blocker": {
82 "layout": [
83 {"x":0, "y":0},
84 {"x":1, "y":0},
85 {"x":2, "y":0},
86 {"x":3, "y":0},
87 {"x":4, "y":0},
88 {"x":5, "y":0},
89 {"x":6, "y":0},
90 {"x":7, "y":0},
91 {"x":8, "y":0},
92 {"x":9, "y":0},
93 {"x":10, "y":0},
94 {"x":11, "y":0},
95 {"x":12, "y":0},
96 {"x":13, "y":0, "w":2},
97 {"x":15, "y":0},
98 {"x":0, "y":1, "w":1.5},
99 {"x":1.5, "y":1},
100 {"x":2.5, "y":1},
101 {"x":3.5, "y":1},
102 {"x":4.5, "y":1},
103 {"x":5.5, "y":1},
104 {"x":6.5, "y":1},
105 {"x":7.5, "y":1},
106 {"x":8.5, "y":1},
107 {"x":9.5, "y":1},
108 {"x":10.5, "y":1},
109 {"x":11.5, "y":1},
110 {"x":12.5, "y":1},
111 {"x":13.5, "y":1, "w":1.5},
112 {"x":15, "y":1},
113 {"x":0, "y":2, "w":1.75},
114 {"x":1.75, "y":2},
115 {"x":2.75, "y":2},
116 {"x":3.75, "y":2},
117 {"x":4.75, "y":2},
118 {"x":5.75, "y":2},
119 {"x":6.75, "y":2},
120 {"x":7.75, "y":2},
121 {"x":8.75, "y":2},
122 {"x":9.75, "y":2},
123 {"x":10.75, "y":2},
124 {"x":11.75, "y":2},
125 {"x":12.75, "y":2, "w":2.25},
126 {"x":15, "y":2},
127 {"x":0, "y":3, "w":2.25},
128 {"x":2.25, "y":3},
129 {"x":3.25, "y":3},
130 {"x":4.25, "y":3},
131 {"x":5.25, "y":3},
132 {"x":6.25, "y":3},
133 {"x":7.25, "y":3},
134 {"x":8.25, "y":3},
135 {"x":9.25, "y":3},
136 {"x":10.25, "y":3},
137 {"x":11.25, "y":3},
138 {"x":12.25, "y":3, "w":1.75},
139 {"x":14, "y":3},
140 {"x":15, "y":3},
141 {"x":0, "y":4, "w":1.25},
142 {"x":1.25, "y":4, "w":1.25},
143 {"x":2.5, "y":4, "w":1.25},
144 {"x":3.75, "y":4, "w":6.25},
145 {"x":10, "y":4, "w":1.25},
146 {"x":11.25, "y":4, "w":1.25},
147 {"x":13, "y":4},
148 {"x":14, "y":4},
149 {"x":15, "y":4}
150 ]
151 },
152 "LAYOUT_65_ansi_blocker_split_bs": {
153 "layout": [
154 {"x":0, "y":0},
155 {"x":1, "y":0},
156 {"x":2, "y":0},
157 {"x":3, "y":0},
158 {"x":4, "y":0},
159 {"x":5, "y":0},
160 {"x":6, "y":0},
161 {"x":7, "y":0},
162 {"x":8, "y":0},
163 {"x":9, "y":0},
164 {"x":10, "y":0},
165 {"x":11, "y":0},
166 {"x":12, "y":0},
167 {"x":13, "y":0},
168 {"x":14, "y":0},
169 {"x":15, "y":0},
170 {"x":0, "y":1, "w":1.5},
171 {"x":1.5, "y":1},
172 {"x":2.5, "y":1},
173 {"x":3.5, "y":1},
174 {"x":4.5, "y":1},
175 {"x":5.5, "y":1},
176 {"x":6.5, "y":1},
177 {"x":7.5, "y":1},
178 {"x":8.5, "y":1},
179 {"x":9.5, "y":1},
180 {"x":10.5, "y":1},
181 {"x":11.5, "y":1},
182 {"x":12.5, "y":1},
183 {"x":13.5, "y":1, "w":1.5},
184 {"x":15, "y":1},
185 {"x":0, "y":2, "w":1.75},
186 {"x":1.75, "y":2},
187 {"x":2.75, "y":2},
188 {"x":3.75, "y":2},
189 {"x":4.75, "y":2},
190 {"x":5.75, "y":2},
191 {"x":6.75, "y":2},
192 {"x":7.75, "y":2},
193 {"x":8.75, "y":2},
194 {"x":9.75, "y":2},
195 {"x":10.75, "y":2},
196 {"x":11.75, "y":2},
197 {"x":12.75, "y":2, "w":2.25},
198 {"x":15, "y":2},
199 {"x":0, "y":3, "w":2.25},
200 {"x":2.25, "y":3},
201 {"x":3.25, "y":3},
202 {"x":4.25, "y":3},
203 {"x":5.25, "y":3},
204 {"x":6.25, "y":3},
205 {"x":7.25, "y":3},
206 {"x":8.25, "y":3},
207 {"x":9.25, "y":3},
208 {"x":10.25, "y":3},
209 {"x":11.25, "y":3},
210 {"x":12.25, "y":3, "w":1.75},
211 {"x":14, "y":3},
212 {"x":15, "y":3},
213 {"x":0, "y":4, "w":1.25},
214 {"x":1.25, "y":4, "w":1.25},
215 {"x":2.5, "y":4, "w":1.25},
216 {"x":3.75, "y":4, "w":6.25},
217 {"x":10, "y":4, "w":1.25},
218 {"x":11.25, "y":4, "w":1.25},
219 {"x":13, "y":4},
220 {"x":14, "y":4},
221 {"x":15, "y":4}
222 ]
223 },
224 "LAYOUT_65_ansi_blocker_tsangan": {
225 "layout": [
226 {"x":0, "y":0},
227 {"x":1, "y":0},
228 {"x":2, "y":0},
229 {"x":3, "y":0},
230 {"x":4, "y":0},
231 {"x":5, "y":0},
232 {"x":6, "y":0},
233 {"x":7, "y":0},
234 {"x":8, "y":0},
235 {"x":9, "y":0},
236 {"x":10, "y":0},
237 {"x":11, "y":0},
238 {"x":12, "y":0},
239 {"x":13, "y":0, "w":2},
240 {"x":15, "y":0},
241 {"x":0, "y":1, "w":1.5},
242 {"x":1.5, "y":1},
243 {"x":2.5, "y":1},
244 {"x":3.5, "y":1},
245 {"x":4.5, "y":1},
246 {"x":5.5, "y":1},
247 {"x":6.5, "y":1},
248 {"x":7.5, "y":1},
249 {"x":8.5, "y":1},
250 {"x":9.5, "y":1},
251 {"x":10.5, "y":1},
252 {"x":11.5, "y":1},
253 {"x":12.5, "y":1},
254 {"x":13.5, "y":1, "w":1.5},
255 {"x":15, "y":1},
256 {"x":0, "y":2, "w":1.75},
257 {"x":1.75, "y":2},
258 {"x":2.75, "y":2},
259 {"x":3.75, "y":2},
260 {"x":4.75, "y":2},
261 {"x":5.75, "y":2},
262 {"x":6.75, "y":2},
263 {"x":7.75, "y":2},
264 {"x":8.75, "y":2},
265 {"x":9.75, "y":2},
266 {"x":10.75, "y":2},
267 {"x":11.75, "y":2},
268 {"x":12.75, "y":2, "w":2.25},
269 {"x":15, "y":2},
270 {"x":0, "y":3, "w":2.25},
271 {"x":2.25, "y":3},
272 {"x":3.25, "y":3},
273 {"x":4.25, "y":3},
274 {"x":5.25, "y":3},
275 {"x":6.25, "y":3},
276 {"x":7.25, "y":3},
277 {"x":8.25, "y":3},
278 {"x":9.25, "y":3},
279 {"x":10.25, "y":3},
280 {"x":11.25, "y":3},
281 {"x":12.25, "y":3, "w":1.75},
282 {"x":14, "y":3},
283 {"x":15, "y":3},
284 {"x":0, "y":4, "w":1.5},
285 {"x":1.5, "y":4},
286 {"x":2.5, "y":4, "w":1.5},
287 {"x":4, "y":4, "w":7},
288 {"x":11, "y":4, "w":1.5},
289 {"x":13, "y":4},
290 {"x":14, "y":4},
291 {"x":15, "y":4}
292 ]
293 },
294 "LAYOUT_65_iso_blocker": {
295 "layout": [
296 {"x":0, "y":0},
297 {"x":1, "y":0},
298 {"x":2, "y":0},
299 {"x":3, "y":0},
300 {"x":4, "y":0},
301 {"x":5, "y":0},
302 {"x":6, "y":0},
303 {"x":7, "y":0},
304 {"x":8, "y":0},
305 {"x":9, "y":0},
306 {"x":10, "y":0},
307 {"x":11, "y":0},
308 {"x":12, "y":0},
309 {"x":13, "y":0, "w":2},
310 {"x":15, "y":0},
311 {"x":0, "y":1, "w":1.5},
312 {"x":1.5, "y":1},
313 {"x":2.5, "y":1},
314 {"x":3.5, "y":1},
315 {"x":4.5, "y":1},
316 {"x":5.5, "y":1},
317 {"x":6.5, "y":1},
318 {"x":7.5, "y":1},
319 {"x":8.5, "y":1},
320 {"x":9.5, "y":1},
321 {"x":10.5, "y":1},
322 {"x":11.5, "y":1},
323 {"x":12.5, "y":1},
324 {"x":15, "y":1},
325 {"x":0, "y":2, "w":1.75},
326 {"x":1.75, "y":2},
327 {"x":2.75, "y":2},
328 {"x":3.75, "y":2},
329 {"x":4.75, "y":2},
330 {"x":5.75, "y":2},
331 {"x":6.75, "y":2},
332 {"x":7.75, "y":2},
333 {"x":8.75, "y":2},
334 {"x":9.75, "y":2},
335 {"x":10.75, "y":2},
336 {"x":11.75, "y":2},
337 {"x":12.75, "y":2},
338 {"x":13.75, "y":1, "w":1.25, "h":2},
339 {"x":15, "y":2},
340 {"x":0, "y":3, "w":1.25},
341 {"x":1.25, "y":3},
342 {"x":2.25, "y":3},
343 {"x":3.25, "y":3},
344 {"x":4.25, "y":3},
345 {"x":5.25, "y":3},
346 {"x":6.25, "y":3},
347 {"x":7.25, "y":3},
348 {"x":8.25, "y":3},
349 {"x":9.25, "y":3},
350 {"x":10.25, "y":3},
351 {"x":11.25, "y":3},
352 {"x":12.25, "y":3, "w":1.75},
353 {"x":14, "y":3},
354 {"x":15, "y":3},
355 {"x":0, "y":4, "w":1.25},
356 {"x":1.25, "y":4, "w":1.25},
357 {"x":2.5, "y":4, "w":1.25},
358 {"x":3.75, "y":4, "w":6.25},
359 {"x":10, "y":4, "w":1.25},
360 {"x":11.25, "y":4, "w":1.25},
361 {"x":13, "y":4},
362 {"x":14, "y":4},
363 {"x":15, "y":4}
364 ]
365 },
366 "LAYOUT_65_iso_blocker_split_bs": {
367 "layout": [
368 {"x":0, "y":0},
369 {"x":1, "y":0},
370 {"x":2, "y":0},
371 {"x":3, "y":0},
372 {"x":4, "y":0},
373 {"x":5, "y":0},
374 {"x":6, "y":0},
375 {"x":7, "y":0},
376 {"x":8, "y":0},
377 {"x":9, "y":0},
378 {"x":10, "y":0},
379 {"x":11, "y":0},
380 {"x":12, "y":0},
381 {"x":13, "y":0},
382 {"x":14, "y":0},
383 {"x":15, "y":0},
384 {"x":0, "y":1, "w":1.5},
385 {"x":1.5, "y":1},
386 {"x":2.5, "y":1},
387 {"x":3.5, "y":1},
388 {"x":4.5, "y":1},
389 {"x":5.5, "y":1},
390 {"x":6.5, "y":1},
391 {"x":7.5, "y":1},
392 {"x":8.5, "y":1},
393 {"x":9.5, "y":1},
394 {"x":10.5, "y":1},
395 {"x":11.5, "y":1},
396 {"x":12.5, "y":1},
397 {"x":15, "y":1},
398 {"x":0, "y":2, "w":1.75},
399 {"x":1.75, "y":2},
400 {"x":2.75, "y":2},
401 {"x":3.75, "y":2},
402 {"x":4.75, "y":2},
403 {"x":5.75, "y":2},
404 {"x":6.75, "y":2},
405 {"x":7.75, "y":2},
406 {"x":8.75, "y":2},
407 {"x":9.75, "y":2},
408 {"x":10.75, "y":2},
409 {"x":11.75, "y":2},
410 {"x":12.75, "y":2},
411 {"x":13.75, "y":1, "w":1.25, "h":2},
412 {"x":15, "y":2},
413 {"x":0, "y":3, "w":1.25},
414 {"x":1.25, "y":3},
415 {"x":2.25, "y":3},
416 {"x":3.25, "y":3},
417 {"x":4.25, "y":3},
418 {"x":5.25, "y":3},
419 {"x":6.25, "y":3},
420 {"x":7.25, "y":3},
421 {"x":8.25, "y":3},
422 {"x":9.25, "y":3},
423 {"x":10.25, "y":3},
424 {"x":11.25, "y":3},
425 {"x":12.25, "y":3, "w":1.75},
426 {"x":14, "y":3},
427 {"x":15, "y":3},
428 {"x":0, "y":4, "w":1.25},
429 {"x":1.25, "y":4, "w":1.25},
430 {"x":2.5, "y":4, "w":1.25},
431 {"x":3.75, "y":4, "w":6.25},
432 {"x":10, "y":4, "w":1.25},
433 {"x":11.25, "y":4, "w":1.25},
434 {"x":13, "y":4},
435 {"x":14, "y":4},
436 {"x":15, "y":4}
437 ]
438 }
439 }
440} \ No newline at end of file
diff --git a/keyboards/kb_elmo/67mk_e/keymaps/default/keymap.c b/keyboards/kb_elmo/67mk_e/keymaps/default/keymap.c
new file mode 100644
index 000000000..0da6b59a0
--- /dev/null
+++ b/keyboards/kb_elmo/67mk_e/keymaps/default/keymap.c
@@ -0,0 +1,33 @@
1/* Copyright 2021 kb-elmo<mail@elmo.space>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 [0] = LAYOUT_65_ansi_blocker(
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_BSPC, KC_DEL,
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, KC_HOME,
22 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, KC_PGUP,
23 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_PGDN,
24 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
25 ),
26 [1] = LAYOUT_65_ansi_blocker(
27 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_TRNS, KC_TRNS,
28 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_END,
29 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,
30 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,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
32 )
33};
diff --git a/keyboards/kb_elmo/67mk_e/keymaps/via/keymap.c b/keyboards/kb_elmo/67mk_e/keymaps/via/keymap.c
new file mode 100644
index 000000000..4b9cb0fcc
--- /dev/null
+++ b/keyboards/kb_elmo/67mk_e/keymaps/via/keymap.c
@@ -0,0 +1,47 @@
1/* Copyright 2021 kb-elmo<mail@elmo.space>
2 *
3 * This program is free software: you can redistribute it and/or modify
4 * it under the terms of the GNU General Public License as published by
5 * the Free Software Foundation, either version 2 of the License, or
6 * (at your option) any later version.
7 *
8 * This program is distributed in the hope that it will be useful,
9 * but WITHOUT ANY WARRANTY; without even the implied warranty of
10 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
11 * GNU General Public License for more details.
12 *
13 * You should have received a copy of the GNU General Public License
14 * along with this program. If not, see <http://www.gnu.org/licenses/>.
15 */
16#include QMK_KEYBOARD_H
17
18const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
19 [0] = LAYOUT_all(
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_BSPC, KC_BSPC, KC_DEL,
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, KC_HOME,
22 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, KC_PGUP,
23 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,
24 KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_LEFT, KC_DOWN, KC_RGHT
25 ),
26 [1] = LAYOUT_all(
27 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_TRNS, KC_TRNS, KC_TRNS,
28 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_END,
29 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,
30 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_MPRV, KC_MNXT, KC_MPLY, KC_TRNS, KC_TRNS, KC_TRNS,
31 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
32 ),
33 [2] = LAYOUT_all(
34 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
35 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,
36 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,
37 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,
38 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
39 ),
40 [3] = LAYOUT_all(
41 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,
42 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,
43 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,
44 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,
45 KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS
46 )
47};
diff --git a/keyboards/kb_elmo/67mk_e/keymaps/via/rules.mk b/keyboards/kb_elmo/67mk_e/keymaps/via/rules.mk
new file mode 100644
index 000000000..36b7ba9cb
--- /dev/null
+++ b/keyboards/kb_elmo/67mk_e/keymaps/via/rules.mk
@@ -0,0 +1,2 @@
1VIA_ENABLE = yes
2LTO_ENABLE = yes
diff --git a/keyboards/kb_elmo/67mk_e/readme.md b/keyboards/kb_elmo/67mk_e/readme.md
new file mode 100644
index 000000000..ddf931655
--- /dev/null
+++ b/keyboards/kb_elmo/67mk_e/readme.md
@@ -0,0 +1,21 @@
1# 67mk_E
2
3![67mk_e](https://i.imgur.com/EnMy6IYl.jpg)
4
5A simple "no frills" drop-in replacement PCB for the KBDfans 67mkII / 67lite
6
7* Keyboard Maintainer: [kb-elmo](https://github.com/kb-elmo)
8* Hardware Supported: 67mk_E rev.1 PCB
9* Hardware Availability: [Open source project](https://github.com/kb-elmo/67mk_e)
10
11Make example for this keyboard (after setting up your build environment):
12
13 make kb_elmo/67mk_e:default
14
15Flashing example for this keyboard:
16
17 make kb_elmo/67mk_e:default:flash
18
19**Bootloader:** Press the physical reset button on the bottom side of the PCB (labeled Reset) or hold down the top left key while plugging in the board.
20
21See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/kb_elmo/67mk_e/rules.mk b/keyboards/kb_elmo/67mk_e/rules.mk
new file mode 100644
index 000000000..042f4691f
--- /dev/null
+++ b/keyboards/kb_elmo/67mk_e/rules.mk
@@ -0,0 +1,24 @@
1# MCU name
2MCU = atmega32u4
3
4# Bootloader selection
5BOOTLOADER = atmel-dfu
6
7# Build Options
8# change yes to no to disable
9#
10BOOTMAGIC_ENABLE = lite # Virtual DIP switch configuration
11MOUSEKEY_ENABLE = no # Mouse keys
12EXTRAKEY_ENABLE = yes # Audio control and System control
13CONSOLE_ENABLE = no # Console for debug
14COMMAND_ENABLE = no # Commands for debug and configuration
15# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
16SLEEP_LED_ENABLE = no # Breathing sleep LED during USB suspend
17# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
18NKRO_ENABLE = no # USB Nkey Rollover
19BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality
20RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow
21BLUETOOTH_ENABLE = no # Enable Bluetooth
22AUDIO_ENABLE = no # Audio output
23
24LAYOUTS = 65_ansi_blocker 65_ansi_blocker_split_bs 65_ansi_blocker_tsangan 65_iso_blocker 65_iso_blocker_split_bs
diff --git a/keyboards/melgeek/mojo68/rev1/config.h b/keyboards/melgeek/mojo68/rev1/config.h
index febdab8a3..aed2a45c3 100755
--- a/keyboards/melgeek/mojo68/rev1/config.h
+++ b/keyboards/melgeek/mojo68/rev1/config.h
@@ -28,7 +28,7 @@
28 */ 28 */
29 29
30#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 } 30#define MATRIX_ROW_PINS { F0, F1, F4, F5, F6 }
31#define MATRIX_COL_PINS { B0 ,B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, E2 } 31#define MATRIX_COL_PINS { B0 ,B1, B2, B3, D2, D5, D4, D6, D7, B4, B5, B6, C6, C7, F7 }
32#define UNUSED_PINS 32#define UNUSED_PINS
33 33
34/* COL2ROW, ROW2COL*/ 34/* COL2ROW, ROW2COL*/