4 files changed, 20 insertions, 32 deletions
diff --git a/keyboards/k34/info.json b/keyboards/k34/info.json
index 525a6e8dcd..715cb9060b 100644
--- a/keyboards/k34/info.json
+++ b/keyboards/k34/info.json
@@ -13,10 +13,10 @@
        "rows": ["F4", "B2", "E6", "B4"]
    },
    "diode_direction": "COL2ROW",
-    "processor": "atmega32u4",
+    "development_board": "promicro",
-    "bootloader": "atmel-dfu",
+    "community_layouts": ["split_3x5_2"],
    "layouts": {
-        "LAYOUT": {
+        "LAYOUT_split_3x5_2": {
            "layout": [
                {"matrix": [0, 0], "x": 0, "y": 0.3},
                {"matrix": [0, 1], "x": 1, "y": 0.1},
diff --git a/keyboards/k34/keymaps/default/config.h b/keyboards/k34/keymaps/default/config.h
index f16dbc0042..5d7e44f759 100644
--- a/keyboards/k34/keymaps/default/config.h
+++ b/keyboards/k34/keymaps/default/config.h
@@ -1,16 +1,5 @@
- /* Copyright Wong Jing Ping <@wongjingping>
+// Copyright 2021 jp_smasher (@jp_smasher)
-  *
+// SPDX-License-Identifier: GPL-2.0-or-later
-  * 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.
-  *
-  */
 #pragma once
diff --git a/keyboards/k34/keymaps/default/keymap.c b/keyboards/k34/keymaps/default/keymap.c
index ae8b7dc340..4d09b121dd 100644
--- a/keyboards/k34/keymaps/default/keymap.c
+++ b/keyboards/k34/keymaps/default/keymap.c
@@ -37,25 +37,25 @@ combo_t key_combos[] = {COMBO(jk_combo, KC_ESC)};
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
    /* Base */
-  [_BASE] = LAYOUT(
+  [_BASE] = LAYOUT_split_3x5_2(
-    KC_Q,     KC_W,     KC_E,     KC_R,      KC_T,               KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,
+    KC_Q, KC_W, KC_E, KC_R, KC_T,        KC_Y,   KC_U, KC_I,   KC_O,  KC_P,
-    G_A,      KC_S,     KC_D,     KC_F,      KC_G,               KC_H,     KC_J,     KC_K,     KC_L,     G_SC,
+    G_A,  KC_S, KC_D, KC_F, KC_G,        KC_H,   KC_J, KC_K,   KC_L,  G_SC,
-    S_Z,      A_X,      C_C,      KC_V,      KC_B,               KC_N,     KC_M,     C_COMM,   A_DOT,    S_SLSH,
+    S_Z,  A_X,  C_C,  KC_V, KC_B,        KC_N,   KC_M, C_COMM, A_DOT, S_SLSH,
-                                  L1,        KC_SPC,             KC_SPC,   L2
+                                              L1,   KC_SPC,      KC_SPC, L2
  ),
-  [_L1] = LAYOUT(
+  [_L1] = LAYOUT_split_3x5_2(
-    KC_EXLM,  KC_AT,    KC_HASH,  KC_DLR,   KC_PERC,            KC_CIRC,  KC_AMPR,  KC_ASTR,  KC_MINS,  KC_EQL,
+    KC_EXLM, KC_AT,   KC_HASH, KC_DLR,  KC_PERC,      KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,
-    KC_LPRN,  KC_RPRN,  KC_LCBR,  KC_RCBR,  KC_GRV,             KC_QUOT,  KC_LBRC,  KC_RBRC,  KC_BSLS,  KC_PIPE,
+    KC_LPRN, KC_RPRN, KC_LCBR, KC_RCBR, KC_GRV,       KC_QUOT, KC_LBRC, KC_RBRC, KC_BSLS, KC_PIPE,
-    _______,  _______,  _______,  KC_TAB,   _______,            KC_MUTE,  KC_VOLD,  KC_VOLU,  KC_MPLY,  KC_MNXT,
+    _______, _______, _______, KC_TAB,  _______,      KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT,
-                                  _______,  _______,            _______,  _______
+                                                       _______, _______,      _______, _______
  ),
-  [_L2] = LAYOUT(
+  [_L2] = LAYOUT_split_3x5_2(
-    KC_1,     KC_2,     KC_3,     KC_4,      KC_5,               KC_6,     KC_7,     KC_8,    KC_9,     KC_0,
+    KC_1,    KC_2,    KC_3,    KC_4,    KC_5,         KC_6,    KC_7,    KC_8,    KC_9,     KC_0,
-    _______,  _______,  _______,  _______,   KC_DOT,             KC_LEFT,  KC_DOWN,  KC_UP,   KC_RIGHT, KC_BSPC,
+    _______, _______, _______, _______, KC_DOT,       KC_LEFT, KC_DOWN, KC_UP,   KC_RIGHT, KC_BSPC,
-    _______,  _______,  _______,  _______,   _______,            A_SLSH,   SG_LBRC,  SG_RBRC, G_LBRC,   G_RBRC,
+    _______, _______, _______, _______, _______,      A_SLSH,  SG_LBRC, SG_RBRC, G_LBRC,   G_RBRC,
-                                  KC_LALT,  KC_LGUI,             _______,    _______
+                                                       KC_LALT, KC_LGUI,      _______, _______
  ),
 };
diff --git a/keyboards/k34/readme.md b/keyboards/k34/readme.md
index 8576def947..282bfeeceb 100644
--- a/keyboards/k34/readme.md
+++ b/keyboards/k34/readme.md
@@ -22,4 +22,3 @@ Flashing example for this keyboard:
    make k34:default:flash
 See 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/k34/info.json b/keyboards/k34/info.json index 525a6e8dcd..715cb9060b 100644 --- a/keyboards/k34/info.json +++ b/keyboards/k34/info.json
@@ -13,10 +13,10 @@
13	"rows": ["F4", "B2", "E6", "B4"]	13	"rows": ["F4", "B2", "E6", "B4"]
14	},	14	},
15	"diode_direction": "COL2ROW",	15	"diode_direction": "COL2ROW",
16	"processor": "atmega32u4",	16	"development_board": "promicro",
17	"bootloader": "atmel-dfu",	17	"community_layouts": ["split_3x5_2"],
18	"layouts": {	18	"layouts": {
19	"LAYOUT": {	19	"LAYOUT_split_3x5_2": {
20	"layout": [	20	"layout": [
21	{"matrix": [0, 0], "x": 0, "y": 0.3},	21	{"matrix": [0, 0], "x": 0, "y": 0.3},
22	{"matrix": [0, 1], "x": 1, "y": 0.1},	22	{"matrix": [0, 1], "x": 1, "y": 0.1},


diff --git a/keyboards/k34/keymaps/default/config.h b/keyboards/k34/keymaps/default/config.h index f16dbc0042..5d7e44f759 100644 --- a/keyboards/k34/keymaps/default/config.h +++ b/keyboards/k34/keymaps/default/config.h
@@ -1,16 +1,5 @@
1	/* Copyright Wong Jing Ping <@wongjingping>	1	// Copyright 2021 jp_smasher (@jp_smasher)
2	*	2	// SPDX-License-Identifier: GPL-2.0-or-later
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	*/
14		3
15	#pragma once	4	#pragma once
16		5


diff --git a/keyboards/k34/keymaps/default/keymap.c b/keyboards/k34/keymaps/default/keymap.c index ae8b7dc340..4d09b121dd 100644 --- a/keyboards/k34/keymaps/default/keymap.c +++ b/keyboards/k34/keymaps/default/keymap.c
@@ -37,25 +37,25 @@ combo_t key_combos[] = {COMBO(jk_combo, KC_ESC)};
37		37
38	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {	38	const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
39	/* Base */	39	/* Base */
40	[_BASE] = LAYOUT(	40	[_BASE] = LAYOUT_split_3x5_2(
41	KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,	41	KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
42	G_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, G_SC,	42	G_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, G_SC,
43	S_Z, A_X, C_C, KC_V, KC_B, KC_N, KC_M, C_COMM, A_DOT, S_SLSH,	43	S_Z, A_X, C_C, KC_V, KC_B, KC_N, KC_M, C_COMM, A_DOT, S_SLSH,
44	L1, KC_SPC, KC_SPC, L2	44	L1, KC_SPC, KC_SPC, L2
45	),	45	),
46		46
47		47
48	[_L1] = LAYOUT(	48	[_L1] = LAYOUT_split_3x5_2(
49	KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,	49	KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,
50	KC_LPRN, KC_RPRN, KC_LCBR, KC_RCBR, KC_GRV, KC_QUOT, KC_LBRC, KC_RBRC, KC_BSLS, KC_PIPE,	50	KC_LPRN, KC_RPRN, KC_LCBR, KC_RCBR, KC_GRV, KC_QUOT, KC_LBRC, KC_RBRC, KC_BSLS, KC_PIPE,
51	_______, _______, _______, KC_TAB, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT,	51	_______, _______, _______, KC_TAB, _______, KC_MUTE, KC_VOLD, KC_VOLU, KC_MPLY, KC_MNXT,
52	_______, _______, _______, _______	52	_______, _______, _______, _______
53	),	53	),
54		54
55	[_L2] = LAYOUT(	55	[_L2] = LAYOUT_split_3x5_2(
56	KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,	56	KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0,
57	_______, _______, _______, _______, KC_DOT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_BSPC,	57	_______, _______, _______, _______, KC_DOT, KC_LEFT, KC_DOWN, KC_UP, KC_RIGHT, KC_BSPC,
58	_______, _______, _______, _______, _______, A_SLSH, SG_LBRC, SG_RBRC, G_LBRC, G_RBRC,	58	_______, _______, _______, _______, _______, A_SLSH, SG_LBRC, SG_RBRC, G_LBRC, G_RBRC,
59	KC_LALT, KC_LGUI, _______, _______	59	KC_LALT, KC_LGUI, _______, _______
60	),	60	),
61	};	61	};


diff --git a/keyboards/k34/readme.md b/keyboards/k34/readme.md index 8576def947..282bfeeceb 100644 --- a/keyboards/k34/readme.md +++ b/keyboards/k34/readme.md
@@ -22,4 +22,3 @@ Flashing example for this keyboard:
22	make k34:default:flash	22	make k34:default:flash
23		23
24	See 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).	24	See 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).
25