summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
authorQMK Bot <hello@qmk.fm>2021-04-12 17:56:32 +0000
committerQMK Bot <hello@qmk.fm>2021-04-12 17:56:32 +0000
commitebdf750cdd6d1bdf00a1cd95f117eb8495173273 (patch)
tree6363c3d22a587183a66077f052b263eda08674c9 /keyboards
parent79bdfc1110956f29eade6bc106bd43de2d4b17db (diff)
parent50e0f5dc802c881eae0c213ee50c7bb8f0065cf0 (diff)
Merge remote-tracking branch 'origin/master' into develop
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/lazydesigners/the40/info.json66
-rw-r--r--keyboards/lazydesigners/the40/keymaps/ortho/keymap.c41
-rw-r--r--keyboards/lazydesigners/the40/readme.md9
-rw-r--r--keyboards/lazydesigners/the40/the40.h26
4 files changed, 98 insertions, 44 deletions
diff --git a/keyboards/lazydesigners/the40/info.json b/keyboards/lazydesigners/the40/info.json
index a02a88a049..6e145bbb7c 100644
--- a/keyboards/lazydesigners/the40/info.json
+++ b/keyboards/lazydesigners/the40/info.json
@@ -51,7 +51,7 @@
{"label":"K310 (F5,D2)", "x":10.75, "y":3, "w":1.25}
]
},
- "LAYOUT_hhkb": {
+ "LAYOUT_ortho": {
"layout": [
{"label":"K000 (D0,F4)", "x":0, "y":0},
{"label":"K001 (D0,F6)", "x":1, "y":0},
@@ -65,34 +65,42 @@
{"label":"K009 (D0,D3)", "x":9, "y":0},
{"label":"K010 (D0,D2)", "x":10, "y":0},
{"label":"K011 (D0,B0)", "x":11, "y":0},
- {"label":"K100 (D1,F4)", "x":0, "y":1, "w":1.25},
- {"label":"K101 (D1,F6)", "x":1.25, "y":1},
- {"label":"K102 (D1,F7)", "x":2.25, "y":1},
- {"label":"K103 (D1,B5)", "x":3.25, "y":1},
- {"label":"K104 (D1,B4)", "x":4.25, "y":1},
- {"label":"K105 (D1,D7)", "x":5.25, "y":1},
- {"label":"K106 (D1,D6)", "x":6.25, "y":1},
- {"label":"K107 (D1,D4)", "x":7.25, "y":1},
- {"label":"K108 (D1,D5)", "x":8.25, "y":1},
- {"label":"K109 (D1,D3)", "x":9.25, "y":1},
- {"label":"K110 (D1,D2)", "x":10.25, "y":1, "w":1.75},
- {"label":"K200 (B6,F4)", "x":0, "y":2, "w":1.75},
- {"label":"K201 (B6,F6)", "x":1.75, "y":2},
- {"label":"K202 (B6,F7)", "x":2.75, "y":2},
- {"label":"K203 (B6,B5)", "x":3.75, "y":2},
- {"label":"K204 (B6,B4)", "x":4.75, "y":2},
- {"label":"K205 (B6,D7)", "x":5.75, "y":2},
- {"label":"K206 (B6,D6)", "x":6.75, "y":2},
- {"label":"K207 (B6,D4)", "x":7.75, "y":2},
- {"label":"K208 (B6,D5)", "x":8.75, "y":2},
- {"label":"K209 (B6,D3)", "x":9.75, "y":2},
- {"label":"K210 (B6,D2)", "x":10.75, "y":2, "w":1.25},
- {"label":"K301 (F5,F6)", "x":1.25, "y":3},
- {"label":"K302 (F5,F7)", "x":2.25, "y":3, "w":1.25},
- {"label":"K304 (F5,B4)", "x":3.5, "y":3, "w":2.25},
- {"label":"K306 (F5,D6)", "x":5.75, "y":3, "w":2.75},
- {"label":"K308 (F5,D5)", "x":8.5, "y":3, "w":1.25},
- {"label":"K309 (F5,D3)", "x":9.75, "y":3}
+ {"label":"K100 (D1,F4)", "x":0, "y":1},
+ {"label":"K101 (D1,F6)", "x":1, "y":1},
+ {"label":"K102 (D1,F7)", "x":2, "y":1},
+ {"label":"K103 (D1,B5)", "x":3, "y":1},
+ {"label":"K104 (D1,B4)", "x":4, "y":1},
+ {"label":"K105 (D1,D7)", "x":5, "y":1},
+ {"label":"K106 (D1,D6)", "x":6, "y":1},
+ {"label":"K107 (D1,D4)", "x":7, "y":1},
+ {"label":"K108 (D1,D5)", "x":8, "y":1},
+ {"label":"K109 (D1,D3)", "x":9, "y":1},
+ {"label":"K110 (D1,D2)", "x":10, "y":1},
+ {"label":"K111 (D1,B0)", "x":11, "y":1},
+ {"label":"K200 (B6,F4)", "x":0, "y":2},
+ {"label":"K201 (B6,F6)", "x":1, "y":2},
+ {"label":"K202 (B6,F7)", "x":2, "y":2},
+ {"label":"K203 (B6,B5)", "x":3, "y":2},
+ {"label":"K204 (B6,B4)", "x":4, "y":2},
+ {"label":"K205 (B6,D7)", "x":5, "y":2},
+ {"label":"K206 (B6,D6)", "x":6, "y":2},
+ {"label":"K207 (B6,D4)", "x":7, "y":2},
+ {"label":"K208 (B6,D5)", "x":8, "y":2},
+ {"label":"K209 (B6,D3)", "x":9, "y":2},
+ {"label":"K210 (B6,D2)", "x":10, "y":2},
+ {"label":"K211 (B6,B0)", "x":11, "y":2},
+ {"label":"K300 (F5,F4)", "x":0, "y":3},
+ {"label":"K301 (F5,F6)", "x":1, "y":3},
+ {"label":"K302 (F5,F7)", "x":2, "y":3},
+ {"label":"K303 (F5,B5)", "x":3, "y":3},
+ {"label":"K304 (F5,B4)", "x":4, "y":3},
+ {"label":"K305 (F5,D7)", "x":5, "y":3},
+ {"label":"K306 (F5,D6)", "x":6, "y":3},
+ {"label":"K307 (F5,D4)", "x":7, "y":3},
+ {"label":"K308 (F5,D5)", "x":8, "y":3},
+ {"label":"K309 (F5,D3)", "x":9, "y":3},
+ {"label":"K310 (F5,D2)", "x":10, "y":3},
+ {"label":"K311 (F5,B0)", "x":11, "y":3}
]
},
"LAYOUT_wkl": {
diff --git a/keyboards/lazydesigners/the40/keymaps/ortho/keymap.c b/keyboards/lazydesigners/the40/keymaps/ortho/keymap.c
new file mode 100644
index 0000000000..e81bdaa1c7
--- /dev/null
+++ b/keyboards/lazydesigners/the40/keymaps/ortho/keymap.c
@@ -0,0 +1,41 @@
+/* Copyright 2020 LAZYDESIGNERS
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see <http://www.gnu.org/licenses/>.
+ */
+
+#include QMK_KEYBOARD_H
+
+#define LT2_TAB LT(2, KC_TAB)
+#define LT1_SPC LT(1, KC_SPC)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [0] = LAYOUT_ortho(
+ KC_ESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC,
+ LT2_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCOLON, KC_ENT,
+ KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMMA, KC_DOT, KC_QUOTE, MO(2),
+ KC_LCTL, KC_LGUI, KC_RALT, KC_LSFT, LT1_SPC, KC_SPC, KC_SPC, KC_SPC, KC_UP, KC_DOWN, KC_LEFT, KC_RGHT
+ ),
+ [1] = LAYOUT_ortho(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_NO,
+ RESET, KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_MINS, KC_EQL, KC_LBRC, KC_RBRC, KC_NO,
+ KC_NO, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO,
+ KC_VOLD, KC_MUTE, KC_VOLU, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+ ),
+ [2] = LAYOUT_ortho(
+ 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, 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, 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, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO
+ ),
+};
diff --git a/keyboards/lazydesigners/the40/readme.md b/keyboards/lazydesigners/the40/readme.md
index db31c288ab..e618967561 100644
--- a/keyboards/lazydesigners/the40/readme.md
+++ b/keyboards/lazydesigners/the40/readme.md
@@ -1,9 +1,14 @@
# THE40
-![the40](https://i.loli.net/2020/12/27/6u9UpyPJCWVEgwM.jpg)
-
A 40% keyboard designed and produced by [LAZYDESIGNERS](http://lazydesigners.cn).
+Regular Layout
+![the40](https://i.loli.net/2021/04/11/omspwSGi6Zrg7e2.jpg)
+WKL Layout
+![the40wkl](https://i.loli.net/2021/04/11/YxyKqT16LrRdJAE.jpg)
+Ortho Layout
+![the40ortho](https://i.loli.net/2021/04/11/w9GurZKsSAbHDtM.jpg)
+
* Keyboard Maintainer: [LAZYDESIGNERS](https://github.com/jackytrabbit)
* Hardware Supported: THE40
* Hardware Availability: Check [LAZYDESIGNERS's homepage.](http://lazydesigners.cn)
diff --git a/keyboards/lazydesigners/the40/the40.h b/keyboards/lazydesigners/the40/the40.h
index 38da7bdfb1..91e7120605 100644
--- a/keyboards/lazydesigners/the40/the40.h
+++ b/keyboards/lazydesigners/the40/the40.h
@@ -32,28 +32,28 @@
{ K300, K301, K302, KC_NO, K304, KC_NO, K306, KC_NO, K308, K309, K310, KC_NO }, \
}
-#define LAYOUT_hhkb( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \
- K301, K302, K304, K306, K308, K309 \
+#define LAYOUT_ortho( \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, \
+ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, \
+ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 \
) \
{ \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
- { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, KC_NO }, \
- { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, KC_NO }, \
- { KC_NO, K301, K302, KC_NO, K304, KC_NO, K306, KC_NO, K308, K309, KC_NO, KC_NO }, \
+ { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111 }, \
+ { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211 }, \
+ { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311 }, \
}
#define LAYOUT_wkl( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
- K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \
- K300, K302, K304, K306, K308, K310 \
+ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, \
+ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, \
+ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, \
+ K300, K302, K304, K306, K308, K310 \
) \
{ \
{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011 }, \
{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, KC_NO }, \
{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, KC_NO }, \
- { K300, KC_NO, K302, KC_NO, K304, KC_NO, K306, KC_NO, K308, KC_NO, K310, KC_NO }, \
+ { K300, K301, K302, KC_NO, K304, KC_NO, K306, KC_NO, K308, K309, K310, KC_NO }, \
}