summaryrefslogtreecommitdiff
path: root/keyboards/k34
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards/k34')
-rw-r--r--keyboards/k34/config.h21
-rw-r--r--keyboards/k34/info.json81
-rw-r--r--keyboards/k34/k34.c4
-rw-r--r--keyboards/k34/k34.h26
-rw-r--r--keyboards/k34/keymaps/default/config.h25
-rw-r--r--keyboards/k34/keymaps/default/keymap.c2
6 files changed, 55 insertions, 104 deletions
diff --git a/keyboards/k34/config.h b/keyboards/k34/config.h
deleted file mode 100644
index 0a7bded944..0000000000
--- a/keyboards/k34/config.h
+++ /dev/null
@@ -1,21 +0,0 @@
-// Copyright 2021 jp_smasher (@jp_smasher)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-
-/*
- * Keyboard Matrix Assignments
- *
- * Change this to how you wired your keyboard
- * COLS: AVR pins used for columns, left to right
- * ROWS: AVR pins used for rows, top to bottom
- * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
- * ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
- *
- */
-#define MATRIX_ROW_PINS { F4, B2, E6, B4 }
-#define MATRIX_COL_PINS { D1, D0, D4, C6, D7, F5, F6, F7, B1, B3 }
-
-/* COL2ROW, ROW2COL */
-#define DIODE_DIRECTION COL2ROW
diff --git a/keyboards/k34/info.json b/keyboards/k34/info.json
index d6e1ee19aa..525a6e8dcd 100644
--- a/keyboards/k34/info.json
+++ b/keyboards/k34/info.json
@@ -1,60 +1,65 @@
{
- "keyboard_name": "k34",
+ "keyboard_name": "k34",
"manufacturer": "jp_smasher",
- "url": "https://github.com/wongjingping/k34",
- "maintainer": "qmk",
+ "url": "https://github.com/wongjingping/k34",
+ "maintainer": "qmk",
"usb": {
"vid": "0xFEED",
"pid": "0x0000",
"device_version": "0.0.1"
},
+ "matrix_pins": {
+ "cols": ["D1", "D0", "D4", "C6", "D7", "F5", "F6", "F7", "B1", "B3"],
+ "rows": ["F4", "B2", "E6", "B4"]
+ },
+ "diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
"layouts": {
"LAYOUT": {
"layout": [
- { "label": "Q", "x": 0, "y": 0.3 },
- { "label": "W", "x": 1, "y": 0.1 },
- { "label": "E", "x": 2, "y": 0 },
- { "label": "R", "x": 3, "y": 0.1 },
- { "label": "T", "x": 4, "y": 0.2 },
+ {"matrix": [0, 0], "x": 0, "y": 0.3},
+ {"matrix": [0, 1], "x": 1, "y": 0.1},
+ {"matrix": [0, 2], "x": 2, "y": 0},
+ {"matrix": [0, 3], "x": 3, "y": 0.1},
+ {"matrix": [0, 4], "x": 4, "y": 0.2},
- { "label": "Y", "x": 8, "y": 0.2 },
- { "label": "U", "x": 9, "y": 0.1 },
- { "label": "I", "x": 10, "y": 0 },
- { "label": "O", "x": 11, "y": 0.1 },
- { "label": "P", "x": 12, "y": 0.3 },
+ {"matrix": [0, 5], "x": 8, "y": 0.2},
+ {"matrix": [0, 6], "x": 9, "y": 0.1},
+ {"matrix": [0, 7], "x": 10, "y": 0},
+ {"matrix": [0, 8], "x": 11, "y": 0.1},
+ {"matrix": [0, 9], "x": 12, "y": 0.3},
- { "label": "A", "x": 0, "y": 1.3 },
- { "label": "S", "x": 1, "y": 1.1 },
- { "label": "D", "x": 2, "y": 1 },
- { "label": "F", "x": 3, "y": 1.1 },
- { "label": "G", "x": 4, "y": 1.2 },
+ {"matrix": [1, 0], "x": 0, "y": 1.3},
+ {"matrix": [1, 1], "x": 1, "y": 1.1},
+ {"matrix": [1, 2], "x": 2, "y": 1},
+ {"matrix": [1, 3], "x": 3, "y": 1.1},
+ {"matrix": [1, 4], "x": 4, "y": 1.2},
- { "label": "H", "x": 8, "y": 1.2 },
- { "label": "J", "x": 9, "y": 1.1 },
- { "label": "K", "x": 10, "y": 1 },
- { "label": "L", "x": 11, "y": 1.1 },
- { "label": ";", "x": 12, "y": 1.3 },
+ {"matrix": [1, 5], "x": 8, "y": 1.2},
+ {"matrix": [1, 6], "x": 9, "y": 1.1},
+ {"matrix": [1, 7], "x": 10, "y": 1},
+ {"matrix": [1, 8], "x": 11, "y": 1.1},
+ {"matrix": [1, 9], "x": 12, "y": 1.3},
- { "label": "Z", "x": 0, "y": 2.3 },
- { "label": "X", "x": 1, "y": 2.1 },
- { "label": "C", "x": 2, "y": 2 },
- { "label": "V", "x": 3, "y": 2.1 },
- { "label": "B", "x": 4, "y": 2.2 },
+ {"matrix": [2, 0], "x": 0, "y": 2.3},
+ {"matrix": [2, 1], "x": 1, "y": 2.1},
+ {"matrix": [2, 2], "x": 2, "y": 2},
+ {"matrix": [2, 3], "x": 3, "y": 2.1},
+ {"matrix": [2, 4], "x": 4, "y": 2.2},
- { "label": "N", "x": 8, "y": 2.2 },
- { "label": "M", "x": 9, "y": 2.1 },
- { "label": ",", "x": 10, "y": 2 },
- { "label": ".", "x": 11, "y": 2.1 },
- { "label": "/", "x": 12, "y": 2.3 },
+ {"matrix": [2, 5], "x": 8, "y": 2.2},
+ {"matrix": [2, 6], "x": 9, "y": 2.1},
+ {"matrix": [2, 7], "x": 10, "y": 2},
+ {"matrix": [2, 8], "x": 11, "y": 2.1},
+ {"matrix": [2, 9], "x": 12, "y": 2.3},
- { "label": "GUI", "x": 3, "y": 3.7 },
- { "label": "Lower", "x": 4, "y": 3.7 },
+ {"matrix": [3, 3], "x": 3, "y": 3.7},
+ {"matrix": [3, 4], "x": 4, "y": 3.7},
- { "label": "Raise", "x": 8, "y": 3.7 },
- { "label": "Alt", "x": 9, "y": 3.7 }
+ {"matrix": [3, 5], "x": 8, "y": 3.7},
+ {"matrix": [3, 6], "x": 9, "y": 3.7}
]
}
}
-} \ No newline at end of file
+}
diff --git a/keyboards/k34/k34.c b/keyboards/k34/k34.c
deleted file mode 100644
index 0dffa61ffd..0000000000
--- a/keyboards/k34/k34.c
+++ /dev/null
@@ -1,4 +0,0 @@
-// Copyright 2021 jp_smasher (@jp_smasher)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#include "k34.h"
diff --git a/keyboards/k34/k34.h b/keyboards/k34/k34.h
deleted file mode 100644
index e34f5408d4..0000000000
--- a/keyboards/k34/k34.h
+++ /dev/null
@@ -1,26 +0,0 @@
-// Copyright 2021 jp_smasher (@jp_smasher)
-// SPDX-License-Identifier: GPL-2.0-or-later
-
-#pragma once
-
-#include "quantum.h"
-
-/* This is a shortcut to help you visually see your layout.
- *
- * The first section contains all of the arguments representing the physical
- * layout of the board and position of the keys.
- *
- * The second converts the arguments into a two-dimensional array which
- * represents the switch matrix.
- */
-#define LAYOUT( \
- k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, \
- k10, k11, k12, k13, k14, k15, k16, k17, k18, k19, \
- k20, k21, k22, k23, k24, k25, k26, k27, k28, k29, \
- k33, k34, k35, k36 \
-) { \
- { k00, k01, k02, k03, k04, k05, k06, k07, k08, k09 }, \
- { k10, k11, k12, k13, k14, k15, k16, k17, k18, k19 }, \
- { k20, k21, k22, k23, k24, k25, k26, k27, k28, k29 }, \
- { KC_NO, KC_NO, KC_NO, k33, k34, k35, k36, KC_NO, KC_NO, KC_NO }, \
-}
diff --git a/keyboards/k34/keymaps/default/config.h b/keyboards/k34/keymaps/default/config.h
index 803471e550..f16dbc0042 100644
--- a/keyboards/k34/keymaps/default/config.h
+++ b/keyboards/k34/keymaps/default/config.h
@@ -1,24 +1,21 @@
/* Copyright Wong Jing Ping <@wongjingping>
- *
- * 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.
- *
+ *
+ * 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
// use 1 combo
-#define COMBO_COUNT 1
#define COMBO_TERM 300
// mod taps for home row mods
#define TAPPING_TERM_PER_KEY
-#define IGNORE_MOD_TAP_INTERRUPT
-
diff --git a/keyboards/k34/keymaps/default/keymap.c b/keyboards/k34/keymaps/default/keymap.c
index 6bd8e402da..ae8b7dc340 100644
--- a/keyboards/k34/keymaps/default/keymap.c
+++ b/keyboards/k34/keymaps/default/keymap.c
@@ -33,7 +33,7 @@ enum layer_names {
/* combos */
const uint16_t PROGMEM jk_combo[] = {KC_J, KC_K, COMBO_END};
-combo_t key_combos[COMBO_COUNT] = {COMBO(jk_combo, KC_ESC)};
+combo_t key_combos[] = {COMBO(jk_combo, KC_ESC)};
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
/* Base */
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-04 23:36:03 +0000