From 7c517a94832663ecb7df6b416ddceb910761414d Mon Sep 17 00:00:00 2001 From: wilba Date: Fri, 12 Jan 2024 21:40:22 +1100 Subject: [PATCH 1/3] Added WT20-H1 (HIBI JUNIOR) --- keyboards/wilba_tech/wt20_h1/config.h | 9 +++ keyboards/wilba_tech/wt20_h1/info.json | 74 +++++++++++++++++++ .../wt20_h1/keymaps/default/keymap.c | 14 ++++ .../wilba_tech/wt20_h1/keymaps/via/keymap.c | 1 + .../wilba_tech/wt20_h1/keymaps/via/rules.mk | 1 + keyboards/wilba_tech/wt20_h1/readme.md | 19 +++++ keyboards/wilba_tech/wt20_h1/rules.mk | 1 + 7 files changed, 119 insertions(+) create mode 100644 keyboards/wilba_tech/wt20_h1/config.h create mode 100644 keyboards/wilba_tech/wt20_h1/info.json create mode 100644 keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c create mode 100644 keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c create mode 100644 keyboards/wilba_tech/wt20_h1/keymaps/via/rules.mk create mode 100644 keyboards/wilba_tech/wt20_h1/readme.md create mode 100644 keyboards/wilba_tech/wt20_h1/rules.mk diff --git a/keyboards/wilba_tech/wt20_h1/config.h b/keyboards/wilba_tech/wt20_h1/config.h new file mode 100644 index 000000000000..e9d973c77810 --- /dev/null +++ b/keyboards/wilba_tech/wt20_h1/config.h @@ -0,0 +1,9 @@ +// Copyright 2024 Jason Williams (@wilba) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap +#define LOCKING_SUPPORT_ENABLE +// Locking resynchronize hack +#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/wilba_tech/wt20_h1/info.json b/keyboards/wilba_tech/wt20_h1/info.json new file mode 100644 index 000000000000..4db8b2fb577c --- /dev/null +++ b/keyboards/wilba_tech/wt20_h1/info.json @@ -0,0 +1,74 @@ +{ + "manufacturer": "wilba.tech", + "keyboard_name": "WT20-H1", + "maintainer": "Wilba", + "bootloader": "atmel-dfu", + "build": { + "lto": true + }, + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "cols": ["F4", "F0", "B2", "B1"], + "rows": ["B3", "F1", "F5", "F6", "F7"] + }, + "processor": "atmega32u4", + "usb": { + "device_version": "0.0.1", + "pid": "0x0041", + "vid": "0x6582" + }, + "community_layouts": ["ortho_5x4", "numpad_5x4"], + "layouts": { + "LAYOUT_numpad_5x4": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1, "h": 2}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3, "h": 2}, + {"matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"matrix": [4, 2], "x": 2, "y": 4} + ] + }, + "LAYOUT_ortho_5x4": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0}, + {"matrix": [0, 1], "x": 1, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 0}, + {"matrix": [0, 3], "x": 3, "y": 0}, + {"matrix": [1, 0], "x": 0, "y": 1}, + {"matrix": [1, 1], "x": 1, "y": 1}, + {"matrix": [1, 2], "x": 2, "y": 1}, + {"matrix": [1, 3], "x": 3, "y": 1}, + {"matrix": [2, 0], "x": 0, "y": 2}, + {"matrix": [2, 1], "x": 1, "y": 2}, + {"matrix": [2, 2], "x": 2, "y": 2}, + {"matrix": [2, 3], "x": 3, "y": 2}, + {"matrix": [3, 0], "x": 0, "y": 3}, + {"matrix": [3, 1], "x": 1, "y": 3}, + {"matrix": [3, 2], "x": 2, "y": 3}, + {"matrix": [3, 3], "x": 3, "y": 3}, + {"matrix": [4, 0], "x": 0, "y": 4}, + {"matrix": [4, 1], "x": 1, "y": 4}, + {"matrix": [4, 2], "x": 2, "y": 4}, + {"matrix": [4, 3], "x": 3, "y": 4} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c b/keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c new file mode 100644 index 000000000000..8cc7458711ce --- /dev/null +++ b/keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c @@ -0,0 +1,14 @@ +// Copyright 2024 Jason Williams (@wilba) +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_ortho_5x4( + KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_P0, KC_PDOT, KC_PENT + ), +}; diff --git a/keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c b/keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c new file mode 100644 index 000000000000..2811c7707a4b --- /dev/null +++ b/keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c @@ -0,0 +1 @@ +#include "../default/keymap.c" diff --git a/keyboards/wilba_tech/wt20_h1/keymaps/via/rules.mk b/keyboards/wilba_tech/wt20_h1/keymaps/via/rules.mk new file mode 100644 index 000000000000..1e5b99807cb7 --- /dev/null +++ b/keyboards/wilba_tech/wt20_h1/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes diff --git a/keyboards/wilba_tech/wt20_h1/readme.md b/keyboards/wilba_tech/wt20_h1/readme.md new file mode 100644 index 000000000000..586b7e36f4e5 --- /dev/null +++ b/keyboards/wilba_tech/wt20_h1/readme.md @@ -0,0 +1,19 @@ +# wilba.tech WT20-H1 + +WT20-H1 is a hotswap numpad PCB supporting split plus, enter and zero keys (i.e. 5x4 ortho). + +Initially designed for the [HIBI JUNIOR](https://hibi.mx/products/junior-r1) + +- Keyboard Maintainer: [wilba](https://github.com/wilba) +- Hardware Supported: wilba.tech WT20-H1-HIBI +- Hardware Availability: [HIBI](https://hibi.mx/products/junior-r1) + +Make example for this keyboard (after setting up your build environment): + + make wilba_tech/wt20_h1:default + +Flashing example for this keyboard: + + make wilba_tech/wt20_h1: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/wilba_tech/wt20_h1/rules.mk b/keyboards/wilba_tech/wt20_h1/rules.mk new file mode 100644 index 000000000000..c80812f6e0a4 --- /dev/null +++ b/keyboards/wilba_tech/wt20_h1/rules.mk @@ -0,0 +1 @@ +# This file is intentionally blank From a2f9f716934805d829a0f64f8521f29ab77aafbe Mon Sep 17 00:00:00 2001 From: wilba Date: Fri, 12 Jan 2024 21:50:53 +1100 Subject: [PATCH 2/3] add licence header --- keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c b/keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c index 2811c7707a4b..4fc052443e4c 100644 --- a/keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c +++ b/keyboards/wilba_tech/wt20_h1/keymaps/via/keymap.c @@ -1 +1,4 @@ +// Copyright 2024 Jason Williams (@wilba) +// SPDX-License-Identifier: GPL-2.0-or-later + #include "../default/keymap.c" From c4b052f285523e214bcee287cf0db77a9baea27d Mon Sep 17 00:00:00 2001 From: wilba Date: Sat, 13 Jan 2024 16:44:16 +1100 Subject: [PATCH 3/3] requested changes --- keyboards/wilba_tech/wt20_h1/config.h | 9 --------- keyboards/wilba_tech/wt20_h1/info.json | 6 ++++++ keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c | 8 ++++---- 3 files changed, 10 insertions(+), 13 deletions(-) delete mode 100644 keyboards/wilba_tech/wt20_h1/config.h diff --git a/keyboards/wilba_tech/wt20_h1/config.h b/keyboards/wilba_tech/wt20_h1/config.h deleted file mode 100644 index e9d973c77810..000000000000 --- a/keyboards/wilba_tech/wt20_h1/config.h +++ /dev/null @@ -1,9 +0,0 @@ -// Copyright 2024 Jason Williams (@wilba) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -// Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap -#define LOCKING_SUPPORT_ENABLE -// Locking resynchronize hack -#define LOCKING_RESYNC_ENABLE diff --git a/keyboards/wilba_tech/wt20_h1/info.json b/keyboards/wilba_tech/wt20_h1/info.json index 4db8b2fb577c..77905e275e02 100644 --- a/keyboards/wilba_tech/wt20_h1/info.json +++ b/keyboards/wilba_tech/wt20_h1/info.json @@ -18,6 +18,12 @@ "rows": ["B3", "F1", "F5", "F6", "F7"] }, "processor": "atmega32u4", + "qmk": { + "locking": { + "enabled": true, + "resync": true + } + }, "usb": { "device_version": "0.0.1", "pid": "0x0041", diff --git a/keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c b/keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c index 8cc7458711ce..541fbd05fb13 100644 --- a/keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c +++ b/keyboards/wilba_tech/wt20_h1/keymaps/default/keymap.c @@ -6,9 +6,9 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT_ortho_5x4( KC_NUM, KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, KC_PPLS, - KC_P1, KC_P2, KC_P3, KC_PENT, - KC_P0, KC_P0, KC_PDOT, KC_PENT + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_P0, KC_PDOT, KC_PENT ), };