Merge remote-tracking branch 'origin/master' into develop

author: QMK Bot <hello@qmk.fm> 2021-04-20 17:25:10 +0000
committer: QMK Bot <hello@qmk.fm> 2021-04-20 17:25:10 +0000
commit: b68ed9ebead316311c878e97152235d5166aaec9 (patch)
tree: 6d59984a170cca6a8dc3d788bcbadffeeb9e7d89
parent: ed59337239ab9cbf16005f937f89e70c29188d88 (diff)
parent: 45a557641d89330fb8b3777c02606413374931bd (diff)
download: qmk_firmware-b68ed9ebead316311c878e97152235d5166aaec9.tar.gz
qmk_firmware-b68ed9ebead316311c878e97152235d5166aaec9.zip
4 files changed, 92 insertions, 18 deletions
diff --git a/keyboards/matrix/m12og/config.h b/keyboards/matrix/m12og/config.h
index 7cd82e05b..fae5192a3 100644
--- a/keyboards/matrix/m12og/config.h
+++ b/keyboards/matrix/m12og/config.h
@@ -26,12 +26,13 @@
 #define DIODE_DIRECTION COL2ROW
 #define RGB_DI_PIN B3
 #ifdef RGB_DI_PIN
 #define RGBLIGHT_ANIMATIONS
 #define RGBLED_NUM 16
 #define RGBLIGHT_HUE_STEP 8
 #define RGBLIGHT_SAT_STEP 8
 #define RGBLIGHT_VAL_STEP 8
 #define RGBLIGHT_SLEEP
+#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
 #endif
