From 187bc3083f55a6acd35a72156f5fff41f6f2936a Mon Sep 17 00:00:00 2001 From: alhenx Date: Tue, 14 Mar 2023 20:01:45 +0100 Subject: [PATCH 01/22] Add keyboard alhenkb --- keyboards/alhenkb/macropad5x4/config.h | 20 +++++++ keyboards/alhenkb/macropad5x4/info.json | 52 +++++++++++++++++++ .../macropad5x4/keymaps/default/keymap.c | 27 ++++++++++ .../macropad5x4/keymaps/via/Macropad.json | 32 ++++++++++++ .../alhenkb/macropad5x4/keymaps/via/keymap.c | 27 ++++++++++ .../alhenkb/macropad5x4/keymaps/via/rules.mk | 1 + keyboards/alhenkb/macropad5x4/readme.md | 16 ++++++ keyboards/alhenkb/macropad5x4/rules.mk | 1 + keyboards/alhenkb/numpad/config.h | 20 +++++++ keyboards/alhenkb/numpad/info.json | 49 +++++++++++++++++ .../alhenkb/numpad/keymaps/default/keymap.c | 48 +++++++++++++++++ .../alhenkb/numpad/keymaps/via/Numpad.json | 38 ++++++++++++++ keyboards/alhenkb/numpad/keymaps/via/keymap.c | 48 +++++++++++++++++ keyboards/alhenkb/numpad/keymaps/via/rules.mk | 1 + keyboards/alhenkb/numpad/readme.md | 14 +++++ keyboards/alhenkb/numpad/rules.mk | 1 + 16 files changed, 395 insertions(+) create mode 100644 keyboards/alhenkb/macropad5x4/config.h create mode 100644 keyboards/alhenkb/macropad5x4/info.json create mode 100644 keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c create mode 100644 keyboards/alhenkb/macropad5x4/keymaps/via/Macropad.json create mode 100644 keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c create mode 100644 keyboards/alhenkb/macropad5x4/keymaps/via/rules.mk create mode 100644 keyboards/alhenkb/macropad5x4/readme.md create mode 100644 keyboards/alhenkb/macropad5x4/rules.mk create mode 100644 keyboards/alhenkb/numpad/config.h create mode 100644 keyboards/alhenkb/numpad/info.json create mode 100644 keyboards/alhenkb/numpad/keymaps/default/keymap.c create mode 100644 keyboards/alhenkb/numpad/keymaps/via/Numpad.json create mode 100644 keyboards/alhenkb/numpad/keymaps/via/keymap.c create mode 100644 keyboards/alhenkb/numpad/keymaps/via/rules.mk create mode 100644 keyboards/alhenkb/numpad/readme.md create mode 100644 keyboards/alhenkb/numpad/rules.mk diff --git a/keyboards/alhenkb/macropad5x4/config.h b/keyboards/alhenkb/macropad5x4/config.h new file mode 100644 index 000000000000..d8bb6c94efcd --- /dev/null +++ b/keyboards/alhenkb/macropad5x4/config.h @@ -0,0 +1,20 @@ +// Copyright 2023 Alhen (@alhenx) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/alhenkb/macropad5x4/info.json b/keyboards/alhenkb/macropad5x4/info.json new file mode 100644 index 000000000000..f7c19fa302b1 --- /dev/null +++ b/keyboards/alhenkb/macropad5x4/info.json @@ -0,0 +1,52 @@ +{ + "manufacturer": "AlhenKB", + "keyboard_name": "Macropad 5x4", + "maintainer": "alhenx", + "bootloader": "caterina", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "rows": ["F5", "F7", "B3", "B6", "B5"], + "cols": ["F4", "F6", "B1", "B2"] + }, + "processor": "atmega32u4", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0001", + "vid": "0x6178" + }, + "layouts": { + "LAYOUT_macro5x4": { + "layout": [ + {"label": "K00 (F5,F4)", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01 (F5,F6)", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02 (F5,B1)", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03 (F5,B2)", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K10 (F7,F4)", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "K11 (F7,F6)", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "K12 (F7,B1)", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "K12 (F7,B2)", "matrix": [1, 3], "x": 3, "y": 1}, + {"label": "K20 (B3,F4)", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "K21 (B3,F6)", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "K22 (B3,B1)", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "K23 (B3,B2)", "matrix": [2, 3], "x": 3, "y": 1}, + {"label": "K30 (B6,F4)", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "K31 (B6,F6)", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "K32 (B6,B1)", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "K32 (B6,B2)", "matrix": [3, 3], "x": 3, "y": 3}, + {"label": "K40 (B5,F4)", "matrix": [4, 0], "x": 0, "y": 4}, + {"label": "K42 (B5,F6)", "matrix": [4, 1], "x": 1, "y": 4}, + {"label": "K42 (B5,B1)", "matrix": [4, 2], "x": 2, "y": 4}, + {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 3} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c b/keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c new file mode 100644 index 000000000000..c5ea40d3dc64 --- /dev/null +++ b/keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c @@ -0,0 +1,27 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┐ + * │ 1 │ 2 │ 3 │ 4 │ + * ├───┼───┼───┼───┤ + * │ 5 │ 6 │ 7 │ 8 │ + * ├───┼───┼───┼───┤ + * │ Q │ W │ E │ R │ + * ├───┼───┼───┼───┤ + * │ A │ S │ D │ F │ + * ├───┼───┼───┼───┤ + * │ Z │ X │ C │ V │ + * └───────┴───┴───┘ + */ + [0] = LAYOUT_macro5x4( + KC_P1, KC_P2, KC_P3, KC_P4, + KC_P5, KC_P6, KC_P7, KC_P8, + KC_Q, KC_W, KC_E, KC_R, + KC_A, KC_S, KC_D, KC_F, + KC_Z, KC_X, KC_C, KC_V + ), +}; diff --git a/keyboards/alhenkb/macropad5x4/keymaps/via/Macropad.json b/keyboards/alhenkb/macropad5x4/keymaps/via/Macropad.json new file mode 100644 index 000000000000..9ae28532204d --- /dev/null +++ b/keyboards/alhenkb/macropad5x4/keymaps/via/Macropad.json @@ -0,0 +1,32 @@ +[ + [ + "1", + "2", + "3", + "4" + ], + [ + "5", + "6", + "7", + "8" + ], + [ + "Q", + "W", + "E", + "R" + ], + [ + "A", + "S", + "D", + "F" + ], + [ + "Z", + "X", + "C", + "V" + ] +] \ No newline at end of file diff --git a/keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c b/keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c new file mode 100644 index 000000000000..c5ea40d3dc64 --- /dev/null +++ b/keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c @@ -0,0 +1,27 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┐ + * │ 1 │ 2 │ 3 │ 4 │ + * ├───┼───┼───┼───┤ + * │ 5 │ 6 │ 7 │ 8 │ + * ├───┼───┼───┼───┤ + * │ Q │ W │ E │ R │ + * ├───┼───┼───┼───┤ + * │ A │ S │ D │ F │ + * ├───┼───┼───┼───┤ + * │ Z │ X │ C │ V │ + * └───────┴───┴───┘ + */ + [0] = LAYOUT_macro5x4( + KC_P1, KC_P2, KC_P3, KC_P4, + KC_P5, KC_P6, KC_P7, KC_P8, + KC_Q, KC_W, KC_E, KC_R, + KC_A, KC_S, KC_D, KC_F, + KC_Z, KC_X, KC_C, KC_V + ), +}; diff --git a/keyboards/alhenkb/macropad5x4/keymaps/via/rules.mk b/keyboards/alhenkb/macropad5x4/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/alhenkb/macropad5x4/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/alhenkb/macropad5x4/readme.md b/keyboards/alhenkb/macropad5x4/readme.md new file mode 100644 index 000000000000..4d9f43ae4127 --- /dev/null +++ b/keyboards/alhenkb/macropad5x4/readme.md @@ -0,0 +1,16 @@ + +# AlhenKB - Macropad 5x4 + +![Imgur Image](https://imgur.com/t7Zi2w3.jpg) + +A macropad 5x4. +* Keyboard Maintainer: [Alhen](https://github.com/alhenx) +* Hardware Supported: MerryPCB + +Make example for this keyboard (after setting up your build environment): + + qmk compile -kb alhenkb/macropad5x4 -km default + +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). + + \ No newline at end of file diff --git a/keyboards/alhenkb/macropad5x4/rules.mk b/keyboards/alhenkb/macropad5x4/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/alhenkb/macropad5x4/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank diff --git a/keyboards/alhenkb/numpad/config.h b/keyboards/alhenkb/numpad/config.h new file mode 100644 index 000000000000..d8bb6c94efcd --- /dev/null +++ b/keyboards/alhenkb/numpad/config.h @@ -0,0 +1,20 @@ +// Copyright 2023 Alhen (@alhenx) +// SPDX-License-Identifier: GPL-2.0-or-later + +#pragma once + +/* + * Feature disable options + * These options are also useful to firmware size reduction. + */ + +/* disable debug print */ +//#define NO_DEBUG + +/* disable print */ +//#define NO_PRINT + +/* disable action features */ +//#define NO_ACTION_LAYER +//#define NO_ACTION_TAPPING +//#define NO_ACTION_ONESHOT diff --git a/keyboards/alhenkb/numpad/info.json b/keyboards/alhenkb/numpad/info.json new file mode 100644 index 000000000000..085d7e9c0a76 --- /dev/null +++ b/keyboards/alhenkb/numpad/info.json @@ -0,0 +1,49 @@ +{ + "manufacturer": "AlhenKB", + "keyboard_name": "Numpad", + "maintainer": "alhenx", + "bootloader": "caterina", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": true, + "nkro": true + }, + "matrix_pins": { + "rows": ["F5", "F7", "B3", "B6", "B5"], + "cols": ["F4", "F6", "B1", "B2"] + }, + "processor": "atmega32u4", + "url": "", + "usb": { + "device_version": "1.0.0", + "pid": "0x0000", + "vid": "0x6178" + }, + "layouts": { + "LAYOUT_num4x5": { + "layout": [ + {"label": "K00 (F5,F4)", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01 (F5,F6)", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02 (F5,B1)", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03 (F5,B2)", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K10 (F7,F4)", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "K11 (F7,F6)", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "K12 (F7,B1)", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "K23 (B3,B2)", "matrix": [2, 3], "x": 3, "y": 1, "h": 2}, + {"label": "K20 (B3,F4)", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "K21 (B3,F6)", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "K22 (B3,B1)", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "K30 (B6,F4)", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "K31 (B6,F6)", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "K32 (B6,B1)", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 3, "h": 2}, + {"label": "K40 (B5,F4)", "matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"label": "K42 (B5,B1)", "matrix": [4, 2], "x": 2, "y": 4} + ] + } + } +} \ No newline at end of file diff --git a/keyboards/alhenkb/numpad/keymaps/default/keymap.c b/keyboards/alhenkb/numpad/keymaps/default/keymap.c new file mode 100644 index 000000000000..5039585f0ec1 --- /dev/null +++ b/keyboards/alhenkb/numpad/keymaps/default/keymap.c @@ -0,0 +1,48 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┐ + * │TG1│ / │ * │ - │ + * ├───┼───┼───┼───┤ + * │ 7 │ 8 │ 9 │ │ + * ├───┼───┼───┤ + │ + * │ 4 │ 5 │ 6 │ │ + * ├───┼───┼───┼───┤ + * │ 1 │ 2 │ 3 │ │ + * ├───┴───┼───┤Ent│ + * │ 0 │ . │ │ + * └───────┴───┴───┘ + */ + [0] = LAYOUT_num4x5( + TG(1), KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT + ), + + /* + * ┌───┬───┬───┬───┐ + * │TG1│ / │ * │ - │ + * ┌───┬───┬───┐───┤ + * │Hom│ ↑ │PgU│ │ + * ├───┼───┼───┤ + │ + * │ ← │ │ → │ │ + * ├───┼───┼───┤───┤ + * │End│ ↓ │PgD│ │ + * ├───┴───┼───┤Ent│ + * │Insert │Del│ │ + * └───────┴───┘───┘ + */ + [1] = LAYOUT_num4x5( + _______, _______, _______, _______, + KC_HOME, KC_UP, KC_PGUP, _______, + KC_LEFT, XXXXXXX, KC_RGHT, + KC_END, KC_DOWN, KC_PGDN, _______, + KC_INS, KC_DEL + ) +}; diff --git a/keyboards/alhenkb/numpad/keymaps/via/Numpad.json b/keyboards/alhenkb/numpad/keymaps/via/Numpad.json new file mode 100644 index 000000000000..781defee5941 --- /dev/null +++ b/keyboards/alhenkb/numpad/keymaps/via/Numpad.json @@ -0,0 +1,38 @@ +[ + [ + "Num Lock", + "/", + "*", + "-" + ], + [ + "7", + "8", + "9", + { + "h": 2 + }, + "+" + ], + [ + "4", + "5", + "6" + ], + [ + "1", + "2", + "3", + { + "h": 2 + }, + "Enter" + ], + [ + { + "w": 2 + }, + "0", + "." + ] +] \ No newline at end of file diff --git a/keyboards/alhenkb/numpad/keymaps/via/keymap.c b/keyboards/alhenkb/numpad/keymaps/via/keymap.c new file mode 100644 index 000000000000..5039585f0ec1 --- /dev/null +++ b/keyboards/alhenkb/numpad/keymaps/via/keymap.c @@ -0,0 +1,48 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┐ + * │TG1│ / │ * │ - │ + * ├───┼───┼───┼───┤ + * │ 7 │ 8 │ 9 │ │ + * ├───┼───┼───┤ + │ + * │ 4 │ 5 │ 6 │ │ + * ├───┼───┼───┼───┤ + * │ 1 │ 2 │ 3 │ │ + * ├───┴───┼───┤Ent│ + * │ 0 │ . │ │ + * └───────┴───┴───┘ + */ + [0] = LAYOUT_num4x5( + TG(1), KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT + ), + + /* + * ┌───┬───┬───┬───┐ + * │TG1│ / │ * │ - │ + * ┌───┬───┬───┐───┤ + * │Hom│ ↑ │PgU│ │ + * ├───┼───┼───┤ + │ + * │ ← │ │ → │ │ + * ├───┼───┼───┤───┤ + * │End│ ↓ │PgD│ │ + * ├───┴───┼───┤Ent│ + * │Insert │Del│ │ + * └───────┴───┘───┘ + */ + [1] = LAYOUT_num4x5( + _______, _______, _______, _______, + KC_HOME, KC_UP, KC_PGUP, _______, + KC_LEFT, XXXXXXX, KC_RGHT, + KC_END, KC_DOWN, KC_PGDN, _______, + KC_INS, KC_DEL + ) +}; diff --git a/keyboards/alhenkb/numpad/keymaps/via/rules.mk b/keyboards/alhenkb/numpad/keymaps/via/rules.mk new file mode 100644 index 000000000000..036bd6d1c3ec --- /dev/null +++ b/keyboards/alhenkb/numpad/keymaps/via/rules.mk @@ -0,0 +1 @@ +VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/alhenkb/numpad/readme.md b/keyboards/alhenkb/numpad/readme.md new file mode 100644 index 000000000000..bc38a135f15a --- /dev/null +++ b/keyboards/alhenkb/numpad/readme.md @@ -0,0 +1,14 @@ + +# AlhenKB - Numpad + +![Imgur Image](http://imgur.com/5xlKJlB.jpg) + +A basic numpad. +* Keyboard Maintainer: [Alhen](https://github.com/alhenx) +* Hardware Supported: MerryPCB + +Make example for this keyboard (after setting up your build environment): + + qmk compile -kb alhenkb/numpad -km default + +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/alhenkb/numpad/rules.mk b/keyboards/alhenkb/numpad/rules.mk new file mode 100644 index 000000000000..6e7633bfe015 --- /dev/null +++ b/keyboards/alhenkb/numpad/rules.mk @@ -0,0 +1 @@ +# This file intentionally left blank From 0f25919d0aa2bf8d6f760c08f336e166f743fdfd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:04:42 +0100 Subject: [PATCH 02/22] Delete config.h --- keyboards/alhenkb/macropad5x4/config.h | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 keyboards/alhenkb/macropad5x4/config.h diff --git a/keyboards/alhenkb/macropad5x4/config.h b/keyboards/alhenkb/macropad5x4/config.h deleted file mode 100644 index d8bb6c94efcd..000000000000 --- a/keyboards/alhenkb/macropad5x4/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2023 Alhen (@alhenx) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT From 7c5f70fe0e3541b7c290a639400257fda936e1c5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:06:40 +0100 Subject: [PATCH 03/22] Update info.json --- keyboards/alhenkb/macropad5x4/info.json | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/alhenkb/macropad5x4/info.json b/keyboards/alhenkb/macropad5x4/info.json index f7c19fa302b1..57a9097dbec1 100644 --- a/keyboards/alhenkb/macropad5x4/info.json +++ b/keyboards/alhenkb/macropad5x4/info.json @@ -24,7 +24,7 @@ "vid": "0x6178" }, "layouts": { - "LAYOUT_macro5x4": { + "LAYOUT": { "layout": [ {"label": "K00 (F5,F4)", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K01 (F5,F6)", "matrix": [0, 1], "x": 1, "y": 0}, @@ -49,4 +49,4 @@ ] } } -} \ No newline at end of file +} From 52dca9239c7bc6ada8b65f0863749faa3af1c048 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:07:05 +0100 Subject: [PATCH 04/22] Update keymap.c --- keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c b/keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c index c5ea40d3dc64..4823f587e911 100644 --- a/keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c +++ b/keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ Z │ X │ C │ V │ * └───────┴───┴───┘ */ - [0] = LAYOUT_macro5x4( + [0] = LAYOUT( KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_Q, KC_W, KC_E, KC_R, From 88a7e40aeeb7fbc4daba86b62908abc6dd037c57 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:07:25 +0100 Subject: [PATCH 05/22] Delete Macropad.json --- .../macropad5x4/keymaps/via/Macropad.json | 32 ------------------- 1 file changed, 32 deletions(-) delete mode 100644 keyboards/alhenkb/macropad5x4/keymaps/via/Macropad.json diff --git a/keyboards/alhenkb/macropad5x4/keymaps/via/Macropad.json b/keyboards/alhenkb/macropad5x4/keymaps/via/Macropad.json deleted file mode 100644 index 9ae28532204d..000000000000 --- a/keyboards/alhenkb/macropad5x4/keymaps/via/Macropad.json +++ /dev/null @@ -1,32 +0,0 @@ -[ - [ - "1", - "2", - "3", - "4" - ], - [ - "5", - "6", - "7", - "8" - ], - [ - "Q", - "W", - "E", - "R" - ], - [ - "A", - "S", - "D", - "F" - ], - [ - "Z", - "X", - "C", - "V" - ] -] \ No newline at end of file From 77be8f73937efc275960969cf35b676cb30a5053 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:07:47 +0100 Subject: [PATCH 06/22] Update keymap.c --- keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c b/keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c index c5ea40d3dc64..4823f587e911 100644 --- a/keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c +++ b/keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ Z │ X │ C │ V │ * └───────┴───┴───┘ */ - [0] = LAYOUT_macro5x4( + [0] = LAYOUT( KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_Q, KC_W, KC_E, KC_R, From ad2c7d855e6d1e35c2cdb5876e2947976a46a904 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:08:47 +0100 Subject: [PATCH 07/22] Delete config.h --- keyboards/alhenkb/numpad/config.h | 20 -------------------- 1 file changed, 20 deletions(-) delete mode 100644 keyboards/alhenkb/numpad/config.h diff --git a/keyboards/alhenkb/numpad/config.h b/keyboards/alhenkb/numpad/config.h deleted file mode 100644 index d8bb6c94efcd..000000000000 --- a/keyboards/alhenkb/numpad/config.h +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright 2023 Alhen (@alhenx) -// SPDX-License-Identifier: GPL-2.0-or-later - -#pragma once - -/* - * Feature disable options - * These options are also useful to firmware size reduction. - */ - -/* disable debug print */ -//#define NO_DEBUG - -/* disable print */ -//#define NO_PRINT - -/* disable action features */ -//#define NO_ACTION_LAYER -//#define NO_ACTION_TAPPING -//#define NO_ACTION_ONESHOT From 0864aab84f425d5db06d5aff8c7034d6f1063be6 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:09:36 +0100 Subject: [PATCH 08/22] Update info.json --- keyboards/alhenkb/numpad/info.json | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/keyboards/alhenkb/numpad/info.json b/keyboards/alhenkb/numpad/info.json index 085d7e9c0a76..778378751cb4 100644 --- a/keyboards/alhenkb/numpad/info.json +++ b/keyboards/alhenkb/numpad/info.json @@ -23,8 +23,9 @@ "pid": "0x0000", "vid": "0x6178" }, + "community_layouts": ["numpad_5x4"], "layouts": { - "LAYOUT_num4x5": { + "LAYOUT_numpad_5x4": { "layout": [ {"label": "K00 (F5,F4)", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K01 (F5,F6)", "matrix": [0, 1], "x": 1, "y": 0}, @@ -46,4 +47,4 @@ ] } } -} \ No newline at end of file +} From c32d6a0f019a78217231049c40dc8d92a5452f58 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:10:05 +0100 Subject: [PATCH 09/22] Update keymap.c --- keyboards/alhenkb/numpad/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/alhenkb/numpad/keymaps/default/keymap.c b/keyboards/alhenkb/numpad/keymaps/default/keymap.c index 5039585f0ec1..1a7bb3f0841e 100644 --- a/keyboards/alhenkb/numpad/keymaps/default/keymap.c +++ b/keyboards/alhenkb/numpad/keymaps/default/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ 0 │ . │ │ * └───────┴───┴───┘ */ - [0] = LAYOUT_num4x5( + [0] = LAYOUT_numpad_5x4( TG(1), KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_P4, KC_P5, KC_P6, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Insert │Del│ │ * └───────┴───┘───┘ */ - [1] = LAYOUT_num4x5( + [1] = LAYOUT_numpad_5x4( _______, _______, _______, _______, KC_HOME, KC_UP, KC_PGUP, _______, KC_LEFT, XXXXXXX, KC_RGHT, From 195e8f067988cd605ae73c74c4392760ab047a65 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:10:20 +0100 Subject: [PATCH 10/22] Delete Numpad.json --- .../alhenkb/numpad/keymaps/via/Numpad.json | 38 ------------------- 1 file changed, 38 deletions(-) delete mode 100644 keyboards/alhenkb/numpad/keymaps/via/Numpad.json diff --git a/keyboards/alhenkb/numpad/keymaps/via/Numpad.json b/keyboards/alhenkb/numpad/keymaps/via/Numpad.json deleted file mode 100644 index 781defee5941..000000000000 --- a/keyboards/alhenkb/numpad/keymaps/via/Numpad.json +++ /dev/null @@ -1,38 +0,0 @@ -[ - [ - "Num Lock", - "/", - "*", - "-" - ], - [ - "7", - "8", - "9", - { - "h": 2 - }, - "+" - ], - [ - "4", - "5", - "6" - ], - [ - "1", - "2", - "3", - { - "h": 2 - }, - "Enter" - ], - [ - { - "w": 2 - }, - "0", - "." - ] -] \ No newline at end of file From 046b54ecced2017144aea57101c2c48e7df82728 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:10:49 +0100 Subject: [PATCH 11/22] Update keymap.c --- keyboards/alhenkb/numpad/keymaps/via/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/alhenkb/numpad/keymaps/via/keymap.c b/keyboards/alhenkb/numpad/keymaps/via/keymap.c index 5039585f0ec1..1a7bb3f0841e 100644 --- a/keyboards/alhenkb/numpad/keymaps/via/keymap.c +++ b/keyboards/alhenkb/numpad/keymaps/via/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ 0 │ . │ │ * └───────┴───┴───┘ */ - [0] = LAYOUT_num4x5( + [0] = LAYOUT_numpad_5x4( TG(1), KC_PSLS, KC_PAST, KC_PMNS, KC_P7, KC_P8, KC_P9, KC_PPLS, KC_P4, KC_P5, KC_P6, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Insert │Del│ │ * └───────┴───┘───┘ */ - [1] = LAYOUT_num4x5( + [1] = LAYOUT_numpad_5x4( _______, _______, _______, _______, KC_HOME, KC_UP, KC_PGUP, _______, KC_LEFT, XXXXXXX, KC_RGHT, From 64706b2e4c839f8e450a1f8f169dd1cd7e3e6c08 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:18:58 +0100 Subject: [PATCH 12/22] Update readme.md --- keyboards/alhenkb/numpad/readme.md | 19 +++++++++++++++---- 1 file changed, 15 insertions(+), 4 deletions(-) diff --git a/keyboards/alhenkb/numpad/readme.md b/keyboards/alhenkb/numpad/readme.md index bc38a135f15a..066265cde453 100644 --- a/keyboards/alhenkb/numpad/readme.md +++ b/keyboards/alhenkb/numpad/readme.md @@ -1,14 +1,25 @@ - # AlhenKB - Numpad ![Imgur Image](http://imgur.com/5xlKJlB.jpg) -A basic numpad. +A basic numpad for MerryPCB. * Keyboard Maintainer: [Alhen](https://github.com/alhenx) * Hardware Supported: MerryPCB - + Make example for this keyboard (after setting up your build environment): - qmk compile -kb alhenkb/numpad -km default + make alhenkb/numpad:default + +Flashing example for this keyboard: + + make alhenkb/numpad: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). + +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 33862ea550e01b88ed2c76b38abf5f7e5eed0bf7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 14 Mar 2023 22:20:17 +0100 Subject: [PATCH 13/22] Update readme.md --- keyboards/alhenkb/macropad5x4/readme.md | 20 +++++++++++++++----- 1 file changed, 15 insertions(+), 5 deletions(-) diff --git a/keyboards/alhenkb/macropad5x4/readme.md b/keyboards/alhenkb/macropad5x4/readme.md index 4d9f43ae4127..5866a55dbb72 100644 --- a/keyboards/alhenkb/macropad5x4/readme.md +++ b/keyboards/alhenkb/macropad5x4/readme.md @@ -1,16 +1,26 @@ - # AlhenKB - Macropad 5x4 ![Imgur Image](https://imgur.com/t7Zi2w3.jpg) -A macropad 5x4. +A macropad 5x4 for MerryPCB. + * Keyboard Maintainer: [Alhen](https://github.com/alhenx) * Hardware Supported: MerryPCB - + Make example for this keyboard (after setting up your build environment): - qmk compile -kb alhenkb/macropad5x4 -km default + make alhenkb/macropad5x4:default + +Flashing example for this keyboard: + + make alhenkb/macropad5x4: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). - \ No newline at end of file +## Bootloader + +Enter the bootloader in 3 ways: + +* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard +* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead +* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available From 396392d16ade697edffac131269aa4176e3a01fe Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 21 Mar 2023 11:43:45 +0100 Subject: [PATCH 14/22] Delete keyboards/alhenkb/numpad directory --- keyboards/alhenkb/numpad/info.json | 50 ------------------- .../alhenkb/numpad/keymaps/default/keymap.c | 48 ------------------ keyboards/alhenkb/numpad/keymaps/via/keymap.c | 48 ------------------ keyboards/alhenkb/numpad/keymaps/via/rules.mk | 1 - keyboards/alhenkb/numpad/readme.md | 25 ---------- keyboards/alhenkb/numpad/rules.mk | 1 - 6 files changed, 173 deletions(-) delete mode 100644 keyboards/alhenkb/numpad/info.json delete mode 100644 keyboards/alhenkb/numpad/keymaps/default/keymap.c delete mode 100644 keyboards/alhenkb/numpad/keymaps/via/keymap.c delete mode 100644 keyboards/alhenkb/numpad/keymaps/via/rules.mk delete mode 100644 keyboards/alhenkb/numpad/readme.md delete mode 100644 keyboards/alhenkb/numpad/rules.mk diff --git a/keyboards/alhenkb/numpad/info.json b/keyboards/alhenkb/numpad/info.json deleted file mode 100644 index 778378751cb4..000000000000 --- a/keyboards/alhenkb/numpad/info.json +++ /dev/null @@ -1,50 +0,0 @@ -{ - "manufacturer": "AlhenKB", - "keyboard_name": "Numpad", - "maintainer": "alhenx", - "bootloader": "caterina", - "diode_direction": "COL2ROW", - "features": { - "bootmagic": true, - "command": false, - "console": false, - "extrakey": true, - "mousekey": true, - "nkro": true - }, - "matrix_pins": { - "rows": ["F5", "F7", "B3", "B6", "B5"], - "cols": ["F4", "F6", "B1", "B2"] - }, - "processor": "atmega32u4", - "url": "", - "usb": { - "device_version": "1.0.0", - "pid": "0x0000", - "vid": "0x6178" - }, - "community_layouts": ["numpad_5x4"], - "layouts": { - "LAYOUT_numpad_5x4": { - "layout": [ - {"label": "K00 (F5,F4)", "matrix": [0, 0], "x": 0, "y": 0}, - {"label": "K01 (F5,F6)", "matrix": [0, 1], "x": 1, "y": 0}, - {"label": "K02 (F5,B1)", "matrix": [0, 2], "x": 2, "y": 0}, - {"label": "K03 (F5,B2)", "matrix": [0, 3], "x": 3, "y": 0}, - {"label": "K10 (F7,F4)", "matrix": [1, 0], "x": 0, "y": 1}, - {"label": "K11 (F7,F6)", "matrix": [1, 1], "x": 1, "y": 1}, - {"label": "K12 (F7,B1)", "matrix": [1, 2], "x": 2, "y": 1}, - {"label": "K23 (B3,B2)", "matrix": [2, 3], "x": 3, "y": 1, "h": 2}, - {"label": "K20 (B3,F4)", "matrix": [2, 0], "x": 0, "y": 2}, - {"label": "K21 (B3,F6)", "matrix": [2, 1], "x": 1, "y": 2}, - {"label": "K22 (B3,B1)", "matrix": [2, 2], "x": 2, "y": 2}, - {"label": "K30 (B6,F4)", "matrix": [3, 0], "x": 0, "y": 3}, - {"label": "K31 (B6,F6)", "matrix": [3, 1], "x": 1, "y": 3}, - {"label": "K32 (B6,B1)", "matrix": [3, 2], "x": 2, "y": 3}, - {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 3, "h": 2}, - {"label": "K40 (B5,F4)", "matrix": [4, 0], "x": 0, "y": 4, "w": 2}, - {"label": "K42 (B5,B1)", "matrix": [4, 2], "x": 2, "y": 4} - ] - } - } -} diff --git a/keyboards/alhenkb/numpad/keymaps/default/keymap.c b/keyboards/alhenkb/numpad/keymaps/default/keymap.c deleted file mode 100644 index 1a7bb3f0841e..000000000000 --- a/keyboards/alhenkb/numpad/keymaps/default/keymap.c +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌───┬───┬───┬───┐ - * │TG1│ / │ * │ - │ - * ├───┼───┼───┼───┤ - * │ 7 │ 8 │ 9 │ │ - * ├───┼───┼───┤ + │ - * │ 4 │ 5 │ 6 │ │ - * ├───┼───┼───┼───┤ - * │ 1 │ 2 │ 3 │ │ - * ├───┴───┼───┤Ent│ - * │ 0 │ . │ │ - * └───────┴───┴───┘ - */ - [0] = LAYOUT_numpad_5x4( - TG(1), KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, - KC_P1, KC_P2, KC_P3, KC_PENT, - KC_P0, KC_PDOT - ), - - /* - * ┌───┬───┬───┬───┐ - * │TG1│ / │ * │ - │ - * ┌───┬───┬───┐───┤ - * │Hom│ ↑ │PgU│ │ - * ├───┼───┼───┤ + │ - * │ ← │ │ → │ │ - * ├───┼───┼───┤───┤ - * │End│ ↓ │PgD│ │ - * ├───┴───┼───┤Ent│ - * │Insert │Del│ │ - * └───────┴───┘───┘ - */ - [1] = LAYOUT_numpad_5x4( - _______, _______, _______, _______, - KC_HOME, KC_UP, KC_PGUP, _______, - KC_LEFT, XXXXXXX, KC_RGHT, - KC_END, KC_DOWN, KC_PGDN, _______, - KC_INS, KC_DEL - ) -}; diff --git a/keyboards/alhenkb/numpad/keymaps/via/keymap.c b/keyboards/alhenkb/numpad/keymaps/via/keymap.c deleted file mode 100644 index 1a7bb3f0841e..000000000000 --- a/keyboards/alhenkb/numpad/keymaps/via/keymap.c +++ /dev/null @@ -1,48 +0,0 @@ -// Copyright 2023 QMK -// SPDX-License-Identifier: GPL-2.0-or-later - -#include QMK_KEYBOARD_H - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - /* - * ┌───┬───┬───┬───┐ - * │TG1│ / │ * │ - │ - * ├───┼───┼───┼───┤ - * │ 7 │ 8 │ 9 │ │ - * ├───┼───┼───┤ + │ - * │ 4 │ 5 │ 6 │ │ - * ├───┼───┼───┼───┤ - * │ 1 │ 2 │ 3 │ │ - * ├───┴───┼───┤Ent│ - * │ 0 │ . │ │ - * └───────┴───┴───┘ - */ - [0] = LAYOUT_numpad_5x4( - TG(1), KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, - KC_P1, KC_P2, KC_P3, KC_PENT, - KC_P0, KC_PDOT - ), - - /* - * ┌───┬───┬───┬───┐ - * │TG1│ / │ * │ - │ - * ┌───┬───┬───┐───┤ - * │Hom│ ↑ │PgU│ │ - * ├───┼───┼───┤ + │ - * │ ← │ │ → │ │ - * ├───┼───┼───┤───┤ - * │End│ ↓ │PgD│ │ - * ├───┴───┼───┤Ent│ - * │Insert │Del│ │ - * └───────┴───┘───┘ - */ - [1] = LAYOUT_numpad_5x4( - _______, _______, _______, _______, - KC_HOME, KC_UP, KC_PGUP, _______, - KC_LEFT, XXXXXXX, KC_RGHT, - KC_END, KC_DOWN, KC_PGDN, _______, - KC_INS, KC_DEL - ) -}; diff --git a/keyboards/alhenkb/numpad/keymaps/via/rules.mk b/keyboards/alhenkb/numpad/keymaps/via/rules.mk deleted file mode 100644 index 036bd6d1c3ec..000000000000 --- a/keyboards/alhenkb/numpad/keymaps/via/rules.mk +++ /dev/null @@ -1 +0,0 @@ -VIA_ENABLE = yes \ No newline at end of file diff --git a/keyboards/alhenkb/numpad/readme.md b/keyboards/alhenkb/numpad/readme.md deleted file mode 100644 index 066265cde453..000000000000 --- a/keyboards/alhenkb/numpad/readme.md +++ /dev/null @@ -1,25 +0,0 @@ -# AlhenKB - Numpad - -![Imgur Image](http://imgur.com/5xlKJlB.jpg) - -A basic numpad for MerryPCB. -* Keyboard Maintainer: [Alhen](https://github.com/alhenx) -* Hardware Supported: MerryPCB - -Make example for this keyboard (after setting up your build environment): - - make alhenkb/numpad:default - -Flashing example for this keyboard: - - make alhenkb/numpad: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). - -## Bootloader - -Enter the bootloader in 3 ways: - -* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard -* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead -* **Keycode in layout**: Press the key mapped to `QK_BOOT` if it is available diff --git a/keyboards/alhenkb/numpad/rules.mk b/keyboards/alhenkb/numpad/rules.mk deleted file mode 100644 index 6e7633bfe015..000000000000 --- a/keyboards/alhenkb/numpad/rules.mk +++ /dev/null @@ -1 +0,0 @@ -# This file intentionally left blank From 6a584546dc82c1d669ccc8d9c2ea2c11872c3bb3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 21 Mar 2023 11:44:18 +0100 Subject: [PATCH 15/22] Update info.json --- keyboards/alhenkb/macropad5x4/info.json | 27 ++++++++++++++++++++++--- 1 file changed, 24 insertions(+), 3 deletions(-) diff --git a/keyboards/alhenkb/macropad5x4/info.json b/keyboards/alhenkb/macropad5x4/info.json index 57a9097dbec1..7105946213fe 100644 --- a/keyboards/alhenkb/macropad5x4/info.json +++ b/keyboards/alhenkb/macropad5x4/info.json @@ -2,7 +2,7 @@ "manufacturer": "AlhenKB", "keyboard_name": "Macropad 5x4", "maintainer": "alhenx", - "bootloader": "caterina", + "development_board": "promicro", "diode_direction": "COL2ROW", "features": { "bootmagic": true, @@ -16,15 +16,15 @@ "rows": ["F5", "F7", "B3", "B6", "B5"], "cols": ["F4", "F6", "B1", "B2"] }, - "processor": "atmega32u4", "url": "", "usb": { "device_version": "1.0.0", "pid": "0x0001", "vid": "0x6178" }, + "community_layouts": ["ortho_5x4"], "layouts": { - "LAYOUT": { + "LAYOUT_ortho_5x4": { "layout": [ {"label": "K00 (F5,F4)", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K01 (F5,F6)", "matrix": [0, 1], "x": 1, "y": 0}, @@ -47,6 +47,27 @@ {"label": "K42 (B5,B1)", "matrix": [4, 2], "x": 2, "y": 4}, {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 3} ] + }, + "LAYOUT_num4x5": { + "layout": [ + {"label": "K00 (F5,F4)", "matrix": [0, 0], "x": 0, "y": 0}, + {"label": "K01 (F5,F6)", "matrix": [0, 1], "x": 1, "y": 0}, + {"label": "K02 (F5,B1)", "matrix": [0, 2], "x": 2, "y": 0}, + {"label": "K03 (F5,B2)", "matrix": [0, 3], "x": 3, "y": 0}, + {"label": "K10 (F7,F4)", "matrix": [1, 0], "x": 0, "y": 1}, + {"label": "K11 (F7,F6)", "matrix": [1, 1], "x": 1, "y": 1}, + {"label": "K12 (F7,B1)", "matrix": [1, 2], "x": 2, "y": 1}, + {"label": "K23 (B3,B2)", "matrix": [2, 3], "x": 3, "y": 1, "h": 2}, + {"label": "K20 (B3,F4)", "matrix": [2, 0], "x": 0, "y": 2}, + {"label": "K21 (B3,F6)", "matrix": [2, 1], "x": 1, "y": 2}, + {"label": "K22 (B3,B1)", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "K30 (B6,F4)", "matrix": [3, 0], "x": 0, "y": 3}, + {"label": "K31 (B6,F6)", "matrix": [3, 1], "x": 1, "y": 3}, + {"label": "K32 (B6,B1)", "matrix": [3, 2], "x": 2, "y": 3}, + {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 3, "h": 2}, + {"label": "K40 (B5,F4)", "matrix": [4, 0], "x": 0, "y": 4, "w": 2}, + {"label": "K42 (B5,B1)", "matrix": [4, 2], "x": 2, "y": 4} + ] } } } From 771e0b963d3b7a96ac7dbd4cb78d41149c713db3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 21 Mar 2023 11:44:44 +0100 Subject: [PATCH 16/22] Update keymap.c --- keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c b/keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c index 4823f587e911..12a878346e4d 100644 --- a/keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c +++ b/keyboards/alhenkb/macropad5x4/keymaps/default/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ Z │ X │ C │ V │ * └───────┴───┴───┘ */ - [0] = LAYOUT( + [0] = LAYOUT_ortho_5x4( KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_Q, KC_W, KC_E, KC_R, From e9b64b083f2dd0db9fce09c8e6215f0e8c0de597 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 21 Mar 2023 11:45:22 +0100 Subject: [PATCH 17/22] Update keymap.c --- keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c b/keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c index 4823f587e911..12a878346e4d 100644 --- a/keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c +++ b/keyboards/alhenkb/macropad5x4/keymaps/via/keymap.c @@ -17,7 +17,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ Z │ X │ C │ V │ * └───────┴───┴───┘ */ - [0] = LAYOUT( + [0] = LAYOUT_ortho_5x4( KC_P1, KC_P2, KC_P3, KC_P4, KC_P5, KC_P6, KC_P7, KC_P8, KC_Q, KC_W, KC_E, KC_R, From 31b2c4497ff8553ff81cd077bc05252d9ea8a43d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 21 Mar 2023 11:46:07 +0100 Subject: [PATCH 18/22] Create keymap.c --- .../macropad5x4/keymaps/numpad/keymap.c | 48 +++++++++++++++++++ 1 file changed, 48 insertions(+) create mode 100644 keyboards/alhenkb/macropad5x4/keymaps/numpad/keymap.c diff --git a/keyboards/alhenkb/macropad5x4/keymaps/numpad/keymap.c b/keyboards/alhenkb/macropad5x4/keymaps/numpad/keymap.c new file mode 100644 index 000000000000..5039585f0ec1 --- /dev/null +++ b/keyboards/alhenkb/macropad5x4/keymaps/numpad/keymap.c @@ -0,0 +1,48 @@ +// Copyright 2023 QMK +// SPDX-License-Identifier: GPL-2.0-or-later + +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + /* + * ┌───┬───┬───┬───┐ + * │TG1│ / │ * │ - │ + * ├───┼───┼───┼───┤ + * │ 7 │ 8 │ 9 │ │ + * ├───┼───┼───┤ + │ + * │ 4 │ 5 │ 6 │ │ + * ├───┼───┼───┼───┤ + * │ 1 │ 2 │ 3 │ │ + * ├───┴───┼───┤Ent│ + * │ 0 │ . │ │ + * └───────┴───┴───┘ + */ + [0] = LAYOUT_num4x5( + TG(1), KC_PSLS, KC_PAST, KC_PMNS, + KC_P7, KC_P8, KC_P9, KC_PPLS, + KC_P4, KC_P5, KC_P6, + KC_P1, KC_P2, KC_P3, KC_PENT, + KC_P0, KC_PDOT + ), + + /* + * ┌───┬───┬───┬───┐ + * │TG1│ / │ * │ - │ + * ┌───┬───┬───┐───┤ + * │Hom│ ↑ │PgU│ │ + * ├───┼───┼───┤ + │ + * │ ← │ │ → │ │ + * ├───┼───┼───┤───┤ + * │End│ ↓ │PgD│ │ + * ├───┴───┼───┤Ent│ + * │Insert │Del│ │ + * └───────┴───┘───┘ + */ + [1] = LAYOUT_num4x5( + _______, _______, _______, _______, + KC_HOME, KC_UP, KC_PGUP, _______, + KC_LEFT, XXXXXXX, KC_RGHT, + KC_END, KC_DOWN, KC_PGDN, _______, + KC_INS, KC_DEL + ) +}; From 8a7fd6b30005ef2c9e965e994cd9e65b7fa353ef Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Tue, 21 Mar 2023 11:52:46 +0100 Subject: [PATCH 19/22] Update readme.md --- keyboards/alhenkb/macropad5x4/readme.md | 19 +++++++++++++++++-- 1 file changed, 17 insertions(+), 2 deletions(-) diff --git a/keyboards/alhenkb/macropad5x4/readme.md b/keyboards/alhenkb/macropad5x4/readme.md index 5866a55dbb72..f708550f8ad1 100644 --- a/keyboards/alhenkb/macropad5x4/readme.md +++ b/keyboards/alhenkb/macropad5x4/readme.md @@ -1,6 +1,8 @@ -# AlhenKB - Macropad 5x4 +# AlhenKB - Macropad 5x4 and Numpad + +![Imgur Image](https://imgur.com/t7Zi2w3h.jpg) +![Imgur Image](https://i.imgur.com/5xlKJlBh.jpg) -![Imgur Image](https://imgur.com/t7Zi2w3.jpg) A macropad 5x4 for MerryPCB. @@ -9,11 +11,24 @@ A macropad 5x4 for MerryPCB. Make example for this keyboard (after setting up your build environment): +Macropad: + make alhenkb/macropad5x4:default + +Numpad: + + make alhenkb/macropad5x4:numpad Flashing example for this keyboard: +Macropad: + make alhenkb/macropad5x4:default:flash + + +Numpad: + + make alhenkb/macropad5x4:numpad: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). From 3cd48e463efe0fa79ff010d71fce473b9ef7be9e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Thu, 23 Mar 2023 11:44:00 +0100 Subject: [PATCH 20/22] Update keymap.c --- .../macropad5x4/keymaps/numpad/keymap.c | 20 +++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/keyboards/alhenkb/macropad5x4/keymaps/numpad/keymap.c b/keyboards/alhenkb/macropad5x4/keymaps/numpad/keymap.c index 5039585f0ec1..7a1e287e38fb 100644 --- a/keyboards/alhenkb/macropad5x4/keymaps/numpad/keymap.c +++ b/keyboards/alhenkb/macropad5x4/keymaps/numpad/keymap.c @@ -17,12 +17,12 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │ 0 │ . │ │ * └───────┴───┴───┘ */ - [0] = LAYOUT_num4x5( + [0] = LAYOUT_numpad_5x4( TG(1), KC_PSLS, KC_PAST, KC_PMNS, - KC_P7, KC_P8, KC_P9, KC_PPLS, - KC_P4, KC_P5, KC_P6, - KC_P1, KC_P2, KC_P3, KC_PENT, - KC_P0, KC_PDOT + KC_P7, KC_P8, KC_P9, + KC_P4, KC_P5, KC_P6, KC_PPLS, + KC_P1, KC_P2, KC_P3, + KC_P0, KC_PDOT, KC_PENT ), /* @@ -38,11 +38,11 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { * │Insert │Del│ │ * └───────┴───┘───┘ */ - [1] = LAYOUT_num4x5( + [1] = LAYOUT_numpad_5x4( _______, _______, _______, _______, - KC_HOME, KC_UP, KC_PGUP, _______, - KC_LEFT, XXXXXXX, KC_RGHT, - KC_END, KC_DOWN, KC_PGDN, _______, - KC_INS, KC_DEL + KC_HOME, KC_UP, KC_PGUP, + KC_LEFT, XXXXXXX, KC_RGHT, _______, + KC_END, KC_DOWN, KC_PGDN, + KC_INS, KC_DEL, _______ ) }; From af9786b0bdeab46904fc2dc439ea93b2bbe91553 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Thu, 23 Mar 2023 11:44:02 +0100 Subject: [PATCH 21/22] Update info.json --- keyboards/alhenkb/macropad5x4/info.json | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/alhenkb/macropad5x4/info.json b/keyboards/alhenkb/macropad5x4/info.json index 7105946213fe..daae135f5483 100644 --- a/keyboards/alhenkb/macropad5x4/info.json +++ b/keyboards/alhenkb/macropad5x4/info.json @@ -22,7 +22,7 @@ "pid": "0x0001", "vid": "0x6178" }, - "community_layouts": ["ortho_5x4"], + "community_layouts": ["ortho_5x4", "numpad_5x4"], "layouts": { "LAYOUT_ortho_5x4": { "layout": [ @@ -57,16 +57,16 @@ {"label": "K10 (F7,F4)", "matrix": [1, 0], "x": 0, "y": 1}, {"label": "K11 (F7,F6)", "matrix": [1, 1], "x": 1, "y": 1}, {"label": "K12 (F7,B1)", "matrix": [1, 2], "x": 2, "y": 1}, - {"label": "K23 (B3,B2)", "matrix": [2, 3], "x": 3, "y": 1, "h": 2}, {"label": "K20 (B3,F4)", "matrix": [2, 0], "x": 0, "y": 2}, {"label": "K21 (B3,F6)", "matrix": [2, 1], "x": 1, "y": 2}, {"label": "K22 (B3,B1)", "matrix": [2, 2], "x": 2, "y": 2}, + {"label": "K23 (B3,B2)", "matrix": [2, 3], "x": 3, "y": 1, "h": 2}, {"label": "K30 (B6,F4)", "matrix": [3, 0], "x": 0, "y": 3}, {"label": "K31 (B6,F6)", "matrix": [3, 1], "x": 1, "y": 3}, {"label": "K32 (B6,B1)", "matrix": [3, 2], "x": 2, "y": 3}, - {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 3, "h": 2}, {"label": "K40 (B5,F4)", "matrix": [4, 0], "x": 0, "y": 4, "w": 2}, {"label": "K42 (B5,B1)", "matrix": [4, 2], "x": 2, "y": 4} + {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 3, "h": 2}, ] } } From d2fd35702d55aa4a590aab1b7aaa2b6310b64cf5 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Alejandro=20Chac=C3=B3n?= Date: Thu, 23 Mar 2023 11:54:54 +0100 Subject: [PATCH 22/22] Update info.json --- keyboards/alhenkb/macropad5x4/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/alhenkb/macropad5x4/info.json b/keyboards/alhenkb/macropad5x4/info.json index daae135f5483..787b19877e27 100644 --- a/keyboards/alhenkb/macropad5x4/info.json +++ b/keyboards/alhenkb/macropad5x4/info.json @@ -48,7 +48,7 @@ {"label": "K43 (B5,B2)", "matrix": [4, 3], "x": 3, "y": 3} ] }, - "LAYOUT_num4x5": { + "LAYOUT_numpad_5x4": { "layout": [ {"label": "K00 (F5,F4)", "matrix": [0, 0], "x": 0, "y": 0}, {"label": "K01 (F5,F6)", "matrix": [0, 1], "x": 1, "y": 0},