From 8484a52c485123beeda1d3578a05436185d1c9ca Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Mon, 4 Mar 2024 17:48:29 -0500 Subject: [PATCH 01/12] adds rot13labs hackboard --- keyboards/rot13labs/hackboard/info.json | 124 ++++++++++++++++++ .../hackboard/keymaps/default/keymap.c | 34 +++++ keyboards/rot13labs/hackboard/readme.md | 22 ++++ keyboards/rot13labs/hackboard/rules.mk | 15 +++ 4 files changed, 195 insertions(+) create mode 100644 keyboards/rot13labs/hackboard/info.json create mode 100644 keyboards/rot13labs/hackboard/keymaps/default/keymap.c create mode 100644 keyboards/rot13labs/hackboard/readme.md create mode 100644 keyboards/rot13labs/hackboard/rules.mk diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/info.json new file mode 100644 index 000000000000..50881aa14f0f --- /dev/null +++ b/keyboards/rot13labs/hackboard/info.json @@ -0,0 +1,124 @@ +{ + "keyboard_name": "HACKBOARD", + "manufacturer": "rot13labs", + "url": "https://rot13labs.com", + "maintainer": "c0ldbru", + "usb": { + "vid": "0xBEEF", + "pid": "0xCAFE", + "device_version": "1.0.0" + }, + "matrix_pins": { + "cols": ["A0", "B0", "A1", "B1", "A2", "B2", "A3", "B3", "A4", "B4", "A5", "A6", "A7", "D6", "D5", "D1", "D0", "D7"], + "rows": ["C2", "C3", "C7", "C4", "C6", "C5"] + }, + "diode_direction": "COL2ROW", + "processor": "atmega32a", + "bootloader": "usbasploader", + "layouts": { + "LAYOUT_tkl_ansi": { + "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": [0, 4], "x": 4, "y": 0}, + {"matrix": [0, 5], "x": 5, "y": 0}, + + {"matrix": [0, 6], "x": 6.5, "y": 0}, + {"matrix": [0, 7], "x": 7.5, "y": 0}, + {"matrix": [0, 8], "x": 8.5, "y": 0}, + {"matrix": [0, 9], "x": 9.5, "y": 0}, + + {"matrix": [0, 11], "x": 11, "y": 0}, + {"matrix": [0, 12], "x": 12, "y": 0}, + {"matrix": [0, 13], "x": 13, "y": 0}, + {"matrix": [0, 14], "x": 14, "y": 0}, + + {"matrix": [0, 15], "x": 15.25, "y": 0}, + {"matrix": [0, 16], "x": 16.25, "y": 0}, + {"matrix": [0, 17], "x": 17.25, "y": 0}, + + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.25}, + {"matrix": [1, 16], "x": 16.25, "y": 1.25}, + {"matrix": [1, 17], "x": 17.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2.25}, + {"matrix": [2, 16], "x": 16.25, "y": 2.25}, + {"matrix": [2, 17], "x": 17.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + + {"matrix": [4, 16], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 15], "x": 15.25, "y": 5.25}, + {"matrix": [5, 16], "x": 16.25, "y": 5.25}, + {"matrix": [5, 17], "x": 17.25, "y": 5.25} + ] + } + } +} diff --git a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c new file mode 100644 index 000000000000..2dab4aa58bb1 --- /dev/null +++ b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c @@ -0,0 +1,34 @@ +/* Copyright 2023 rot13labs + * + * 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 . + */ +#include QMK_KEYBOARD_H + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [0] = LAYOUT_tkl_ansi( + KC_ESC, KC_NO, 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_PSCR, KC_SCRL, KC_PAUS, + KC_GRV, 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_INS, KC_HOME, KC_PGUP, + 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_BSLS, KC_DEL, KC_END, KC_PGDN, + 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_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, KC_UP, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), + + [1] = LAYOUT_tkl_ansi( + KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) +}; diff --git a/keyboards/rot13labs/hackboard/readme.md b/keyboards/rot13labs/hackboard/readme.md new file mode 100644 index 000000000000..c14b742326c2 --- /dev/null +++ b/keyboards/rot13labs/hackboard/readme.md @@ -0,0 +1,22 @@ +# HACKBOARD + +![hackboard](https://i.imgur.com/te8feiB.png) + +A TKL keyboard for hackers based on the mysterium platform by coseyfannitutti + +* Keyboard Maintainer: [c0ldbru](https://github.com/c0ldbru) +* Hardware Supported: HACKBOARD // atmega32a +* Hardware Availability: [rot13labs](https://rot13labs.com) + +Make example for this keyboard (after setting up your build environment): + + make rot13labs/hackboard: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). + +## Bootloader + +You can enter the bootloader to flash on new firmware in one of two ways: + +* **Bootmagic**: Hold the ESC key (top left key) and hit reset +* **Boot button**: Hold the boot button on the top of the PCB and hit reset \ No newline at end of file diff --git a/keyboards/rot13labs/hackboard/rules.mk b/keyboards/rot13labs/hackboard/rules.mk new file mode 100644 index 000000000000..b6082e107ceb --- /dev/null +++ b/keyboards/rot13labs/hackboard/rules.mk @@ -0,0 +1,15 @@ +# Processor frequency +F_CPU = 16000000 + +# Build Options +# change yes to no to disable +# +BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite +MOUSEKEY_ENABLE = no # Mouse keys +EXTRAKEY_ENABLE = yes # Audio control and System control +CONSOLE_ENABLE = no # Console for debug +COMMAND_ENABLE = no # Commands for debug and configuration +NKRO_ENABLE = no # Enable N-Key Rollover +BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality +RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow +AUDIO_ENABLE = no # Audio output From 0bf61dca10af00d66db2c2ed42058271b56cffca Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Wed, 6 Mar 2024 12:04:35 -0500 Subject: [PATCH 02/12] Update keyboards/rot13labs/hackboard/info.json Co-authored-by: Duncan Sutherland --- keyboards/rot13labs/hackboard/info.json | 1 + 1 file changed, 1 insertion(+) diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/info.json index 50881aa14f0f..34f355d056a6 100644 --- a/keyboards/rot13labs/hackboard/info.json +++ b/keyboards/rot13labs/hackboard/info.json @@ -15,6 +15,7 @@ "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", + "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { "layout": [ From 512be6ea4916dcbedef30848719b4a4f8fa85a69 Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Wed, 6 Mar 2024 12:13:14 -0500 Subject: [PATCH 03/12] Update rules.mk removing enables from rules to move into info.json features --- keyboards/rot13labs/hackboard/rules.mk | 13 ------------- 1 file changed, 13 deletions(-) diff --git a/keyboards/rot13labs/hackboard/rules.mk b/keyboards/rot13labs/hackboard/rules.mk index b6082e107ceb..c2ee0bc86f97 100644 --- a/keyboards/rot13labs/hackboard/rules.mk +++ b/keyboards/rot13labs/hackboard/rules.mk @@ -1,15 +1,2 @@ # Processor frequency F_CPU = 16000000 - -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = no # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = no # Enable N-Key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output From 71bc8fa2dbc9a350d28f9b4d14764f85f493eeee Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Wed, 6 Mar 2024 12:14:01 -0500 Subject: [PATCH 04/12] Update info.json adds features from rules.mk --- keyboards/rot13labs/hackboard/info.json | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/info.json index 34f355d056a6..f706ab2db2fc 100644 --- a/keyboards/rot13labs/hackboard/info.json +++ b/keyboards/rot13labs/hackboard/info.json @@ -3,6 +3,14 @@ "manufacturer": "rot13labs", "url": "https://rot13labs.com", "maintainer": "c0ldbru", + "features": { + "bootmagic": true, + "command": false, + "console": false, + "extrakey": true, + "mousekey": false, + "nkro": false + }, "usb": { "vid": "0xBEEF", "pid": "0xCAFE", From cf84aea979cb436bc392e77d074c7e9cf99429da Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Thu, 7 Mar 2024 08:48:19 -0500 Subject: [PATCH 05/12] Update info.json removes community layout as the hackboard does not support the tkl_ansi community layout --- keyboards/rot13labs/hackboard/info.json | 1 - 1 file changed, 1 deletion(-) diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/info.json index f706ab2db2fc..4b07eac6aa8d 100644 --- a/keyboards/rot13labs/hackboard/info.json +++ b/keyboards/rot13labs/hackboard/info.json @@ -23,7 +23,6 @@ "diode_direction": "COL2ROW", "processor": "atmega32a", "bootloader": "usbasploader", - "community_layouts": ["tkl_ansi"], "layouts": { "LAYOUT_tkl_ansi": { "layout": [ From 5111a297ac1aff1249bc58b7546e20d1c3268182 Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Sat, 9 Mar 2024 11:33:13 -0500 Subject: [PATCH 06/12] Update keyboards/rot13labs/hackboard/info.json Co-authored-by: Duncan Sutherland --- keyboards/rot13labs/hackboard/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/info.json index 4b07eac6aa8d..f36fbcb63e5d 100644 --- a/keyboards/rot13labs/hackboard/info.json +++ b/keyboards/rot13labs/hackboard/info.json @@ -24,7 +24,7 @@ "processor": "atmega32a", "bootloader": "usbasploader", "layouts": { - "LAYOUT_tkl_ansi": { + "LAYOUT": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0}, {"matrix": [0, 1], "x": 1, "y": 0}, From 0c1208f30d6315eafc093e8054e9c796ad210fe6 Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Sat, 9 Mar 2024 11:33:23 -0500 Subject: [PATCH 07/12] Update keyboards/rot13labs/hackboard/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland --- keyboards/rot13labs/hackboard/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c index 2dab4aa58bb1..003fc3230a87 100644 --- a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c +++ b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c @@ -16,7 +16,7 @@ #include QMK_KEYBOARD_H const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [0] = LAYOUT_tkl_ansi( + [0] = LAYOUT( KC_ESC, KC_NO, 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_PSCR, KC_SCRL, KC_PAUS, KC_GRV, 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_INS, KC_HOME, KC_PGUP, 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_BSLS, KC_DEL, KC_END, KC_PGDN, @@ -24,7 +24,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LSFT, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), - [1] = LAYOUT_tkl_ansi( + [1] = LAYOUT( KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From 4488198b4651f9b62be0a98d252bb183aaf100fa Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Sat, 9 Mar 2024 11:43:39 -0500 Subject: [PATCH 08/12] Update info.json updates the layout to more closely match the hackboard --- keyboards/rot13labs/hackboard/info.json | 178 ++++++++++++------------ 1 file changed, 90 insertions(+), 88 deletions(-) diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/info.json index f36fbcb63e5d..b5f2b24b02be 100644 --- a/keyboards/rot13labs/hackboard/info.json +++ b/keyboards/rot13labs/hackboard/info.json @@ -26,106 +26,108 @@ "layouts": { "LAYOUT": { "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": [0, 4], "x": 4, "y": 0}, - {"matrix": [0, 5], "x": 5, "y": 0}, + {"matrix": [0, 1], "x": 6, "y": 0}, - {"matrix": [0, 6], "x": 6.5, "y": 0}, - {"matrix": [0, 7], "x": 7.5, "y": 0}, - {"matrix": [0, 8], "x": 8.5, "y": 0}, - {"matrix": [0, 9], "x": 9.5, "y": 0}, + {"matrix": [0, 0], "x": 0, "y": 1}, - {"matrix": [0, 11], "x": 11, "y": 0}, - {"matrix": [0, 12], "x": 12, "y": 0}, - {"matrix": [0, 13], "x": 13, "y": 0}, - {"matrix": [0, 14], "x": 14, "y": 0}, + {"matrix": [0, 2], "x": 2, "y": 1}, + {"matrix": [0, 3], "x": 3, "y": 1}, + {"matrix": [0, 4], "x": 4, "y": 1}, + {"matrix": [0, 5], "x": 5, "y": 1}, - {"matrix": [0, 15], "x": 15.25, "y": 0}, - {"matrix": [0, 16], "x": 16.25, "y": 0}, - {"matrix": [0, 17], "x": 17.25, "y": 0}, + {"matrix": [0, 6], "x": 6.5, "y": 1}, + {"matrix": [0, 7], "x": 7.5, "y": 1}, + {"matrix": [0, 8], "x": 8.5, "y": 1}, + {"matrix": [0, 9], "x": 9.5, "y": 1}, - {"matrix": [1, 0], "x": 0, "y": 1.25}, - {"matrix": [1, 1], "x": 1, "y": 1.25}, - {"matrix": [1, 2], "x": 2, "y": 1.25}, - {"matrix": [1, 3], "x": 3, "y": 1.25}, - {"matrix": [1, 4], "x": 4, "y": 1.25}, - {"matrix": [1, 5], "x": 5, "y": 1.25}, - {"matrix": [1, 6], "x": 6, "y": 1.25}, - {"matrix": [1, 7], "x": 7, "y": 1.25}, - {"matrix": [1, 8], "x": 8, "y": 1.25}, - {"matrix": [1, 9], "x": 9, "y": 1.25}, - {"matrix": [1, 10], "x": 10, "y": 1.25}, - {"matrix": [1, 11], "x": 11, "y": 1.25}, - {"matrix": [1, 12], "x": 12, "y": 1.25}, - {"matrix": [1, 13], "x": 13, "y": 1.25, "w": 2}, + {"matrix": [0, 11], "x": 11, "y": 1}, + {"matrix": [0, 12], "x": 12, "y": 1}, + {"matrix": [0, 13], "x": 13, "y": 1}, + {"matrix": [0, 14], "x": 14, "y": 1}, - {"matrix": [1, 15], "x": 15.25, "y": 1.25}, - {"matrix": [1, 16], "x": 16.25, "y": 1.25}, - {"matrix": [1, 17], "x": 17.25, "y": 1.25}, + {"matrix": [0, 15], "x": 15.25, "y": 1}, + {"matrix": [0, 16], "x": 16.25, "y": 1}, + {"matrix": [0, 17], "x": 17.25, "y": 1}, - {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, - {"matrix": [2, 1], "x": 1.5, "y": 2.25}, - {"matrix": [2, 2], "x": 2.5, "y": 2.25}, - {"matrix": [2, 3], "x": 3.5, "y": 2.25}, - {"matrix": [2, 4], "x": 4.5, "y": 2.25}, - {"matrix": [2, 5], "x": 5.5, "y": 2.25}, - {"matrix": [2, 6], "x": 6.5, "y": 2.25}, - {"matrix": [2, 7], "x": 7.5, "y": 2.25}, - {"matrix": [2, 8], "x": 8.5, "y": 2.25}, - {"matrix": [2, 9], "x": 9.5, "y": 2.25}, - {"matrix": [2, 10], "x": 10.5, "y": 2.25}, - {"matrix": [2, 11], "x": 11.5, "y": 2.25}, - {"matrix": [2, 12], "x": 12.5, "y": 2.25}, - {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + {"matrix": [1, 0], "x": 0, "y": 2.25}, + {"matrix": [1, 1], "x": 1, "y": 2.25}, + {"matrix": [1, 2], "x": 2, "y": 2.25}, + {"matrix": [1, 3], "x": 3, "y": 2.25}, + {"matrix": [1, 4], "x": 4, "y": 2.25}, + {"matrix": [1, 5], "x": 5, "y": 2.25}, + {"matrix": [1, 6], "x": 6, "y": 2.25}, + {"matrix": [1, 7], "x": 7, "y": 2.25}, + {"matrix": [1, 8], "x": 8, "y": 2.25}, + {"matrix": [1, 9], "x": 9, "y": 2.25}, + {"matrix": [1, 10], "x": 10, "y": 2.25}, + {"matrix": [1, 11], "x": 11, "y": 2.25}, + {"matrix": [1, 12], "x": 12, "y": 2.25}, + {"matrix": [1, 13], "x": 13, "y": 2.25, "w": 2}, - {"matrix": [2, 15], "x": 15.25, "y": 2.25}, - {"matrix": [2, 16], "x": 16.25, "y": 2.25}, - {"matrix": [2, 17], "x": 17.25, "y": 2.25}, + {"matrix": [1, 15], "x": 15.25, "y": 2.25}, + {"matrix": [1, 16], "x": 16.25, "y": 2.25}, + {"matrix": [1, 17], "x": 17.25, "y": 2.25}, - {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, - {"matrix": [3, 1], "x": 1.75, "y": 3.25}, - {"matrix": [3, 2], "x": 2.75, "y": 3.25}, - {"matrix": [3, 3], "x": 3.75, "y": 3.25}, - {"matrix": [3, 4], "x": 4.75, "y": 3.25}, - {"matrix": [3, 5], "x": 5.75, "y": 3.25}, - {"matrix": [3, 6], "x": 6.75, "y": 3.25}, - {"matrix": [3, 7], "x": 7.75, "y": 3.25}, - {"matrix": [3, 8], "x": 8.75, "y": 3.25}, - {"matrix": [3, 9], "x": 9.75, "y": 3.25}, - {"matrix": [3, 10], "x": 10.75, "y": 3.25}, - {"matrix": [3, 11], "x": 11.75, "y": 3.25}, - {"matrix": [3, 13], "x": 12.75, "y": 3.25, "w": 2.25}, + {"matrix": [2, 0], "x": 0, "y": 3.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 3.25}, + {"matrix": [2, 2], "x": 2.5, "y": 3.25}, + {"matrix": [2, 3], "x": 3.5, "y": 3.25}, + {"matrix": [2, 4], "x": 4.5, "y": 3.25}, + {"matrix": [2, 5], "x": 5.5, "y": 3.25}, + {"matrix": [2, 6], "x": 6.5, "y": 3.25}, + {"matrix": [2, 7], "x": 7.5, "y": 3.25}, + {"matrix": [2, 8], "x": 8.5, "y": 3.25}, + {"matrix": [2, 9], "x": 9.5, "y": 3.25}, + {"matrix": [2, 10], "x": 10.5, "y": 3.25}, + {"matrix": [2, 11], "x": 11.5, "y": 3.25}, + {"matrix": [2, 12], "x": 12.5, "y": 3.25}, + {"matrix": [2, 13], "x": 13.5, "y": 3.25, "w": 1.5}, - {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 2.25}, - {"matrix": [4, 1], "x": 2.25, "y": 4.25}, - {"matrix": [4, 2], "x": 3.25, "y": 4.25}, - {"matrix": [4, 3], "x": 4.25, "y": 4.25}, - {"matrix": [4, 4], "x": 5.25, "y": 4.25}, - {"matrix": [4, 5], "x": 6.25, "y": 4.25}, - {"matrix": [4, 6], "x": 7.25, "y": 4.25}, - {"matrix": [4, 7], "x": 8.25, "y": 4.25}, - {"matrix": [4, 8], "x": 9.25, "y": 4.25}, - {"matrix": [4, 9], "x": 10.25, "y": 4.25}, - {"matrix": [4, 10], "x": 11.25, "y": 4.25}, - {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 2.75}, + {"matrix": [2, 15], "x": 15.25, "y": 3.25}, + {"matrix": [2, 16], "x": 16.25, "y": 3.25}, + {"matrix": [2, 17], "x": 17.25, "y": 3.25}, - {"matrix": [4, 16], "x": 16.25, "y": 4.25}, + {"matrix": [3, 0], "x": 0, "y": 4.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 4.25}, + {"matrix": [3, 2], "x": 2.75, "y": 4.25}, + {"matrix": [3, 3], "x": 3.75, "y": 4.25}, + {"matrix": [3, 4], "x": 4.75, "y": 4.25}, + {"matrix": [3, 5], "x": 5.75, "y": 4.25}, + {"matrix": [3, 6], "x": 6.75, "y": 4.25}, + {"matrix": [3, 7], "x": 7.75, "y": 4.25}, + {"matrix": [3, 8], "x": 8.75, "y": 4.25}, + {"matrix": [3, 9], "x": 9.75, "y": 4.25}, + {"matrix": [3, 10], "x": 10.75, "y": 4.25}, + {"matrix": [3, 11], "x": 11.75, "y": 4.25}, + {"matrix": [3, 13], "x": 12.75, "y": 4.25, "w": 2.25}, - {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, - {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, - {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, - {"matrix": [5, 6], "x": 3.75, "y": 5.25, "w": 6.25}, - {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, - {"matrix": [5, 10], "x": 11.25, "y": 5.25, "w": 1.25}, - {"matrix": [5, 12], "x": 12.5, "y": 5.25, "w": 1.25}, - {"matrix": [5, 14], "x": 13.75, "y": 5.25, "w": 1.25}, + {"matrix": [4, 0], "x": 0, "y": 5.25, "w": 2.25}, + {"matrix": [4, 1], "x": 2.25, "y": 5.25}, + {"matrix": [4, 2], "x": 3.25, "y": 5.25}, + {"matrix": [4, 3], "x": 4.25, "y": 5.25}, + {"matrix": [4, 4], "x": 5.25, "y": 5.25}, + {"matrix": [4, 5], "x": 6.25, "y": 5.25}, + {"matrix": [4, 6], "x": 7.25, "y": 5.25}, + {"matrix": [4, 7], "x": 8.25, "y": 5.25}, + {"matrix": [4, 8], "x": 9.25, "y": 5.25}, + {"matrix": [4, 9], "x": 10.25, "y": 5.25}, + {"matrix": [4, 10], "x": 11.25, "y": 5.25}, + {"matrix": [4, 13], "x": 12.25, "y": 5.25, "w": 2.75}, - {"matrix": [5, 15], "x": 15.25, "y": 5.25}, - {"matrix": [5, 16], "x": 16.25, "y": 5.25}, - {"matrix": [5, 17], "x": 17.25, "y": 5.25} + {"matrix": [4, 16], "x": 16.25, "y": 5.25}, + + {"matrix": [5, 0], "x": 0, "y": 6.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 6.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 6.25, "w": 1.25}, + {"matrix": [5, 6], "x": 3.75, "y": 6.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 6.25, "w": 1.25}, + {"matrix": [5, 10], "x": 11.25, "y": 6.25, "w": 1.25}, + {"matrix": [5, 12], "x": 12.5, "y": 6.25, "w": 1.25}, + {"matrix": [5, 14], "x": 13.75, "y": 6.25, "w": 1.25}, + + {"matrix": [5, 15], "x": 15.25, "y": 6.25}, + {"matrix": [5, 16], "x": 16.25, "y": 6.25}, + {"matrix": [5, 17], "x": 17.25, "y": 6.25} ] } } From 25a160b7643aa3a59aa71b21b0b1032850a68dbc Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Sat, 9 Mar 2024 11:46:51 -0500 Subject: [PATCH 09/12] Update keymap.c updates the keymap to match the new layout --- keyboards/rot13labs/hackboard/keymaps/default/keymap.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c index 003fc3230a87..fdbb2c22eae9 100644 --- a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c +++ b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c @@ -17,7 +17,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [0] = LAYOUT( - KC_ESC, KC_NO, 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_PSCR, KC_SCRL, KC_PAUS, + KC_NO, + KC_ESC, 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_PSCR, KC_SCRL, KC_PAUS, KC_GRV, 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_INS, KC_HOME, KC_PGUP, 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_BSLS, KC_DEL, KC_END, KC_PGDN, 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_ENT, @@ -25,7 +26,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, KC_RGUI, MO(1), KC_RCTL, KC_LEFT, KC_DOWN, KC_RIGHT), [1] = LAYOUT( - KC_TRNS, KC_NO, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, + KC_NO, + KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, From 82dcfe52fda018ba3de2b8b7785a2376ba3f1593 Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Wed, 13 Mar 2024 01:01:33 -0400 Subject: [PATCH 10/12] Update keyboards/rot13labs/hackboard/info.json Co-authored-by: Duncan Sutherland --- keyboards/rot13labs/hackboard/info.json | 2 -- 1 file changed, 2 deletions(-) diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/info.json index b5f2b24b02be..ea27e22037d5 100644 --- a/keyboards/rot13labs/hackboard/info.json +++ b/keyboards/rot13labs/hackboard/info.json @@ -5,8 +5,6 @@ "maintainer": "c0ldbru", "features": { "bootmagic": true, - "command": false, - "console": false, "extrakey": true, "mousekey": false, "nkro": false From 134be2eba76cc7c7cee211c51c4ad8a013576152 Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Wed, 13 Mar 2024 01:01:40 -0400 Subject: [PATCH 11/12] Update keyboards/rot13labs/hackboard/keymaps/default/keymap.c Co-authored-by: Duncan Sutherland --- .../rot13labs/hackboard/keymaps/default/keymap.c | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c index fdbb2c22eae9..542d541bf315 100644 --- a/keyboards/rot13labs/hackboard/keymaps/default/keymap.c +++ b/keyboards/rot13labs/hackboard/keymaps/default/keymap.c @@ -27,10 +27,10 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { [1] = LAYOUT( KC_NO, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, QK_BOOT, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLU, - KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_VOLD, KC_TRNS) + _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, QK_BOOT, _______,_______,_______,_______,_______, _______, _______, _______, _______, _______, _______, _______, + _______, _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, + _______, _______, _______, _______,_______,_______,_______,_______,_______, _______, _______, _______, KC_VOLU, + _______, _______, _______, _______, _______, _______, _______, _______, _______, KC_VOLD, _______) }; From a96b97c113db2b228795546606571021ad4b08cf Mon Sep 17 00:00:00 2001 From: c0ldbru Date: Wed, 13 Mar 2024 01:01:57 -0400 Subject: [PATCH 12/12] Update keyboards/rot13labs/hackboard/info.json Co-authored-by: Duncan Sutherland --- keyboards/rot13labs/hackboard/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/keyboards/rot13labs/hackboard/info.json b/keyboards/rot13labs/hackboard/info.json index ea27e22037d5..7ed0b5bd97a5 100644 --- a/keyboards/rot13labs/hackboard/info.json +++ b/keyboards/rot13labs/hackboard/info.json @@ -24,7 +24,7 @@ "layouts": { "LAYOUT": { "layout": [ - {"matrix": [0, 1], "x": 6, "y": 0}, + {"matrix": [0, 1], "x": 6, "y": 0, "w": 0.75, "h": 0.75}, {"matrix": [0, 0], "x": 0, "y": 1},