summaryrefslogtreecommitdiff
path: root/keyboards
diff options
context:
space:
mode:
Diffstat (limited to 'keyboards')
-rw-r--r--keyboards/handwired/onekey/keymaps/adc/keymap.c2
-rw-r--r--keyboards/handwired/onekey/keymaps/hardware_id/keymap.c2
-rw-r--r--keyboards/wilba_tech/wt60_h1/config.h17
-rw-r--r--keyboards/wilba_tech/wt60_h1/info.json84
-rw-r--r--keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c36
-rw-r--r--keyboards/wilba_tech/wt60_h1/keymaps/via/keymap.c4
-rw-r--r--keyboards/wilba_tech/wt60_h1/wt60_h1.h36
-rw-r--r--keyboards/wilba_tech/wt60_h3/config.h17
-rw-r--r--keyboards/wilba_tech/wt60_h3/info.json146
-rw-r--r--keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c34
-rw-r--r--keyboards/wilba_tech/wt60_h3/keymaps/via/keymap.c4
-rw-r--r--keyboards/wilba_tech/wt60_h3/wt60_h3.h35
12 files changed, 188 insertions, 229 deletions
diff --git a/keyboards/handwired/onekey/keymaps/adc/keymap.c b/keyboards/handwired/onekey/keymaps/adc/keymap.c
index f9302a42b2..57125e01ed 100644
--- a/keyboards/handwired/onekey/keymaps/adc/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/adc/keymap.c
@@ -19,7 +19,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
char buffer[50];
sprintf(buffer, "ADC:%u\n", val);
#ifdef CONSOLE_ENABLE
- printf(buffer);
+ uprintf("%s", buffer);
#else
send_string(buffer);
#endif
diff --git a/keyboards/handwired/onekey/keymaps/hardware_id/keymap.c b/keyboards/handwired/onekey/keymaps/hardware_id/keymap.c
index bcec8b3ca1..018b9215f8 100644
--- a/keyboards/handwired/onekey/keymaps/hardware_id/keymap.c
+++ b/keyboards/handwired/onekey/keymaps/hardware_id/keymap.c
@@ -17,7 +17,7 @@ bool process_record_user(uint16_t keycode, keyrecord_t *record) {
char buffer[100];
sprintf(buffer, "ID:%lu:%lu:%lu:%lu\n", id.data[0], id.data[1], id.data[2], id.data[3]);
#ifdef CONSOLE_ENABLE
- printf(buffer);
+ uprintf("%s", buffer);
#else
send_string(buffer);
#endif
diff --git a/keyboards/wilba_tech/wt60_h1/config.h b/keyboards/wilba_tech/wt60_h1/config.h
index 9541b1df12..793d8d8baf 100644
--- a/keyboards/wilba_tech/wt60_h1/config.h
+++ b/keyboards/wilba_tech/wt60_h1/config.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * 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/>.
- */
+// Copyright 2023 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keyboards/wilba_tech/wt60_h1/info.json b/keyboards/wilba_tech/wt60_h1/info.json
index 4ef210f05f..2291c6de12 100644
--- a/keyboards/wilba_tech/wt60_h1/info.json
+++ b/keyboards/wilba_tech/wt60_h1/info.json
@@ -1,8 +1,8 @@
{
- "keyboard_name": "WT60-H1",
+ "keyboard_name": "WT60-H1",
"manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
"usb": {
"vid": "0x6582",
"pid": "0x0024",
@@ -15,10 +15,82 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
- "community_layouts": ["60_tsangan_hhkb"],
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "rows": ["F0", "F1", "F4", "F6", "F7"],
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"]
+ },
+ "community_layouts": ["60_ansi_split_bs_rshift"],
+ "layout_aliases": {
+ "LAYOUT_all": "LAYOUT_60_ansi_split_bs_rshift"
+ },
"layouts": {
- "LAYOUT_60_tsangan_hhkb": {
- "layout": [{"x":0, "y":0}, {"x":1, "y":0}, {"x":2, "y":0}, {"x":3, "y":0}, {"x":4, "y":0}, {"x":5, "y":0}, {"x":6, "y":0}, {"x":7, "y":0}, {"x":8, "y":0}, {"x":9, "y":0}, {"x":10, "y":0}, {"x":11, "y":0}, {"x":12, "y":0}, {"x":13, "y":0}, {"x":14, "y":0}, {"x":0, "y":1, "w":1.5}, {"x":1.5, "y":1}, {"x":2.5, "y":1}, {"x":3.5, "y":1}, {"x":4.5, "y":1}, {"x":5.5, "y":1}, {"x":6.5, "y":1}, {"x":7.5, "y":1}, {"x":8.5, "y":1}, {"x":9.5, "y":1}, {"x":10.5, "y":1}, {"x":11.5, "y":1}, {"x":12.5, "y":1}, {"x":13.5, "y":1, "w":1.5}, {"x":0, "y":2, "w":1.75}, {"x":1.75, "y":2}, {"x":2.75, "y":2}, {"x":3.75, "y":2}, {"x":4.75, "y":2}, {"x":5.75, "y":2}, {"x":6.75, "y":2}, {"x":7.75, "y":2}, {"x":8.75, "y":2}, {"x":9.75, "y":2}, {"x":10.75, "y":2}, {"x":11.75, "y":2}, {"x":12.75, "y":2, "w":2.25}, {"x":0, "y":3, "w":2.25}, {"x":2.25, "y":3}, {"x":3.25, "y":3}, {"x":4.25, "y":3}, {"x":5.25, "y":3}, {"x":6.25, "y":3}, {"x":7.25, "y":3}, {"x":8.25, "y":3}, {"x":9.25, "y":3}, {"x":10.25, "y":3}, {"x":11.25, "y":3}, {"x":12.25, "y":3, "w":1.75}, {"x":14, "y":3}, {"x":0, "y":4, "w":1.5}, {"x":1.5, "y":4}, {"x":2.5, "y":4, "w":1.5}, {"x":4, "y":4, "w":7}, {"x":11, "y":4, "w":1.5}, {"x":12.5, "y":4}, {"x":13.5, "y":4, "w":1.5}]
+ "LAYOUT_60_ansi_split_bs_rshift": {
+ "layout": [
+ { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+ { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+ { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+ { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+ { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+ { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+ { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+ { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+ { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+ { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+ { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+ { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+ { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+ { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
+ { "matrix": [2, 13], "x": 14.0, "y": 0.0 },
+ { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+ { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+ { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+ { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+ { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+ { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+ { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+ { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+ { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+ { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+ { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+ { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+ { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+ { "matrix": [1, 13], "w": 1.5, "x": 13.5, "y": 1.0 },
+ { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+ { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+ { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+ { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+ { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+ { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+ { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+ { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+ { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+ { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+ { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+ { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+ { "matrix": [2, 12], "w": 2.25, "x": 12.75, "y": 2.0 },
+ { "matrix": [3, 0], "w": 2.25, "x": 0.0, "y": 3.0 },
+ { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+ { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+ { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+ { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+ { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+ { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+ { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+ { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+ { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+ { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+ { "matrix": [3, 13], "x": 14.0, "y": 3.0 },
+ { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
+ { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
+ { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
+ { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
+ { "matrix": [4, 10], "w": 1.25, "x": 10.0, "y": 4.0 },
+ { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4.0 },
+ { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
+ { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4.0 }
+ ]
}
}
}
diff --git a/keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c
index 5635a1b3e9..0f4abc0bb1 100644
--- a/keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_h1/keymaps/default/keymap.c
@@ -1,52 +1,40 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * 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/>.
- */
+// Copyright 2023 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
// Default layout for WT60-H1
#include QMK_KEYBOARD_H
const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Default layer
- [0] = LAYOUT_60_tsangan_hhkb(
+ [0] = LAYOUT_all(
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_BSLS, KC_DEL,
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_BSPC,
KC_LCTL, 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_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, MO(1),
- MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
+ MO(1), KC_LGUI, KC_LALT, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_RCTL),
// Fn1 Layer
- [1] = LAYOUT_60_tsangan_hhkb(
+ [1] = LAYOUT_all(
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_INS, KC_DEL,
KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS, KC_TRNS,
KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, 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, KC_TRNS),
// Fn2 Layer
- [2] = LAYOUT_60_tsangan_hhkb(
+ [2] = LAYOUT_all(
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, 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
// Fn3 Layer
- [3] = LAYOUT_60_tsangan_hhkb(
+ [3] = LAYOUT_all(
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, 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
+}; \ No newline at end of file
diff --git a/keyboards/wilba_tech/wt60_h1/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_h1/keymaps/via/keymap.c
index 1f9d213f05..7291ae849a 100644
--- a/keyboards/wilba_tech/wt60_h1/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_h1/keymaps/via/keymap.c
@@ -1 +1,3 @@
-#include "../default/keymap.c" \ No newline at end of file
+// Copyright 2023 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "../default/keymap.c"
diff --git a/keyboards/wilba_tech/wt60_h1/wt60_h1.h b/keyboards/wilba_tech/wt60_h1/wt60_h1.h
deleted file mode 100644
index 89b90e7afc..0000000000
--- a/keyboards/wilba_tech/wt60_h1/wt60_h1.h
+++ /dev/null
@@ -1,36 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * 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/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-// This is equivalent to LAYOUT_all
-#define LAYOUT_60_tsangan_hhkb( \
- K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K213, \
- 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, \
- K300, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
- K400, K401, K402, K406, K411, K412, K413 \
-) { \
- { 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, ____, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
- { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, ____, K411, K412, K413 } \
-}
diff --git a/keyboards/wilba_tech/wt60_h3/config.h b/keyboards/wilba_tech/wt60_h3/config.h
index 9541b1df12..793d8d8baf 100644
--- a/keyboards/wilba_tech/wt60_h3/config.h
+++ b/keyboards/wilba_tech/wt60_h3/config.h
@@ -1,18 +1,5 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * 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/>.
- */
+// Copyright 2023 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
#pragma once
diff --git a/keyboards/wilba_tech/wt60_h3/info.json b/keyboards/wilba_tech/wt60_h3/info.json
index f4cb4bedbc..11ffd919bb 100644
--- a/keyboards/wilba_tech/wt60_h3/info.json
+++ b/keyboards/wilba_tech/wt60_h3/info.json
@@ -1,8 +1,8 @@
{
- "keyboard_name": "WT60-H3",
+ "keyboard_name": "WT60-H3",
"manufacturer": "wilba.tech",
- "url": "https://wilba.tech",
- "maintainer": "Wilba",
+ "url": "https://wilba.tech",
+ "maintainer": "Wilba",
"usb": {
"vid": "0x6582",
"pid": "0x002C",
@@ -15,78 +15,82 @@
"diode_direction": "COL2ROW",
"processor": "atmega32u4",
"bootloader": "atmel-dfu",
+ "diode_direction": "COL2ROW",
+ "matrix_pins": {
+ "rows": ["F0", "F1", "F4", "F6", "F7"],
+ "cols": ["F5", "D5", "B1", "B2", "B3", "D3", "D2", "C7", "C6", "B6", "B5", "B4", "D7", "D6"]
+ },
+ "community_layouts": ["60_iso_split_bs_rshift"],
"layout_aliases": {
- "LAYOUT_all": "LAYOUT_60_iso_tsangan_split_rshift"
+ "LAYOUT_all": "LAYOUT_60_iso_split_bs_rshift"
},
"layouts": {
- "LAYOUT_60_iso_tsangan_split_rshift": {
+ "LAYOUT_60_iso_split_bs_rshift": {
"layout": [
- {"x":0, "y":0},
- {"x":1, "y":0},
- {"x":2, "y":0},
- {"x":3, "y":0},
- {"x":4, "y":0},
- {"x":5, "y":0},
- {"x":6, "y":0},
- {"x":7, "y":0},
- {"x":8, "y":0},
- {"x":9, "y":0},
- {"x":10, "y":0},
- {"x":11, "y":0},
- {"x":12, "y":0},
- {"x":13, "y":0, "w":2},
-
- {"x":0, "y":1, "w":1.5},
- {"x":1.5, "y":1},
- {"x":2.5, "y":1},
- {"x":3.5, "y":1},
- {"x":4.5, "y":1},
- {"x":5.5, "y":1},
- {"x":6.5, "y":1},
- {"x":7.5, "y":1},
- {"x":8.5, "y":1},
- {"x":9.5, "y":1},
- {"x":10.5, "y":1},
- {"x":11.5, "y":1},
- {"x":12.5, "y":1},
-
- {"x":0, "y":2, "w":1.75},
- {"x":1.75, "y":2},
- {"x":2.75, "y":2},
- {"x":3.75, "y":2},
- {"x":4.75, "y":2},
- {"x":5.75, "y":2},
- {"x":6.75, "y":2},
- {"x":7.75, "y":2},
- {"x":8.75, "y":2},
- {"x":9.75, "y":2},
- {"x":10.75, "y":2},
- {"x":11.75, "y":2},
- {"x":12.75, "y":2},
- {"x":13.75, "y":1, "w":1.25, "h":2},
-
- {"x":0, "y":3, "w":1.25},
- {"x":1.25, "y":3},
- {"x":2.25, "y":3},
- {"x":3.25, "y":3},
- {"x":4.25, "y":3},
- {"x":5.25, "y":3},
- {"x":6.25, "y":3},
- {"x":7.25, "y":3},
- {"x":8.25, "y":3},
- {"x":9.25, "y":3},
- {"x":10.25, "y":3},
- {"x":11.25, "y":3},
- {"x":12.25, "y":3, "w":1.75},
- {"x":14, "y":3},
-
- {"x":0, "y":4, "w":1.5},
- {"x":1.5, "y":4},
- {"x":2.5, "y":4, "w":1.5},
- {"x":4, "y":4, "w":7},
- {"x":11, "y":4, "w":1.5},
- {"x":12.5, "y":4},
- {"x":13.5, "y":4, "w":1.5}
+ { "matrix": [0, 0], "x": 0.0, "y": 0.0 },
+ { "matrix": [0, 1], "x": 1.0, "y": 0.0 },
+ { "matrix": [0, 2], "x": 2.0, "y": 0.0 },
+ { "matrix": [0, 3], "x": 3.0, "y": 0.0 },
+ { "matrix": [0, 4], "x": 4.0, "y": 0.0 },
+ { "matrix": [0, 5], "x": 5.0, "y": 0.0 },
+ { "matrix": [0, 6], "x": 6.0, "y": 0.0 },
+ { "matrix": [0, 7], "x": 7.0, "y": 0.0 },
+ { "matrix": [0, 8], "x": 8.0, "y": 0.0 },
+ { "matrix": [0, 9], "x": 9.0, "y": 0.0 },
+ { "matrix": [0, 10], "x": 10.0, "y": 0.0 },
+ { "matrix": [0, 11], "x": 11.0, "y": 0.0 },
+ { "matrix": [0, 12], "x": 12.0, "y": 0.0 },
+ { "matrix": [0, 13], "x": 13.0, "y": 0.0 },
+ { "matrix": [2, 13], "x": 14.0, "y": 0.0 },
+ { "matrix": [1, 0], "w": 1.5, "x": 0.0, "y": 1.0 },
+ { "matrix": [1, 1], "x": 1.5, "y": 1.0 },
+ { "matrix": [1, 2], "x": 2.5, "y": 1.0 },
+ { "matrix": [1, 3], "x": 3.5, "y": 1.0 },
+ { "matrix": [1, 4], "x": 4.5, "y": 1.0 },
+ { "matrix": [1, 5], "x": 5.5, "y": 1.0 },
+ { "matrix": [1, 6], "x": 6.5, "y": 1.0 },
+ { "matrix": [1, 7], "x": 7.5, "y": 1.0 },
+ { "matrix": [1, 8], "x": 8.5, "y": 1.0 },
+ { "matrix": [1, 9], "x": 9.5, "y": 1.0 },
+ { "matrix": [1, 10], "x": 10.5, "y": 1.0 },
+ { "matrix": [1, 11], "x": 11.5, "y": 1.0 },
+ { "matrix": [1, 12], "x": 12.5, "y": 1.0 },
+ { "matrix": [2, 0], "w": 1.75, "x": 0.0, "y": 2.0 },
+ { "matrix": [2, 1], "x": 1.75, "y": 2.0 },
+ { "matrix": [2, 2], "x": 2.75, "y": 2.0 },
+ { "matrix": [2, 3], "x": 3.75, "y": 2.0 },
+ { "matrix": [2, 4], "x": 4.75, "y": 2.0 },
+ { "matrix": [2, 5], "x": 5.75, "y": 2.0 },
+ { "matrix": [2, 6], "x": 6.75, "y": 2.0 },
+ { "matrix": [2, 7], "x": 7.75, "y": 2.0 },
+ { "matrix": [2, 8], "x": 8.75, "y": 2.0 },
+ { "matrix": [2, 9], "x": 9.75, "y": 2.0 },
+ { "matrix": [2, 10], "x": 10.75, "y": 2.0 },
+ { "matrix": [2, 11], "x": 11.75, "y": 2.0 },
+ { "matrix": [2, 12], "x": 12.75, "y": 2.0 },
+ { "matrix": [1, 13], "w": 1.25, "h": 2.0, "x": 13.75, "y": 1.0 },
+ { "matrix": [3, 0], "w": 1.25, "x": 0.0, "y": 3.0 },
+ { "matrix": [3, 1], "x": 1.25, "y": 3.0 },
+ { "matrix": [3, 2], "x": 2.25, "y": 3.0 },
+ { "matrix": [3, 3], "x": 3.25, "y": 3.0 },
+ { "matrix": [3, 4], "x": 4.25, "y": 3.0 },
+ { "matrix": [3, 5], "x": 5.25, "y": 3.0 },
+ { "matrix": [3, 6], "x": 6.25, "y": 3.0 },
+ { "matrix": [3, 7], "x": 7.25, "y": 3.0 },
+ { "matrix": [3, 8], "x": 8.25, "y": 3.0 },
+ { "matrix": [3, 9], "x": 9.25, "y": 3.0 },
+ { "matrix": [3, 10], "x": 10.25, "y": 3.0 },
+ { "matrix": [3, 11], "x": 11.25, "y": 3.0 },
+ { "matrix": [3, 12], "w": 1.75, "x": 12.25, "y": 3.0 },
+ { "matrix": [3, 13], "x": 14.0, "y": 3.0 },
+ { "matrix": [4, 0], "w": 1.25, "x": 0.0, "y": 4.0 },
+ { "matrix": [4, 1], "w": 1.25, "x": 1.25, "y": 4.0 },
+ { "matrix": [4, 2], "w": 1.25, "x": 2.5, "y": 4.0 },
+ { "matrix": [4, 6], "w": 6.25, "x": 3.75, "y": 4.0 },
+ { "matrix": [4, 10], "w": 1.25, "x": 10.0, "y": 4.0 },
+ { "matrix": [4, 11], "w": 1.25, "x": 11.25, "y": 4.0 },
+ { "matrix": [4, 12], "w": 1.25, "x": 12.5, "y": 4.0 },
+ { "matrix": [4, 13], "w": 1.25, "x": 13.75, "y": 4.0 }
]
}
}
diff --git a/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c b/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c
index 19236e0a45..e02b9c561b 100644
--- a/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c
+++ b/keyboards/wilba_tech/wt60_h3/keymaps/default/keymap.c
@@ -1,18 +1,6 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * 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/>.
- */
+// Copyright 2023 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
// Default layout for WT60-H3
#include QMK_KEYBOARD_H
@@ -20,33 +8,33 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
// Default layer
[0] = LAYOUT_all(
- 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_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_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_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_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, KC_RCTL),
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_NO, KC_RALT, KC_RGUI, KC_RCTL),
// Fn1 Layer
[1] = LAYOUT_all(
- 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_DEL,
+ 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_DEL, KC_DEL,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PSCR, KC_SCRL, KC_PAUS, KC_UP, KC_TRNS,
KC_TRNS, KC_VOLD, KC_VOLU, KC_MUTE, KC_EJCT, KC_TRNS, KC_PAST, KC_PSLS, KC_HOME, KC_PGUP, KC_LEFT, KC_RGHT, KC_TRNS, KC_TRNS,
KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_PPLS, KC_PMNS, KC_END, KC_PGDN, KC_DOWN, 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, KC_TRNS),
// Fn2 Layer
[2] = LAYOUT_all(
- 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, 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, 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
// Fn3 Layer
[3] = LAYOUT_all(
- 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, 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, 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, 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, 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, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS),
};
diff --git a/keyboards/wilba_tech/wt60_h3/keymaps/via/keymap.c b/keyboards/wilba_tech/wt60_h3/keymaps/via/keymap.c
index 1f9d213f05..7291ae849a 100644
--- a/keyboards/wilba_tech/wt60_h3/keymaps/via/keymap.c
+++ b/keyboards/wilba_tech/wt60_h3/keymaps/via/keymap.c
@@ -1 +1,3 @@
-#include "../default/keymap.c" \ No newline at end of file
+// Copyright 2023 Jason Williams (@wilba)
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include "../default/keymap.c"
diff --git a/keyboards/wilba_tech/wt60_h3/wt60_h3.h b/keyboards/wilba_tech/wt60_h3/wt60_h3.h
deleted file mode 100644
index 84ca69ffc2..0000000000
--- a/keyboards/wilba_tech/wt60_h3/wt60_h3.h
+++ /dev/null
@@ -1,35 +0,0 @@
-/* Copyright 2020 Jason Williams (Wilba)
- *
- * 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/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#define ____ KC_NO
-
-#define LAYOUT_60_iso_tsangan_split_rshift( \
- 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, \
- K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K113, \
- K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313, \
- K400, K401, K402, K406, K411, K412, K413 \
-) { \
- { 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, ____ }, \
- { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K312, K313 }, \
- { K400, K401, K402, ____, ____, ____, K406, ____, ____, ____, ____, K411, K412, K413 } \
-}
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-09 19:03:36 +0000