diff --git a/keyboards/matrix/m12og/keymaps/via/keymap.c b/keyboards/matrix/m12og/keymaps/via/keymap.c
new file mode 100644
index 000000000..1ae1400fe
--- /dev/null
+++ b/keyboards/matrix/m12og/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
+/* Copyright 2021 kb-elmo<mail@elmo.space>
+ *
+ * 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
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+        [0]=LAYOUT_all(
+                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,            KC_PSCR, KC_SLCK, KC_PAUS,
+    
+                KC_GRV,  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_INS, KC_HOME, KC_PGUP,
+                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_DEL, KC_END, KC_PGDN,
+                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_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(1),              KC_UP,
+                KC_LCTL, KC_LGUI, KC_LALT,                 KC_SPC,                    KC_RALT, MO(1), KC_RCTL,            KC_LEFT, KC_DOWN, KC_RGHT
+        ),
+        [1]=LAYOUT_all(
+                KC_MUTE,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, 
+                KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,            _______, _______, _______,
+                RESET,   _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     KC_VOLU,
+                _______, _______, _______,                           KC_MPLY,                                      _______, _______, _______,            KC_MPRV, KC_VOLD, KC_MNXT
+        ),
+        [2]=LAYOUT_all(
+                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, 
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
+                _______, _______, _______,                           _______,                                      _______, _______, _______,            _______, _______, _______
+        ),
+        [3]=LAYOUT_all(
+                _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,   _______, _______, _______, 
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,            _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+                _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,                     _______,
+                _______, _______, _______,                           _______,                                      _______, _______, _______,            _______, _______, _______
+        )
+};
diff --git a/keyboards/matrix/m12og/keymaps/via/rules.mk b/keyboards/matrix/m12og/keymaps/via/rules.mk
new file mode 100644
index 000000000..1e5b99807
--- /dev/null
+++ b/keyboards/matrix/m12og/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/matrix/m12og/m12og.h b/keyboards/matrix/m12og/m12og.h
index f632016f1..17ab151da 100644
--- a/keyboards/matrix/m12og/m12og.h
+++ b/keyboards/matrix/m12og/m12og.h
@@ -5,38 +5,53 @@
 #include "quantum.h"
+#define LAYOUT_all( \
+    K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,        K500, K501, K502,\
+    K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K013,  K503, K504, K505,\
+    K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,        K506, K507, K508,\
+    K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,                         \
+    K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413,              K610,      \
+    K600, K601, K602,                   K603,                         K604, K605, K606,        K607, K608, K609 \
+) { \
+    { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013  }, \
+    { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  K113  }, \
+    { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213  }, \
+    { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313  }, \
+    { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  K413  }, \
+    { K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
+    { K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609,  K610,  KC_NO, KC_NO, KC_NO }  \
+}
 #define LAYOUT_tkl_iso( \
-  K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,          K500, K501, K502, \
+    K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,          K500, K501, K502, \
-  \
        K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,          K503, K504, K505, \
        K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212,                K506, K507, K508, \
-        K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
+        K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313,                            \
-        K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,                      K610, \
+        K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412,                      K610,       \
        K600, K601, K602,                         K603,                   K604, K605, K606,          K607, K608, K609  \
 ) { \
-        { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013 }, \
+        { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013  }, \
        { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO }, \
-        { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO}, \
+        { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  KC_NO }, \
-        { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313 }, \
+        { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  K312,  K313  }, \
-        { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO}, \
+        { K400,  K401,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO }, \
        { K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
        { K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609,  K610,  KC_NO, KC_NO, KC_NO }  \
 }
 #define LAYOUT_tkl_ansi( \
-  K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,    K500, K501, K502,\
+    K000,       K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012,    K500, K501, K502,\
-  \
        K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013,    K503, K504, K505,\
        K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213,    K506, K507, K508,\
-        K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313, \
+        K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311,       K313,                     \
-        K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K412,          K610,\
+        K400,       K402, K403, K404, K405, K406, K407, K408, K409, K410, K411,       K412,          K610,      \
-        K600, K601, K602,                   K603,                         K604, K605, K606,   K607, K608, K609\
+        K600, K601, K602,                   K603,                         K604, K605, K606,   K607, K608, K609  \
 ) { \
-        { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013 }, \
+        { K000,  K001,  K002,  K003,  K004,  K005,  K006,  K007,  K008,  K009,  K010,  K011,  K012,  K013  }, \
        { K100,  K101,  K102,  K103,  K104,  K105,  K106,  K107,  K108,  K109,  K110,  K111,  K112,  KC_NO }, \
-        { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213 }, \
+        { K200,  K201,  K202,  K203,  K204,  K205,  K206,  K207,  K208,  K209,  K210,  K211,  K212,  K213  }, \
-        { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311, KC_NO,  K313 }, \
+        { K300,  K301,  K302,  K303,  K304,  K305,  K306,  K307,  K308,  K309,  K310,  K311,  KC_NO, K313  }, \
-        { K400, KC_NO,  K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO }, \
+        { K400,  KC_NO, K402,  K403,  K404,  K405,  K406,  K407,  K408,  K409,  K410,  K411,  K412,  KC_NO }, \
        { K500,  K501,  K502,  K503,  K504,  K505,  K506,  K507,  K508,  KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
        { K600,  K601,  K602,  K603,  K604,  K605,  K606,  K607,  K608,  K609,  K610,  KC_NO, KC_NO, KC_NO }  \
 }
author	QMK Bot <hello@qmk.fm>	2021-04-20 17:25:10 +0000
committer	QMK Bot <hello@qmk.fm>	2021-04-20 17:25:10 +0000
commit	b68ed9ebead316311c878e97152235d5166aaec9 (patch)
tree	6d59984a170cca6a8dc3d788bcbadffeeb9e7d89
parent	ed59337239ab9cbf16005f937f89e70c29188d88 (diff)
parent	45a557641d89330fb8b3777c02606413374931bd (diff)
download	qmk_firmware-b68ed9ebead316311c878e97152235d5166aaec9.tar.gz qmk_firmware-b68ed9ebead316311c878e97152235d5166aaec9.zip

diff --git a/keyboards/matrix/m12og/config.h b/keyboards/matrix/m12og/config.h index 7cd82e05b..fae5192a3 100644 --- a/keyboards/matrix/m12og/config.h +++ b/keyboards/matrix/m12og/config.h
@@ -26,12 +26,13 @@
26	#define DIODE_DIRECTION COL2ROW	26	#define DIODE_DIRECTION COL2ROW
27		27
28	#define RGB_DI_PIN B3	28	#define RGB_DI_PIN B3
		29
29	#ifdef RGB_DI_PIN	30	#ifdef RGB_DI_PIN
30	#define RGBLIGHT_ANIMATIONS	31	#define RGBLIGHT_ANIMATIONS
31
32	#define RGBLED_NUM 16	32	#define RGBLED_NUM 16
33	#define RGBLIGHT_HUE_STEP 8	33	#define RGBLIGHT_HUE_STEP 8
34	#define RGBLIGHT_SAT_STEP 8	34	#define RGBLIGHT_SAT_STEP 8
35	#define RGBLIGHT_VAL_STEP 8	35	#define RGBLIGHT_VAL_STEP 8
36	#define RGBLIGHT_SLEEP	36	#define RGBLIGHT_SLEEP
		37	#define WS2812_BYTE_ORDER WS2812_BYTE_ORDER_RGB
37	#endif	38	#endif


diff --git a/keyboards/matrix/m12og/keymaps/via/keymap.c b/keyboards/matrix/m12og/keymaps/via/keymap.c new file mode 100644 index 000000000..1ae1400fe --- /dev/null +++ b/keyboards/matrix/m12og/keymaps/via/keymap.c
@@ -0,0 +1,57 @@
		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 QMK_KEYBOARD_H
		18
		19	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
		20	[0]=LAYOUT_all(
		21	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, KC_PSCR, KC_SLCK, KC_PAUS,
		22
		23	KC_GRV, 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_INS, KC_HOME, KC_PGUP,
		24	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_DEL, KC_END, KC_PGDN,
		25	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,
		26	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(1), KC_UP,
		27	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
		28	),
		29
		30	[1]=LAYOUT_all(
		31	KC_MUTE, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		32
		33	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		34	KC_NLCK, RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______, _______, _______, _______,
		35	RESET, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		36	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLU,
		37	_______, _______, _______, KC_MPLY, _______, _______, _______, KC_MPRV, KC_VOLD, KC_MNXT
		38	),
		39	[2]=LAYOUT_all(
		40	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		41
		42	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		43	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		44	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		45	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		46	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
		47	),
		48	[3]=LAYOUT_all(
		49	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		50
		51	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		52	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		53	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		54	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
		55	_______, _______, _______, _______, _______, _______, _______, _______, _______, _______
		56	)
		57	};


diff --git a/keyboards/matrix/m12og/keymaps/via/rules.mk b/keyboards/matrix/m12og/keymaps/via/rules.mk new file mode 100644 index 000000000..1e5b99807 --- /dev/null +++ b/keyboards/matrix/m12og/keymaps/via/rules.mk
@@ -0,0 +1 @@
			VIA_ENABLE = yes


diff --git a/keyboards/matrix/m12og/m12og.h b/keyboards/matrix/m12og/m12og.h index f632016f1..17ab151da 100644 --- a/keyboards/matrix/m12og/m12og.h +++ b/keyboards/matrix/m12og/m12og.h
@@ -5,38 +5,53 @@
5		5
6	#include "quantum.h"	6	#include "quantum.h"
7		7
		8	#define LAYOUT_all( \
		9	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K500, K501, K502,\
		10	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K013, K503, K504, K505,\
		11	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K506, K507, K508,\
		12	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
		13	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413, K610, \
		14	K600, K601, K602, K603, K604, K605, K606, K607, K608, K609 \
		15	) { \
		16	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
		17	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113 }, \
		18	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
		19	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
		20	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K413 }, \
		21	{ K500, K501, K502, K503, K504, K505, K506, K507, K508, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
		22	{ K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, KC_NO, KC_NO, KC_NO } \
		23	}
		24
8	#define LAYOUT_tkl_iso( \	25	#define LAYOUT_tkl_iso( \
9	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K500, K501, K502, \	26	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K500, K501, K502, \
10	\
11	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013, K503, K504, K505, \	27	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013, K503, K504, K505, \
12	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K506, K507, K508, \	28	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K506, K507, K508, \
13	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \	29	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
14	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K610, \	30	K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K610, \
15	K600, K601, K602, K603, K604, K605, K606, K607, K608, K609 \	31	K600, K601, K602, K603, K604, K605, K606, K607, K608, K609 \
16	) { \	32	) { \
17	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \	33	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
18	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO }, \	34	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO }, \
19	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO}, \	35	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, KC_NO }, \
20	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \	36	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
21	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO}, \	37	{ K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO }, \
22	{ K500, K501, K502, K503, K504, K505, K506, K507, K508, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \	38	{ K500, K501, K502, K503, K504, K505, K506, K507, K508, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
23	{ K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, KC_NO, KC_NO, KC_NO } \	39	{ K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, KC_NO, KC_NO, KC_NO } \
24	}	40	}
25		41
26	#define LAYOUT_tkl_ansi( \	42	#define LAYOUT_tkl_ansi( \
27	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K500, K501, K502,\	43	K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K500, K501, K502,\
28	\
29	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013, K503, K504, K505,\	44	K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K013, K503, K504, K505,\
30	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K506, K507, K508,\	45	K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K506, K507, K508,\
31	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \	46	K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, \
32	K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K610,\	47	K400, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, K610, \
33	K600, K601, K602, K603, K604, K605, K606, K607, K608, K609\	48	K600, K601, K602, K603, K604, K605, K606, K607, K608, K609 \
34	) { \	49	) { \
35	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \	50	{ K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013 }, \
36	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO }, \	51	{ K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, KC_NO }, \
37	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \	52	{ K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213 }, \
38	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313 }, \	53	{ K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313 }, \
39	{ K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO }, \	54	{ K400, KC_NO, K402, K403, K404, K405, K406, K407, K408, K409, K410, K411, K412, KC_NO }, \
40	{ K500, K501, K502, K503, K504, K505, K506, K507, K508, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \	55	{ K500, K501, K502, K503, K504, K505, K506, K507, K508, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO }, \
41	{ K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, KC_NO, KC_NO, KC_NO } \	56	{ K600, K601, K602, K603, K604, K605, K606, K607, K608, K609, K610, KC_NO, KC_NO, KC_NO } \
42	}	57	}