From a66541c77d62f4e22b6a2bbd6028f572511af99c Mon Sep 17 00:00:00 2001 From: Sebastiaan Swinkels Date: Fri, 20 Jun 2025 00:15:37 +0200 Subject: [PATCH 01/11] Added Point65 keyboards and keymaps --- keyboards/mechanicalkeyboards/info.json | 4 + .../point65/hotswap/config.h | 37 +++ .../point65/hotswap/keyboard.json | 314 ++++++++++++++++++ .../point65/hotswap/keymaps/default/keymap.c | 79 +++++ .../hotswap/keymaps/default_625u/keymap.c | 79 +++++ .../hotswap/keymaps/default_7u/keymap.c | 79 +++++ .../point65/hotswap_rgb/config.h | 44 +++ .../point65/hotswap_rgb/keyboard.json | 232 +++++++++++++ .../hotswap_rgb/keymaps/default/keymap.c | 79 +++++ .../mechanicalkeyboards/point65/readme.md | 33 ++ 10 files changed, 980 insertions(+) create mode 100644 keyboards/mechanicalkeyboards/info.json create mode 100644 keyboards/mechanicalkeyboards/point65/hotswap/config.h create mode 100644 keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json create mode 100644 keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c create mode 100644 keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_625u/keymap.c create mode 100644 keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c create mode 100644 keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h create mode 100644 keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json create mode 100644 keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c create mode 100644 keyboards/mechanicalkeyboards/point65/readme.md diff --git a/keyboards/mechanicalkeyboards/info.json b/keyboards/mechanicalkeyboards/info.json new file mode 100644 index 00000000000..038eb5b6629 --- /dev/null +++ b/keyboards/mechanicalkeyboards/info.json @@ -0,0 +1,4 @@ +{ + "url": "https://mechanicalkeyboards.com/", + "maintainer": "c44supra" +} diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/config.h b/keyboards/mechanicalkeyboards/point65/hotswap/config.h new file mode 100644 index 00000000000..815d58b7f83 --- /dev/null +++ b/keyboards/mechanicalkeyboards/point65/hotswap/config.h @@ -0,0 +1,37 @@ +/* Copyright 2024 Sebastiaan Swinkels @ BeanBoards + * + * 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 . + */ + +#pragma once + +#define DEBOUNCE 5 + +/* Double tap the side button to enter bootloader */ +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U + +// RGB +#define WS2812_PIO_USE_PIO1 + +#ifdef RGB_MATRIX_ENABLE + #define WS2812_PIO_USE_PIO1 + + /* Enable Framebuffer and keypress effects */ + #define RGB_MATRIX_FRAMEBUFFER_EFFECTS + #define RGB_MATRIX_KEYPRESSES +#endif + +/* couple of defaults */ +#define RGB_INDICATOR_POS_OFFSET 48 /* Indicator LEDs additional brightness */ diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json new file mode 100644 index 00000000000..923b9f75e01 --- /dev/null +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json @@ -0,0 +1,314 @@ +{ + "keyboard_name": "Point 65 Hotswap", + "manufacturer": "Mechanical Keyboards", + "url": "https://mechanicalkeyboards.com/products/mk-point65-keyboard-kit?variant=49803723735340", + "maintainer": "C44Supra", + "usb": { + "vid": "0x4242", + "pid": "0xC0F5", + "device_version": "1.0.0" + }, + "bootloader": "rp2040", + "processor": "RP2040", + "matrix_pins": { + "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], + "rows": ["GP24", "GP22", "GP21", "GP19", "GP25"] + }, + "features": { + "bootmagic": true, + "nkro": true, + "rgb_matrix": true, + "extrakey": true + }, + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT_all": { + "layout": [ + { "matrix": [0, 0 ], "label":"KC_ESC", "x":0, "y":0, "w":1 }, + { "matrix": [0, 1 ], "label":"KC_1", "x":1, "y":0, "w":1 }, + { "matrix": [0, 2 ], "label":"KC_2", "x":2, "y":0, "w":1 }, + { "matrix": [0, 3 ], "label":"KC_3", "x":3, "y":0, "w":1 }, + { "matrix": [0, 4 ], "label":"KC_4", "x":4, "y":0, "w":1 }, + { "matrix": [0, 5 ], "label":"KC_5", "x":5, "y":0, "w":1 }, + { "matrix": [0, 6 ], "label":"KC_6", "x":6, "y":0, "w":1 }, + { "matrix": [0, 7 ], "label":"KC_7", "x":7, "y":0, "w":1 }, + { "matrix": [0, 8 ], "label":"KC_8", "x":8, "y":0, "w":1 }, + { "matrix": [0, 9 ], "label":"KC_9", "x":9, "y":0, "w":1 }, + { "matrix": [0, 10], "label":"KC_0", "x":10, "y":0, "w":1 }, + { "matrix": [0, 11], "label":"KC_MINUS", "x":11, "y":0, "w":1 }, + { "matrix": [0, 12], "label":"KC_EQUAL", "x":12, "y":0, "w":1 }, + { "matrix": [0, 13], "label":"KC_BACKSPACE", "x":13, "y":0, "w":2 }, + { "matrix": [0, 15], "label":"KC_HOME", "x":15, "y":0, "w":1 }, + + { "matrix": [1, 0 ], "label":"KC_TAB", "x":0, "y":1, "w":1.5 }, + { "matrix": [1, 1 ], "label":"KC_Q", "x":1.5, "y":1, "w":1 }, + { "matrix": [1, 2 ], "label":"KC_W", "x":2.5, "y":1, "w":1 }, + { "matrix": [1, 3 ], "label":"KC_E", "x":3.5, "y":1, "w":1 }, + { "matrix": [1, 4 ], "label":"KC_R", "x":4.5, "y":1, "w":1 }, + { "matrix": [1, 5 ], "label":"KC_T", "x":5.5, "y":1, "w":1 }, + { "matrix": [1, 6 ], "label":"KC_Y", "x":6.5, "y":1, "w":1 }, + { "matrix": [1, 7 ], "label":"KC_U", "x":7.5, "y":1, "w":1 }, + { "matrix": [1, 8 ], "label":"KC_I", "x":8.5, "y":1, "w":1 }, + { "matrix": [1, 9 ], "label":"KC_O", "x":9.5, "y":1, "w":1 }, + { "matrix": [1, 10], "label":"KC_P", "x":10.5, "y":1, "w":1 }, + { "matrix": [1, 11], "label":"KC_LEFT_BRACKET", "x":11.5, "y":1, "w":1 }, + { "matrix": [1, 12], "label":"KC_RIGHT_BRACKET", "x":12.5, "y":1, "w":1 }, + { "matrix": [1, 13], "label":"KC_BACKSLASH", "x":13.5, "y":1, "w":1.5 }, + { "matrix": [1, 15], "label":"KC_PGUP", "x":15, "y":1, "w":1 }, + + { "matrix": [2, 0 ], "label":"KC_CAPS", "x":0, "y":2, "w":1.75 }, + { "matrix": [2, 1 ], "label":"KC_A", "x":1.75, "y":2, "w":1 }, + { "matrix": [2, 2 ], "label":"KC_S", "x":2.75, "y":2, "w":1 }, + { "matrix": [2, 3 ], "label":"KC_D", "x":3.75, "y":2, "w":1 }, + { "matrix": [2, 4 ], "label":"KC_F", "x":4.75, "y":2, "w":1 }, + { "matrix": [2, 5 ], "label":"KC_G", "x":5.75, "y":2, "w":1 }, + { "matrix": [2, 6 ], "label":"KC_H", "x":6.75, "y":2, "w":1 }, + { "matrix": [2, 7 ], "label":"KC_J", "x":7.75, "y":2, "w":1 }, + { "matrix": [2, 8 ], "label":"KC_K", "x":8.75, "y":2, "w":1 }, + { "matrix": [2, 9 ], "label":"KC_L", "x":9.75, "y":2, "w":1 }, + { "matrix": [2, 10], "label":"KC_SCLN", "x":10.75, "y":2, "w":1 }, + { "matrix": [2, 11], "label":"KC_QUOT", "x":11.75, "y":2, "w":1 }, + { "matrix": [2, 12], "label":"KC_ENTER", "x":12.75, "y":2, "w":2.25 }, + { "matrix": [2, 15], "label":"KC_PGDN", "x":15, "y":2, "w":1 }, + + { "matrix": [3, 0 ], "label":"KC_LSFT", "x":0, "y":3, "w":2.25 }, + { "matrix": [3, 1 ], "label":"KC_Z", "x":2.25, "y":3, "w":1 }, + { "matrix": [3, 2 ], "label":"KC_X", "x":3.25, "y":3, "w":1 }, + { "matrix": [3, 3 ], "label":"KC_C", "x":4.25, "y":3, "w":1 }, + { "matrix": [3, 4 ], "label":"KC_V", "x":5.25, "y":3, "w":1 }, + { "matrix": [3, 5 ], "label":"KC_B", "x":6.25, "y":3, "w":1 }, + { "matrix": [3, 6 ], "label":"KC_N", "x":7.25, "y":3, "w":1 }, + { "matrix": [3, 7 ], "label":"KC_M", "x":8.25, "y":3, "w":1 }, + { "matrix": [3, 8 ], "label":"KC_COMM", "x":9.25, "y":3, "w":1 }, + { "matrix": [3, 9 ], "label":"KC_DOT", "x":10.25, "y":3, "w":1 }, + { "matrix": [3, 10], "label":"KC_SLSH", "x":11.25, "y":3, "w":1 }, + { "matrix": [3, 11], "label":"KC_RSFT", "x":12.25, "y":3, "w":1.75 }, + { "matrix": [3, 14], "label":"KC_UP", "x":14, "y":3, "w":1 }, + { "matrix": [3, 15], "label":"KC_END", "x":15, "y":3, "w":1 }, + + { "matrix": [4, 0 ], "label":"KC_LCTL", "x":0, "y":4, "w":1.25 }, + { "matrix": [4, 1 ], "label":"KC_LGUI", "x":1.25, "y":4, "w":1.25 }, + { "matrix": [4, 2 ], "label":"KC_LALT", "x":2.5, "y":4, "w":1.25 }, + { "matrix": [4, 5 ], "label":"KC_SPC", "x":3.75, "y":4, "w":6.25 }, + { "matrix": [4, 9 ], "label":"KC_RALT", "x":10, "y":4, "w":1.25 }, + { "matrix": [4, 10], "label":"_FN", "x":11.25, "y":4, "w":1.25 }, + { "matrix": [4, 13], "label":"KC_LEFT", "x":13, "y":4, "w":1 }, + { "matrix": [4, 14], "label":"KC_DOWN", "x":14, "y":4, "w":1 }, + { "matrix": [4, 15], "label":"KC_RGHT", "x":15, "y":4, "w":1 } + ] + }, + "LAYOUT_625u": { + "layout": [ + { "matrix": [0, 0 ], "label":"KC_ESC", "x":0, "y":0, "w":1 }, + { "matrix": [0, 1 ], "label":"KC_1", "x":1, "y":0, "w":1 }, + { "matrix": [0, 2 ], "label":"KC_2", "x":2, "y":0, "w":1 }, + { "matrix": [0, 3 ], "label":"KC_3", "x":3, "y":0, "w":1 }, + { "matrix": [0, 4 ], "label":"KC_4", "x":4, "y":0, "w":1 }, + { "matrix": [0, 5 ], "label":"KC_5", "x":5, "y":0, "w":1 }, + { "matrix": [0, 6 ], "label":"KC_6", "x":6, "y":0, "w":1 }, + { "matrix": [0, 7 ], "label":"KC_7", "x":7, "y":0, "w":1 }, + { "matrix": [0, 8 ], "label":"KC_8", "x":8, "y":0, "w":1 }, + { "matrix": [0, 9 ], "label":"KC_9", "x":9, "y":0, "w":1 }, + { "matrix": [0, 10], "label":"KC_0", "x":10, "y":0, "w":1 }, + { "matrix": [0, 11], "label":"KC_MINUS", "x":11, "y":0, "w":1 }, + { "matrix": [0, 12], "label":"KC_EQUAL", "x":12, "y":0, "w":1 }, + { "matrix": [0, 13], "label":"KC_BACKSPACE", "x":13, "y":0, "w":2 }, + { "matrix": [0, 15], "label":"KC_HOME", "x":15, "y":0, "w":1 }, + + { "matrix": [1, 0 ], "label":"KC_TAB", "x":0, "y":1, "w":1.5 }, + { "matrix": [1, 1 ], "label":"KC_Q", "x":1.5, "y":1, "w":1 }, + { "matrix": [1, 2 ], "label":"KC_W", "x":2.5, "y":1, "w":1 }, + { "matrix": [1, 3 ], "label":"KC_E", "x":3.5, "y":1, "w":1 }, + { "matrix": [1, 4 ], "label":"KC_R", "x":4.5, "y":1, "w":1 }, + { "matrix": [1, 5 ], "label":"KC_T", "x":5.5, "y":1, "w":1 }, + { "matrix": [1, 6 ], "label":"KC_Y", "x":6.5, "y":1, "w":1 }, + { "matrix": [1, 7 ], "label":"KC_U", "x":7.5, "y":1, "w":1 }, + { "matrix": [1, 8 ], "label":"KC_I", "x":8.5, "y":1, "w":1 }, + { "matrix": [1, 9 ], "label":"KC_O", "x":9.5, "y":1, "w":1 }, + { "matrix": [1, 10], "label":"KC_P", "x":10.5, "y":1, "w":1 }, + { "matrix": [1, 11], "label":"KC_LEFT_BRACKET", "x":11.5, "y":1, "w":1 }, + { "matrix": [1, 12], "label":"KC_RIGHT_BRACKET", "x":12.5, "y":1, "w":1 }, + { "matrix": [1, 13], "label":"KC_BACKSLASH", "x":13.5, "y":1, "w":1.5 }, + { "matrix": [1, 15], "label":"KC_PGUP", "x":15, "y":1, "w":1 }, + + { "matrix": [2, 0 ], "label":"KC_CAPS", "x":0, "y":2, "w":1.75 }, + { "matrix": [2, 1 ], "label":"KC_A", "x":1.75, "y":2, "w":1 }, + { "matrix": [2, 2 ], "label":"KC_S", "x":2.75, "y":2, "w":1 }, + { "matrix": [2, 3 ], "label":"KC_D", "x":3.75, "y":2, "w":1 }, + { "matrix": [2, 4 ], "label":"KC_F", "x":4.75, "y":2, "w":1 }, + { "matrix": [2, 5 ], "label":"KC_G", "x":5.75, "y":2, "w":1 }, + { "matrix": [2, 6 ], "label":"KC_H", "x":6.75, "y":2, "w":1 }, + { "matrix": [2, 7 ], "label":"KC_J", "x":7.75, "y":2, "w":1 }, + { "matrix": [2, 8 ], "label":"KC_K", "x":8.75, "y":2, "w":1 }, + { "matrix": [2, 9 ], "label":"KC_L", "x":9.75, "y":2, "w":1 }, + { "matrix": [2, 10], "label":"KC_SCLN", "x":10.75, "y":2, "w":1 }, + { "matrix": [2, 11], "label":"KC_QUOT", "x":11.75, "y":2, "w":1 }, + { "matrix": [2, 12], "label":"KC_ENTER", "x":12.75, "y":2, "w":2.25 }, + { "matrix": [2, 15], "label":"KC_PGDN", "x":15, "y":2, "w":1 }, + + { "matrix": [3, 0 ], "label":"KC_LSFT", "x":0, "y":3, "w":2.25 }, + { "matrix": [3, 1 ], "label":"KC_Z", "x":2.25, "y":3, "w":1 }, + { "matrix": [3, 2 ], "label":"KC_X", "x":3.25, "y":3, "w":1 }, + { "matrix": [3, 3 ], "label":"KC_C", "x":4.25, "y":3, "w":1 }, + { "matrix": [3, 4 ], "label":"KC_V", "x":5.25, "y":3, "w":1 }, + { "matrix": [3, 5 ], "label":"KC_B", "x":6.25, "y":3, "w":1 }, + { "matrix": [3, 6 ], "label":"KC_N", "x":7.25, "y":3, "w":1 }, + { "matrix": [3, 7 ], "label":"KC_M", "x":8.25, "y":3, "w":1 }, + { "matrix": [3, 8 ], "label":"KC_COMM", "x":9.25, "y":3, "w":1 }, + { "matrix": [3, 9 ], "label":"KC_DOT", "x":10.25, "y":3, "w":1 }, + { "matrix": [3, 10], "label":"KC_SLSH", "x":11.25, "y":3, "w":1 }, + { "matrix": [3, 11], "label":"KC_RSFT", "x":12.25, "y":3, "w":1.75 }, + { "matrix": [3, 14], "label":"KC_UP", "x":14, "y":3, "w":1 }, + { "matrix": [3, 15], "label":"KC_END", "x":15, "y":3, "w":1 }, + + { "matrix": [4, 0 ], "label":"KC_LCTL", "x":0, "y":4, "w":1.25 }, + { "matrix": [4, 1 ], "label":"KC_LGUI", "x":1.25, "y":4, "w":1.25 }, + { "matrix": [4, 2 ], "label":"KC_LALT", "x":2.5, "y":4, "w":1.25 }, + { "matrix": [4, 5 ], "label":"KC_SPC", "x":3.75, "y":4, "w":6.25 }, + { "matrix": [4, 9 ], "label":"KC_RALT", "x":10, "y":4, "w":1.25 }, + { "matrix": [4, 10], "label":"_FN", "x":11.25, "y":4, "w":1.25 }, + { "matrix": [4, 13], "label":"KC_LEFT", "x":13, "y":4, "w":1 }, + { "matrix": [4, 14], "label":"KC_DOWN", "x":14, "y":4, "w":1 }, + { "matrix": [4, 15], "label":"KC_RGHT", "x":15, "y":4, "w":1 } + ] + }, + "LAYOUT_7u": { + "layout": [ + { "matrix": [0, 0 ], "label":"KC_ESC", "x":0, "y":0, "w":1 }, + { "matrix": [0, 1 ], "label":"KC_1", "x":1, "y":0, "w":1 }, + { "matrix": [0, 2 ], "label":"KC_2", "x":2, "y":0, "w":1 }, + { "matrix": [0, 3 ], "label":"KC_3", "x":3, "y":0, "w":1 }, + { "matrix": [0, 4 ], "label":"KC_4", "x":4, "y":0, "w":1 }, + { "matrix": [0, 5 ], "label":"KC_5", "x":5, "y":0, "w":1 }, + { "matrix": [0, 6 ], "label":"KC_6", "x":6, "y":0, "w":1 }, + { "matrix": [0, 7 ], "label":"KC_7", "x":7, "y":0, "w":1 }, + { "matrix": [0, 8 ], "label":"KC_8", "x":8, "y":0, "w":1 }, + { "matrix": [0, 9 ], "label":"KC_9", "x":9, "y":0, "w":1 }, + { "matrix": [0, 10], "label":"KC_0", "x":10, "y":0, "w":1 }, + { "matrix": [0, 11], "label":"KC_MINUS", "x":11, "y":0, "w":1 }, + { "matrix": [0, 12], "label":"KC_EQUAL", "x":12, "y":0, "w":1 }, + { "matrix": [0, 13], "label":"KC_BACKSPACE", "x":13, "y":0, "w":2 }, + { "matrix": [0, 15], "label":"KC_HOME", "x":15, "y":0, "w":1 }, + + { "matrix": [1, 0 ], "label":"KC_TAB", "x":0, "y":1, "w":1.5 }, + { "matrix": [1, 1 ], "label":"KC_Q", "x":1.5, "y":1, "w":1 }, + { "matrix": [1, 2 ], "label":"KC_W", "x":2.5, "y":1, "w":1 }, + { "matrix": [1, 3 ], "label":"KC_E", "x":3.5, "y":1, "w":1 }, + { "matrix": [1, 4 ], "label":"KC_R", "x":4.5, "y":1, "w":1 }, + { "matrix": [1, 5 ], "label":"KC_T", "x":5.5, "y":1, "w":1 }, + { "matrix": [1, 6 ], "label":"KC_Y", "x":6.5, "y":1, "w":1 }, + { "matrix": [1, 7 ], "label":"KC_U", "x":7.5, "y":1, "w":1 }, + { "matrix": [1, 8 ], "label":"KC_I", "x":8.5, "y":1, "w":1 }, + { "matrix": [1, 9 ], "label":"KC_O", "x":9.5, "y":1, "w":1 }, + { "matrix": [1, 10], "label":"KC_P", "x":10.5, "y":1, "w":1 }, + { "matrix": [1, 11], "label":"KC_LEFT_BRACKET", "x":11.5, "y":1, "w":1 }, + { "matrix": [1, 12], "label":"KC_RIGHT_BRACKET", "x":12.5, "y":1, "w":1 }, + { "matrix": [1, 13], "label":"KC_BACKSLASH", "x":13.5, "y":1, "w":1.5 }, + { "matrix": [1, 15], "label":"KC_PGUP", "x":15, "y":1, "w":1 }, + + { "matrix": [2, 0 ], "label":"KC_CAPS", "x":0, "y":2, "w":1.75 }, + { "matrix": [2, 1 ], "label":"KC_A", "x":1.75, "y":2, "w":1 }, + { "matrix": [2, 2 ], "label":"KC_S", "x":2.75, "y":2, "w":1 }, + { "matrix": [2, 3 ], "label":"KC_D", "x":3.75, "y":2, "w":1 }, + { "matrix": [2, 4 ], "label":"KC_F", "x":4.75, "y":2, "w":1 }, + { "matrix": [2, 5 ], "label":"KC_G", "x":5.75, "y":2, "w":1 }, + { "matrix": [2, 6 ], "label":"KC_H", "x":6.75, "y":2, "w":1 }, + { "matrix": [2, 7 ], "label":"KC_J", "x":7.75, "y":2, "w":1 }, + { "matrix": [2, 8 ], "label":"KC_K", "x":8.75, "y":2, "w":1 }, + { "matrix": [2, 9 ], "label":"KC_L", "x":9.75, "y":2, "w":1 }, + { "matrix": [2, 10], "label":"KC_SCLN", "x":10.75, "y":2, "w":1 }, + { "matrix": [2, 11], "label":"KC_QUOT", "x":11.75, "y":2, "w":1 }, + { "matrix": [2, 12], "label":"KC_ENTER", "x":12.75, "y":2, "w":2.25 }, + { "matrix": [2, 15], "label":"KC_PGDN", "x":15, "y":2, "w":1 }, + + { "matrix": [3, 0 ], "label":"KC_LSFT", "x":0, "y":3, "w":2.25 }, + { "matrix": [3, 1 ], "label":"KC_Z", "x":2.25, "y":3, "w":1 }, + { "matrix": [3, 2 ], "label":"KC_X", "x":3.25, "y":3, "w":1 }, + { "matrix": [3, 3 ], "label":"KC_C", "x":4.25, "y":3, "w":1 }, + { "matrix": [3, 4 ], "label":"KC_V", "x":5.25, "y":3, "w":1 }, + { "matrix": [3, 5 ], "label":"KC_B", "x":6.25, "y":3, "w":1 }, + { "matrix": [3, 6 ], "label":"KC_N", "x":7.25, "y":3, "w":1 }, + { "matrix": [3, 7 ], "label":"KC_M", "x":8.25, "y":3, "w":1 }, + { "matrix": [3, 8 ], "label":"KC_COMM", "x":9.25, "y":3, "w":1 }, + { "matrix": [3, 9 ], "label":"KC_DOT", "x":10.25, "y":3, "w":1 }, + { "matrix": [3, 10], "label":"KC_SLSH", "x":11.25, "y":3, "w":1 }, + { "matrix": [3, 11], "label":"KC_RSFT", "x":12.25, "y":3, "w":1.75 }, + { "matrix": [3, 14], "label":"KC_UP", "x":14, "y":3, "w":1 }, + { "matrix": [3, 15], "label":"KC_END", "x":15, "y":3, "w":1 }, + + { "matrix": [4, 0 ], "label":"KC_LCTL", "x":0, "y":4, "w":1.5 }, + { "matrix": [4, 1 ], "label":"KC_LGUI", "x":1.5, "y":4, "w":1 }, + { "matrix": [4, 2 ], "label":"KC_LALT", "x":2.5, "y":4, "w":1.5 }, + { "matrix": [4, 5 ], "label":"KC_SPC", "x":4, "y":4, "w":7 }, + { "matrix": [4, 10 ], "label":"_FN", "x":11, "y":4, "w":1.5 }, + { "matrix": [4, 13], "label":"KC_LEFT", "x":13, "y":4, "w":1 }, + { "matrix": [4, 14], "label":"KC_DOWN", "x":14, "y":4, "w":1 }, + { "matrix": [4, 15], "label":"KC_RGHT", "x":15, "y":4, "w":1 } + ] + } + }, + "rgb_matrix": { + "layout": [ + {"flags": 255, "x": 0, "y": 0, "matrix": [ 0, 0 ] }, + {"flags": 255, "x": 0, "y": 32, "matrix": [ 2, 0 ] } + ], + "driver": "ws2812", + "max_brightness": 128, + "frame_buffer_effects": true, + "keypresses": true, + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "default": { + "animation": "cycle_left_right", + "on": true, + "val": 192 + } + }, + "ws2812": { + "driver": "vendor", + "pin": "GP23" + } +} diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c new file mode 100644 index 00000000000..3af2d1b050d --- /dev/null +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c @@ -0,0 +1,79 @@ +/* Copyright 2024 Sebastiaan Swinkels @ BeanBoards + * + * 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 + +enum point65_layers { + _QWERTY, + _FUNCTION +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = 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_HOME, + 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_PGUP, + 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_PGDN, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNCTION), KC_LEFT, KC_DOWN, KC_RIGHT + ), + [_FUNCTION] = 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_NO, + NK_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_TRNS, + KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT + ) +}; + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + HSV hsv = {0, 255, 255}; + + // Light up ESC RGB LED when _FUNCTION layer is accessed + if ((get_highest_layer(layer_state|default_layer_state)) == _FUNCTION){ + hsv.h = 43; + hsv.s = 105; + hsv.v = 255; + + if (hsv.v > rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET) { + hsv.v = rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET; + } + RGB rgb = hsv_to_rgb(hsv); + + rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b); + } + // end layer function + + // capslock indicator + if (!rgb_matrix_indicators_user()) { + return false; + } + + if (host_keyboard_led_state().caps_lock) { + hsv.h = 43; + hsv.s = 105; + hsv.v = 255; + + if (hsv.v > rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET) { + hsv.v = rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET; + } + RGB rgb = hsv_to_rgb(hsv); + + rgb_matrix_set_color(1, rgb.r, rgb.g, rgb.b); + } + // end capslock function + + return false; +} diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_625u/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_625u/keymap.c new file mode 100644 index 00000000000..d173c0464b2 --- /dev/null +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_625u/keymap.c @@ -0,0 +1,79 @@ +/* Copyright 2024 Sebastiaan Swinkels @ BeanBoards + * + * 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 + +enum point65_layers { + _QWERTY, + _FUNCTION +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT_625u( + 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_HOME, + 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_PGUP, + 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_PGDN, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNCTION), KC_LEFT, KC_DOWN, KC_RIGHT + ), + [_FUNCTION] = LAYOUT_625u( + 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_NO, + NK_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_TRNS, + KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT + ) +}; + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + HSV hsv = {0, 255, 255}; + + // Light up ESC RGB LED when _FUNCTION layer is accessed + if ((get_highest_layer(layer_state|default_layer_state)) == _FUNCTION){ + hsv.h = 43; + hsv.s = 105; + hsv.v = 255; + + if (hsv.v > rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET) { + hsv.v = rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET; + } + RGB rgb = hsv_to_rgb(hsv); + + rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b); + } + // end layer function + + // capslock indicator + if (!rgb_matrix_indicators_user()) { + return false; + } + + if (host_keyboard_led_state().caps_lock) { + hsv.h = 43; + hsv.s = 105; + hsv.v = 255; + + if (hsv.v > rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET) { + hsv.v = rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET; + } + RGB rgb = hsv_to_rgb(hsv); + + rgb_matrix_set_color(1, rgb.r, rgb.g, rgb.b); + } + // end capslock function + + return false; +} diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c new file mode 100644 index 00000000000..9b454b2fea1 --- /dev/null +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c @@ -0,0 +1,79 @@ +/* Copyright 2024 Sebastiaan Swinkels @ BeanBoards + * + * 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 + +enum point65_layers { + _QWERTY, + _FUNCTION +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT_7u( + 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_HOME, + 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_PGUP, + 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_PGDN, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FUNCTION), KC_LEFT, KC_DOWN, KC_RIGHT + ), + [_FUNCTION] = LAYOUT_7u( + 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_NO, + NK_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_TRNS, + KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT + ) +}; + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + HSV hsv = {0, 255, 255}; + + // Light up ESC RGB LED when _FUNCTION layer is accessed + if ((get_highest_layer(layer_state|default_layer_state)) == _FUNCTION){ + hsv.h = 43; + hsv.s = 105; + hsv.v = 255; + + if (hsv.v > rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET) { + hsv.v = rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET; + } + RGB rgb = hsv_to_rgb(hsv); + + rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b); + } + // end layer function + + // capslock indicator + if (!rgb_matrix_indicators_user()) { + return false; + } + + if (host_keyboard_led_state().caps_lock) { + hsv.h = 43; + hsv.s = 105; + hsv.v = 255; + + if (hsv.v > rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET) { + hsv.v = rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET; + } + RGB rgb = hsv_to_rgb(hsv); + + rgb_matrix_set_color(1, rgb.r, rgb.g, rgb.b); + } + // end capslock function + + return false; +} diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h new file mode 100644 index 00000000000..fc5da242be3 --- /dev/null +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h @@ -0,0 +1,44 @@ +/* Copyright 2024 Sebastiaan Swinkels @ BeanBoards + * + * 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 . + */ + +#pragma once + +/* key matrix size */ +#define MATRIX_ROWS 5 +#define MATRIX_COLS 16 + +/* Keyboard Matrix Assignments +#define MATRIX_ROW_PINS { GP24, GP23, GP22, GP21, GP25 } +#define MATRIX_COL_PINS { GP28, GP27, GP26, GP29, GP0, GP11, GP10, GP9, GP8, GP7, GP6, GP5, GP4, GP3, GP2, GP1 } +*/ + +#define DEBOUNCE 5 + +/* Double tap the side button to enter bootloader */ +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET +#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U + +#ifdef RGB_MATRIX_ENABLE + #define WS2812_PIO_USE_PIO1 + + /* Enable Framebuffer and keypress effects */ + #define RGB_MATRIX_FRAMEBUFFER_EFFECTS + #define RGB_MATRIX_KEYPRESSES +#endif + +/* couple of defaults */ +#define RGB_INDICATOR_POS_OFFSET 48 /* Indicator LEDs additional brightness */ + diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json new file mode 100644 index 00000000000..91da72fa8ec --- /dev/null +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json @@ -0,0 +1,232 @@ +{ + "keyboard_name": "Point 65 Hotswap RGB", + "manufacturer": "Mechanical Keyboards", + "url": "https://mechanicalkeyboards.com/products/mk-point65-keyboard-kit?variant=49803723538732", + "maintainer": "C44Supra", + "usb": { + "vid": "0x4242", + "pid": "0xC0F6", + "device_version": "1.0.0" + }, + "bootloader": "rp2040", + "processor": "RP2040", + "features": { + "bootmagic": true, + "nkro": true, + "rgb_matrix": true, + "extrakey": true + }, + "matrix_pins": { + "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], + "rows": ["GP24", "GP23", "GP22", "GP21", "GP25"] + }, + "diode_direction": "COL2ROW", + "layouts": { + "LAYOUT": { + "layout": [ + { "matrix": [0, 0 ], "label":"KC_ESC", "x":0, "y":0, "w":1 }, + { "matrix": [0, 1 ], "label":"KC_1", "x":1, "y":0, "w":1 }, + { "matrix": [0, 2 ], "label":"KC_2", "x":2, "y":0, "w":1 }, + { "matrix": [0, 3 ], "label":"KC_3", "x":3, "y":0, "w":1 }, + { "matrix": [0, 4 ], "label":"KC_4", "x":4, "y":0, "w":1 }, + { "matrix": [0, 5 ], "label":"KC_5", "x":5, "y":0, "w":1 }, + { "matrix": [0, 6 ], "label":"KC_6", "x":6, "y":0, "w":1 }, + { "matrix": [0, 7 ], "label":"KC_7", "x":7, "y":0, "w":1 }, + { "matrix": [0, 8 ], "label":"KC_8", "x":8, "y":0, "w":1 }, + { "matrix": [0, 9 ], "label":"KC_9", "x":9, "y":0, "w":1 }, + { "matrix": [0, 10], "label":"KC_0", "x":10, "y":0, "w":1 }, + { "matrix": [0, 11], "label":"KC_MINUS", "x":11, "y":0, "w":1 }, + { "matrix": [0, 12], "label":"KC_EQUAL", "x":12, "y":0, "w":1 }, + { "matrix": [0, 13], "label":"KC_BSPC", "x":13, "y":0, "w":2 }, + { "matrix": [0, 15], "label":"KC_HOME", "x":15, "y":0, "w":1 }, + + { "matrix": [1, 0 ], "label":"KC_TAB", "x":0, "y":1, "w":1.5 }, + { "matrix": [1, 1 ], "label":"KC_Q", "x":1.5, "y":1, "w":1 }, + { "matrix": [1, 2 ], "label":"KC_W", "x":2.5, "y":1, "w":1 }, + { "matrix": [1, 3 ], "label":"KC_E", "x":3.5, "y":1, "w":1 }, + { "matrix": [1, 4 ], "label":"KC_R", "x":4.5, "y":1, "w":1 }, + { "matrix": [1, 5 ], "label":"KC_T", "x":5.5, "y":1, "w":1 }, + { "matrix": [1, 6 ], "label":"KC_Y", "x":6.5, "y":1, "w":1 }, + { "matrix": [1, 7 ], "label":"KC_U", "x":7.5, "y":1, "w":1 }, + { "matrix": [1, 8 ], "label":"KC_I", "x":8.5, "y":1, "w":1 }, + { "matrix": [1, 9 ], "label":"KC_O", "x":9.5, "y":1, "w":1 }, + { "matrix": [1, 10], "label":"KC_P", "x":10.5, "y":1, "w":1 }, + { "matrix": [1, 11], "label":"KC_LEFT_BRACKET", "x":11.5, "y":1, "w":1 }, + { "matrix": [1, 12], "label":"KC_RIGHT_BRACKET", "x":12.5, "y":1, "w":1 }, + { "matrix": [1, 13], "label":"KC_BACKSLASH", "x":13.5, "y":1, "w":1.5 }, + { "matrix": [1, 15], "label":"KC_PGUP", "x":15, "y":1, "w":1 }, + + { "matrix": [2, 0 ], "label":"KC_CAPS", "x":0, "y":2, "w":1.75 }, + { "matrix": [2, 1 ], "label":"KC_A", "x":1.75, "y":2, "w":1 }, + { "matrix": [2, 2 ], "label":"KC_S", "x":2.75, "y":2, "w":1 }, + { "matrix": [2, 3 ], "label":"KC_D", "x":3.75, "y":2, "w":1 }, + { "matrix": [2, 4 ], "label":"KC_F", "x":4.75, "y":2, "w":1 }, + { "matrix": [2, 5 ], "label":"KC_G", "x":5.75, "y":2, "w":1 }, + { "matrix": [2, 6 ], "label":"KC_H", "x":6.75, "y":2, "w":1 }, + { "matrix": [2, 7 ], "label":"KC_J", "x":7.75, "y":2, "w":1 }, + { "matrix": [2, 8 ], "label":"KC_K", "x":8.75, "y":2, "w":1 }, + { "matrix": [2, 9 ], "label":"KC_L", "x":9.75, "y":2, "w":1 }, + { "matrix": [2, 10], "label":"KC_SCLN", "x":10.75, "y":2, "w":1 }, + { "matrix": [2, 11], "label":"KC_QUOT", "x":11.75, "y":2, "w":1 }, + { "matrix": [2, 12], "label":"KC_ENTER", "x":12.75, "y":2, "w":2.25 }, + { "matrix": [2, 15], "label":"KC_PGDN", "x":15, "y":2, "w":1 }, + + { "matrix": [3, 0 ], "label":"KC_LSFT", "x":0, "y":3, "w":2.25 }, + { "matrix": [3, 1 ], "label":"KC_Z", "x":2.25, "y":3, "w":1 }, + { "matrix": [3, 2 ], "label":"KC_X", "x":3.25, "y":3, "w":1 }, + { "matrix": [3, 3 ], "label":"KC_C", "x":4.25, "y":3, "w":1 }, + { "matrix": [3, 4 ], "label":"KC_V", "x":5.25, "y":3, "w":1 }, + { "matrix": [3, 5 ], "label":"KC_B", "x":6.25, "y":3, "w":1 }, + { "matrix": [3, 6 ], "label":"KC_N", "x":7.25, "y":3, "w":1 }, + { "matrix": [3, 7 ], "label":"KC_M", "x":8.25, "y":3, "w":1 }, + { "matrix": [3, 8 ], "label":"KC_COMM", "x":9.25, "y":3, "w":1 }, + { "matrix": [3, 9 ], "label":"KC_DOT", "x":10.25, "y":3, "w":1 }, + { "matrix": [3, 10], "label":"KC_SLSH", "x":11.25, "y":3, "w":1 }, + { "matrix": [3, 11], "label":"KC_RSFT", "x":12.25, "y":3, "w":1.75 }, + { "matrix": [3, 14], "label":"KC_UP", "x":14, "y":3, "w":1 }, + { "matrix": [3, 15], "label":"KC_END", "x":15, "y":3, "w":1 }, + + { "matrix": [4, 0 ], "label":"KC_LCTL", "x":0, "y":4, "w":1.25 }, + { "matrix": [4, 1 ], "label":"KC_LGUI", "x":1.25, "y":4, "w":1.25 }, + { "matrix": [4, 2 ], "label":"KC_LALT", "x":2.5, "y":4, "w":1.25 }, + { "matrix": [4, 5 ], "label":"KC_SPC", "x":3.75, "y":4, "w":6.25 }, + { "matrix": [4, 9 ], "label":"KC_RALT", "x":10, "y":4, "w":1.25 }, + { "matrix": [4, 10], "label":"_FN", "x":11.25, "y":4, "w":1.25 }, + { "matrix": [4, 13], "label":"KC_LEFT", "x":13, "y":4, "w":1 }, + { "matrix": [4, 14], "label":"KC_DOWN", "x":14, "y":4, "w":1 }, + { "matrix": [4, 15], "label":"KC_RGHT", "x":15, "y":4, "w":1 } + ] + } + }, + "rgb_matrix": { + "layout": [ + {"flags": 255, "x": 0, "y": 0, "matrix": [ 0, 0 ] }, + {"flags": 255, "x": 15, "y": 0, "matrix": [ 0, 1 ] }, + {"flags": 255, "x": 30, "y": 0, "matrix": [ 0, 2 ] }, + {"flags": 255, "x": 45, "y": 0, "matrix": [ 0, 3 ] }, + {"flags": 255, "x": 60, "y": 0, "matrix": [ 0, 4 ] }, + {"flags": 255, "x": 75, "y": 0, "matrix": [ 0, 5 ] }, + {"flags": 255, "x": 89, "y": 0, "matrix": [ 0, 6 ] }, + {"flags": 255, "x": 104, "y": 0, "matrix": [ 0, 7 ] }, + {"flags": 255, "x": 119, "y": 0, "matrix": [ 0, 8 ] }, + {"flags": 255, "x": 134, "y": 0, "matrix": [ 0, 9 ] }, + {"flags": 255, "x": 149, "y": 0, "matrix": [ 0, 10 ] }, + {"flags": 255, "x": 164, "y": 0, "matrix": [ 0, 11 ] }, + {"flags": 255, "x": 179, "y": 0, "matrix": [ 0, 12 ] }, + {"flags": 255, "x": 201, "y": 0, "matrix": [ 0, 13 ] }, + {"flags": 255, "x": 224, "y": 0, "matrix": [ 0, 15 ] }, + + {"flags": 255, "x": 224, "y": 16, "matrix": [ 0, 15 ] }, + {"flags": 255, "x": 205, "y": 16, "matrix": [ 0, 13 ] }, + {"flags": 255, "x": 187, "y": 16, "matrix": [ 0, 12 ] }, + {"flags": 255, "x": 172, "y": 16, "matrix": [ 0, 11 ] }, + {"flags": 255, "x": 157, "y": 16, "matrix": [ 0, 10 ] }, + {"flags": 255, "x": 142, "y": 16, "matrix": [ 0, 9 ] }, + {"flags": 255, "x": 127, "y": 16, "matrix": [ 0, 8 ] }, + {"flags": 255, "x": 112, "y": 16, "matrix": [ 0, 7 ] }, + {"flags": 255, "x": 97, "y": 16, "matrix": [ 0, 6 ] }, + {"flags": 255, "x": 82, "y": 16, "matrix": [ 0, 5 ] }, + {"flags": 255, "x": 67, "y": 16, "matrix": [ 0, 4 ] }, + {"flags": 255, "x": 52, "y": 16, "matrix": [ 0, 3 ] }, + {"flags": 255, "x": 37, "y": 16, "matrix": [ 0, 2 ] }, + {"flags": 255, "x": 23, "y": 16, "matrix": [ 0, 1 ] }, + {"flags": 255, "x": 4, "y": 16, "matrix": [ 0, 0 ] }, + + {"flags": 255, "x": 6, "y": 32, "matrix": [ 0, 0 ] }, + {"flags": 255, "x": 26, "y": 32, "matrix": [ 0, 1 ] }, + {"flags": 255, "x": 41, "y": 32, "matrix": [ 0, 2 ] }, + {"flags": 255, "x": 56, "y": 32, "matrix": [ 0, 3 ] }, + {"flags": 255, "x": 71, "y": 32, "matrix": [ 0, 4 ] }, + {"flags": 255, "x": 86, "y": 32, "matrix": [ 0, 5 ] }, + {"flags": 255, "x": 101, "y": 32, "matrix": [ 0, 6 ] }, + {"flags": 255, "x": 116, "y": 32, "matrix": [ 0, 7 ] }, + {"flags": 255, "x": 131, "y": 32, "matrix": [ 0, 8 ] }, + {"flags": 255, "x": 145, "y": 32, "matrix": [ 0, 9 ] }, + {"flags": 255, "x": 160, "y": 32, "matrix": [ 0, 10 ] }, + {"flags": 255, "x": 175, "y": 32, "matrix": [ 0, 11 ] }, + {"flags": 255, "x": 200, "y": 32, "matrix": [ 0, 12 ] }, + {"flags": 255, "x": 224, "y": 32, "matrix": [ 0, 15 ] }, + + {"flags": 255, "x": 224, "y": 48, "matrix": [ 0, 15 ] }, + {"flags": 255, "x": 209, "y": 48, "matrix": [ 0, 14 ] }, + {"flags": 255, "x": 188, "y": 48, "matrix": [ 0, 11 ] }, + {"flags": 255, "x": 168, "y": 48, "matrix": [ 0, 10 ] }, + {"flags": 255, "x": 153, "y": 48, "matrix": [ 0, 9 ] }, + {"flags": 255, "x": 138, "y": 48, "matrix": [ 0, 8 ] }, + {"flags": 255, "x": 123, "y": 48, "matrix": [ 0, 7 ] }, + {"flags": 255, "x": 108, "y": 48, "matrix": [ 0, 6 ] }, + {"flags": 255, "x": 93, "y": 48, "matrix": [ 0, 5 ] }, + {"flags": 255, "x": 78, "y": 48, "matrix": [ 0, 4 ] }, + {"flags": 255, "x": 63, "y": 48, "matrix": [ 0, 3 ] }, + {"flags": 255, "x": 49, "y": 48, "matrix": [ 0, 2 ] }, + {"flags": 255, "x": 34, "y": 48, "matrix": [ 0, 1 ] }, + {"flags": 255, "x": 9, "y": 48, "matrix": [ 0, 0 ] }, + + {"flags": 255, "x": 2, "y": 64, "matrix": [ 0, 0 ] }, + {"flags": 255, "x": 20, "y": 64, "matrix": [ 0, 1 ] }, + {"flags": 255, "x": 39, "y": 64, "matrix": [ 0, 2 ] }, + {"flags": 255, "x": 95, "y": 64, "matrix": [ 0, 5 ] }, + {"flags": 255, "x": 151, "y": 64, "matrix": [ 0, 9 ] }, + {"flags": 255, "x": 170, "y": 64, "matrix": [ 0, 10 ] }, + {"flags": 255, "x": 194, "y": 64, "matrix": [ 0, 13 ] }, + {"flags": 255, "x": 209, "y": 64, "matrix": [ 0, 14 ] }, + {"flags": 255, "x": 224, "y": 64, "matrix": [ 0, 15 ] } + ], + "driver": "ws2812", + "max_brightness": 128, + "animations": { + "alphas_mods": true, + "gradient_up_down": true, + "gradient_left_right": true, + "breathing": true, + "band_sat": true, + "band_val": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_up_down": true, + "rainbow_moving_chevron": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "dual_beacon": true, + "rainbow_beacon": true, + "rainbow_pinwheels": true, + "raindrops": true, + "jellybean_raindrops": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "pixel_rain": true, + "pixel_flow": true, + "pixel_fractal": true, + "typing_heatmap": true, + "digital_rain": true, + "solid_reactive_simple": true, + "solid_reactive": true, + "solid_reactive_wide": true, + "solid_reactive_multiwide": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_nexus": true, + "solid_reactive_multinexus": true, + "splash": true, + "multisplash": true, + "solid_splash": true, + "solid_multisplash": true + }, + "default": { + "animation": "cycle_left_right", + "on": true, + "val": 192 + } + }, + "ws2812": { + "driver": "vendor", + "pin": "GP19" + } +} diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c new file mode 100644 index 00000000000..d23b8ba576e --- /dev/null +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c @@ -0,0 +1,79 @@ +/* Copyright 2024 Sebastiaan Swinkels @ BeanBoards + * + * 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 + +enum reformortho_layers { + _QWERTY, + _FUNCTION +}; + +const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { + [_QWERTY] = LAYOUT( + 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_HOME, + 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_PGUP, + 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_PGDN, + 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_END, + KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNCTION), KC_LEFT, KC_DOWN, KC_RIGHT + ), + [_FUNCTION] = LAYOUT( + 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_NO, + NK_TOGG, RGB_TOG, RGB_VAI, KC_NO, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_TRNS, + KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT + ) +}; + +bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { + HSV hsv = {0, 255, 255}; + + // Light up ESC RGB LED when _FUNCTION layer is accessed + if ((get_highest_layer(layer_state|default_layer_state)) == _FUNCTION){ + hsv.h = 43; + hsv.s = 105; + hsv.v = 255; + + if (hsv.v > rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET) { + hsv.v = rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET; + } + RGB rgb = hsv_to_rgb(hsv); + + rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b); + } + // end layer function + + // capslock indicator + if (!rgb_matrix_indicators_user()) { + return false; + } + + if (host_keyboard_led_state().caps_lock) { + hsv.h = 43; + hsv.s = 105; + hsv.v = 255; + + if (hsv.v > rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET) { + hsv.v = rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET; + } + RGB rgb = hsv_to_rgb(hsv); + + rgb_matrix_set_color(30, rgb.r, rgb.g, rgb.b); + } + // end capslock function + + return false; +} diff --git a/keyboards/mechanicalkeyboards/point65/readme.md b/keyboards/mechanicalkeyboards/point65/readme.md new file mode 100644 index 00000000000..7bdb287ceac --- /dev/null +++ b/keyboards/mechanicalkeyboards/point65/readme.md @@ -0,0 +1,33 @@ +# Mechanical Keyboards Point65 + +![Mechanical Keyboards Point65](https://mechanicalkeyboards.com/cdn/shop/files/17705-MIJ95-Point-65-Keyboard-Kit.jpg) +## Description +A 65% keyboard by [Mechanical Keyboards](https://mechanicalkeyboards.com) available as either multi layout hotswap, or hotswap with RGB per key backlight. + +> Keyboard Maintainer: [C44Supra](https://github.com/C44Supra) +> +> Hardware Supported: MK Point65 hotswap, MK Point65 hotswap RGB +> +> Hardware Availability: [MK Point65 Keyboard Kit](https://mechanicalkeyboards.com/products/mk-point65-keyboard-kit) + +## Firmware building +**Hotswap with 6.25U layout:** + + make mechanicalkeyboards/point65/hotswap:default_625u + +**Hotswap with 7U layout:** + + make mechanicalkeyboards/point65/hotswap:default_75u + +**Hotswap RGB:** + + make mechanicalkeyboards/point65/hotswap_rgb:default + +## Bootloader and Flashing: +The keyboard can be flashed with new firmware by entering the bootloader in one of the following ways: +- Bootmagic reset: unplug the keyboard, press and hold the top left key, plug the keyboard back in, and then release the top left key +- Physical reset button: Remove the space bar and double press the reset button twice in short succession + +Once the keyboard enters bootloader mode, it will present itself as a removable device called `RPI-RP2`. Copy / drag the new firmware file to the `RPI-RP2` drive to flash the new firmware onto the keyboard. + +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 From 85fff8b1a56ec7656707ef8f547e8ef24740edb4 Mon Sep 17 00:00:00 2001 From: Sebastiaan Swinkels Date: Fri, 20 Jun 2025 12:01:53 +0200 Subject: [PATCH 02/11] Made requested changes as per suggestions on qmk PR #25392 - rehosted readme image - updated readme build commands - switched to community layouts - removed redundant default_625 keymap folder - removed info.json - removed redundant / obsolete / superfluous rgb matrix definitions, debounce, and matrix definitions from config files - updated keyboard.json files to better reflect individual boards - changed default brightness value in hotswap rgb keyboard.json, added it to hotswap keyboard.json - fixed issue with RGB matrix definition in hotswap rgb keyboard.json - removed redundant rgb_matrix_indicators_user function from keymaps --- keyboards/mechanicalkeyboards/info.json | 4 - .../point65/hotswap/config.h | 13 --- .../point65/hotswap/keyboard.json | 85 +------------- .../point65/hotswap/keymaps/default/keymap.c | 6 +- .../hotswap/keymaps/default_625u/keymap.c | 79 ------------- .../hotswap/keymaps/default_7u/keymap.c | 10 +- .../point65/hotswap_rgb/config.h | 19 --- .../point65/hotswap_rgb/keyboard.json | 109 +++++++++--------- .../hotswap_rgb/keymaps/default/keymap.c | 8 +- .../mechanicalkeyboards/point65/readme.md | 6 +- 10 files changed, 70 insertions(+), 269 deletions(-) delete mode 100644 keyboards/mechanicalkeyboards/info.json delete mode 100644 keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_625u/keymap.c diff --git a/keyboards/mechanicalkeyboards/info.json b/keyboards/mechanicalkeyboards/info.json deleted file mode 100644 index 038eb5b6629..00000000000 --- a/keyboards/mechanicalkeyboards/info.json +++ /dev/null @@ -1,4 +0,0 @@ -{ - "url": "https://mechanicalkeyboards.com/", - "maintainer": "c44supra" -} diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/config.h b/keyboards/mechanicalkeyboards/point65/hotswap/config.h index 815d58b7f83..31ba8c3f903 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/config.h +++ b/keyboards/mechanicalkeyboards/point65/hotswap/config.h @@ -16,22 +16,9 @@ #pragma once -#define DEBOUNCE 5 - /* Double tap the side button to enter bootloader */ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U -// RGB -#define WS2812_PIO_USE_PIO1 - -#ifdef RGB_MATRIX_ENABLE - #define WS2812_PIO_USE_PIO1 - - /* Enable Framebuffer and keypress effects */ - #define RGB_MATRIX_FRAMEBUFFER_EFFECTS - #define RGB_MATRIX_KEYPRESSES -#endif - /* couple of defaults */ #define RGB_INDICATOR_POS_OFFSET 48 /* Indicator LEDs additional brightness */ diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json index 923b9f75e01..bd9a500726b 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json @@ -21,6 +21,10 @@ "extrakey": true }, "diode_direction": "COL2ROW", + "layout_aliases": { + "LAYOUT_65_ansi_blocker": "LAYOUT_all" + }, + "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_tsangan"], "layouts": { "LAYOUT_all": { "layout": [ @@ -97,82 +101,7 @@ { "matrix": [4, 15], "label":"KC_RGHT", "x":15, "y":4, "w":1 } ] }, - "LAYOUT_625u": { - "layout": [ - { "matrix": [0, 0 ], "label":"KC_ESC", "x":0, "y":0, "w":1 }, - { "matrix": [0, 1 ], "label":"KC_1", "x":1, "y":0, "w":1 }, - { "matrix": [0, 2 ], "label":"KC_2", "x":2, "y":0, "w":1 }, - { "matrix": [0, 3 ], "label":"KC_3", "x":3, "y":0, "w":1 }, - { "matrix": [0, 4 ], "label":"KC_4", "x":4, "y":0, "w":1 }, - { "matrix": [0, 5 ], "label":"KC_5", "x":5, "y":0, "w":1 }, - { "matrix": [0, 6 ], "label":"KC_6", "x":6, "y":0, "w":1 }, - { "matrix": [0, 7 ], "label":"KC_7", "x":7, "y":0, "w":1 }, - { "matrix": [0, 8 ], "label":"KC_8", "x":8, "y":0, "w":1 }, - { "matrix": [0, 9 ], "label":"KC_9", "x":9, "y":0, "w":1 }, - { "matrix": [0, 10], "label":"KC_0", "x":10, "y":0, "w":1 }, - { "matrix": [0, 11], "label":"KC_MINUS", "x":11, "y":0, "w":1 }, - { "matrix": [0, 12], "label":"KC_EQUAL", "x":12, "y":0, "w":1 }, - { "matrix": [0, 13], "label":"KC_BACKSPACE", "x":13, "y":0, "w":2 }, - { "matrix": [0, 15], "label":"KC_HOME", "x":15, "y":0, "w":1 }, - - { "matrix": [1, 0 ], "label":"KC_TAB", "x":0, "y":1, "w":1.5 }, - { "matrix": [1, 1 ], "label":"KC_Q", "x":1.5, "y":1, "w":1 }, - { "matrix": [1, 2 ], "label":"KC_W", "x":2.5, "y":1, "w":1 }, - { "matrix": [1, 3 ], "label":"KC_E", "x":3.5, "y":1, "w":1 }, - { "matrix": [1, 4 ], "label":"KC_R", "x":4.5, "y":1, "w":1 }, - { "matrix": [1, 5 ], "label":"KC_T", "x":5.5, "y":1, "w":1 }, - { "matrix": [1, 6 ], "label":"KC_Y", "x":6.5, "y":1, "w":1 }, - { "matrix": [1, 7 ], "label":"KC_U", "x":7.5, "y":1, "w":1 }, - { "matrix": [1, 8 ], "label":"KC_I", "x":8.5, "y":1, "w":1 }, - { "matrix": [1, 9 ], "label":"KC_O", "x":9.5, "y":1, "w":1 }, - { "matrix": [1, 10], "label":"KC_P", "x":10.5, "y":1, "w":1 }, - { "matrix": [1, 11], "label":"KC_LEFT_BRACKET", "x":11.5, "y":1, "w":1 }, - { "matrix": [1, 12], "label":"KC_RIGHT_BRACKET", "x":12.5, "y":1, "w":1 }, - { "matrix": [1, 13], "label":"KC_BACKSLASH", "x":13.5, "y":1, "w":1.5 }, - { "matrix": [1, 15], "label":"KC_PGUP", "x":15, "y":1, "w":1 }, - - { "matrix": [2, 0 ], "label":"KC_CAPS", "x":0, "y":2, "w":1.75 }, - { "matrix": [2, 1 ], "label":"KC_A", "x":1.75, "y":2, "w":1 }, - { "matrix": [2, 2 ], "label":"KC_S", "x":2.75, "y":2, "w":1 }, - { "matrix": [2, 3 ], "label":"KC_D", "x":3.75, "y":2, "w":1 }, - { "matrix": [2, 4 ], "label":"KC_F", "x":4.75, "y":2, "w":1 }, - { "matrix": [2, 5 ], "label":"KC_G", "x":5.75, "y":2, "w":1 }, - { "matrix": [2, 6 ], "label":"KC_H", "x":6.75, "y":2, "w":1 }, - { "matrix": [2, 7 ], "label":"KC_J", "x":7.75, "y":2, "w":1 }, - { "matrix": [2, 8 ], "label":"KC_K", "x":8.75, "y":2, "w":1 }, - { "matrix": [2, 9 ], "label":"KC_L", "x":9.75, "y":2, "w":1 }, - { "matrix": [2, 10], "label":"KC_SCLN", "x":10.75, "y":2, "w":1 }, - { "matrix": [2, 11], "label":"KC_QUOT", "x":11.75, "y":2, "w":1 }, - { "matrix": [2, 12], "label":"KC_ENTER", "x":12.75, "y":2, "w":2.25 }, - { "matrix": [2, 15], "label":"KC_PGDN", "x":15, "y":2, "w":1 }, - - { "matrix": [3, 0 ], "label":"KC_LSFT", "x":0, "y":3, "w":2.25 }, - { "matrix": [3, 1 ], "label":"KC_Z", "x":2.25, "y":3, "w":1 }, - { "matrix": [3, 2 ], "label":"KC_X", "x":3.25, "y":3, "w":1 }, - { "matrix": [3, 3 ], "label":"KC_C", "x":4.25, "y":3, "w":1 }, - { "matrix": [3, 4 ], "label":"KC_V", "x":5.25, "y":3, "w":1 }, - { "matrix": [3, 5 ], "label":"KC_B", "x":6.25, "y":3, "w":1 }, - { "matrix": [3, 6 ], "label":"KC_N", "x":7.25, "y":3, "w":1 }, - { "matrix": [3, 7 ], "label":"KC_M", "x":8.25, "y":3, "w":1 }, - { "matrix": [3, 8 ], "label":"KC_COMM", "x":9.25, "y":3, "w":1 }, - { "matrix": [3, 9 ], "label":"KC_DOT", "x":10.25, "y":3, "w":1 }, - { "matrix": [3, 10], "label":"KC_SLSH", "x":11.25, "y":3, "w":1 }, - { "matrix": [3, 11], "label":"KC_RSFT", "x":12.25, "y":3, "w":1.75 }, - { "matrix": [3, 14], "label":"KC_UP", "x":14, "y":3, "w":1 }, - { "matrix": [3, 15], "label":"KC_END", "x":15, "y":3, "w":1 }, - - { "matrix": [4, 0 ], "label":"KC_LCTL", "x":0, "y":4, "w":1.25 }, - { "matrix": [4, 1 ], "label":"KC_LGUI", "x":1.25, "y":4, "w":1.25 }, - { "matrix": [4, 2 ], "label":"KC_LALT", "x":2.5, "y":4, "w":1.25 }, - { "matrix": [4, 5 ], "label":"KC_SPC", "x":3.75, "y":4, "w":6.25 }, - { "matrix": [4, 9 ], "label":"KC_RALT", "x":10, "y":4, "w":1.25 }, - { "matrix": [4, 10], "label":"_FN", "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4, 13], "label":"KC_LEFT", "x":13, "y":4, "w":1 }, - { "matrix": [4, 14], "label":"KC_DOWN", "x":14, "y":4, "w":1 }, - { "matrix": [4, 15], "label":"KC_RGHT", "x":15, "y":4, "w":1 } - ] - }, - "LAYOUT_7u": { + "LAYOUT_65_ansi_blocker_tsangan": { "layout": [ { "matrix": [0, 0 ], "label":"KC_ESC", "x":0, "y":0, "w":1 }, { "matrix": [0, 1 ], "label":"KC_1", "x":1, "y":0, "w":1 }, @@ -254,8 +183,6 @@ ], "driver": "ws2812", "max_brightness": 128, - "frame_buffer_effects": true, - "keypresses": true, "animations": { "alphas_mods": true, "gradient_up_down": true, @@ -304,7 +231,7 @@ "default": { "animation": "cycle_left_right", "on": true, - "val": 192 + "val": 128 } }, "ws2812": { diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c index 3af2d1b050d..9f1263f6486 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { +bool rgb_matrix_indicators_user(void) { HSV hsv = {0, 255, 255}; // Light up ESC RGB LED when _FUNCTION layer is accessed @@ -57,10 +57,6 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { // end layer function // capslock indicator - if (!rgb_matrix_indicators_user()) { - return false; - } - if (host_keyboard_led_state().caps_lock) { hsv.h = 43; hsv.s = 105; diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_625u/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_625u/keymap.c deleted file mode 100644 index d173c0464b2..00000000000 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_625u/keymap.c +++ /dev/null @@ -1,79 +0,0 @@ -/* Copyright 2024 Sebastiaan Swinkels @ BeanBoards - * - * 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 - -enum point65_layers { - _QWERTY, - _FUNCTION -}; - -const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_625u( - 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_HOME, - 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_PGUP, - 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_PGDN, - 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_END, - KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNCTION), KC_LEFT, KC_DOWN, KC_RIGHT - ), - [_FUNCTION] = LAYOUT_625u( - 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_NO, - NK_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_TRNS, - KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT - ) -}; - -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { - HSV hsv = {0, 255, 255}; - - // Light up ESC RGB LED when _FUNCTION layer is accessed - if ((get_highest_layer(layer_state|default_layer_state)) == _FUNCTION){ - hsv.h = 43; - hsv.s = 105; - hsv.v = 255; - - if (hsv.v > rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET) { - hsv.v = rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET; - } - RGB rgb = hsv_to_rgb(hsv); - - rgb_matrix_set_color(0, rgb.r, rgb.g, rgb.b); - } - // end layer function - - // capslock indicator - if (!rgb_matrix_indicators_user()) { - return false; - } - - if (host_keyboard_led_state().caps_lock) { - hsv.h = 43; - hsv.s = 105; - hsv.v = 255; - - if (hsv.v > rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET) { - hsv.v = rgb_matrix_get_val() + RGB_INDICATOR_POS_OFFSET; - } - RGB rgb = hsv_to_rgb(hsv); - - rgb_matrix_set_color(1, rgb.r, rgb.g, rgb.b); - } - // end capslock function - - return false; -} diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c index 9b454b2fea1..78e4b8c45de 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c @@ -22,14 +22,14 @@ enum point65_layers { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT_7u( + [_QWERTY] = LAYOUT_65_ansi_blocker_tsangan( 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_HOME, 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_PGUP, 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_PGDN, 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_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_FUNCTION), KC_LEFT, KC_DOWN, KC_RIGHT ), - [_FUNCTION] = LAYOUT_7u( + [_FUNCTION] = LAYOUT_65_ansi_blocker_tsangan( 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_NO, NK_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, @@ -38,7 +38,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ) }; -bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { +bool rgb_matrix_indicators_user(void) { HSV hsv = {0, 255, 255}; // Light up ESC RGB LED when _FUNCTION layer is accessed @@ -57,10 +57,6 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { // end layer function // capslock indicator - if (!rgb_matrix_indicators_user()) { - return false; - } - if (host_keyboard_led_state().caps_lock) { hsv.h = 43; hsv.s = 105; diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h index fc5da242be3..102911dfda5 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h @@ -16,29 +16,10 @@ #pragma once -/* key matrix size */ -#define MATRIX_ROWS 5 -#define MATRIX_COLS 16 - -/* Keyboard Matrix Assignments -#define MATRIX_ROW_PINS { GP24, GP23, GP22, GP21, GP25 } -#define MATRIX_COL_PINS { GP28, GP27, GP26, GP29, GP0, GP11, GP10, GP9, GP8, GP7, GP6, GP5, GP4, GP3, GP2, GP1 } -*/ - -#define DEBOUNCE 5 - /* Double tap the side button to enter bootloader */ #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET #define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U -#ifdef RGB_MATRIX_ENABLE - #define WS2812_PIO_USE_PIO1 - - /* Enable Framebuffer and keypress effects */ - #define RGB_MATRIX_FRAMEBUFFER_EFFECTS - #define RGB_MATRIX_KEYPRESSES -#endif - /* couple of defaults */ #define RGB_INDICATOR_POS_OFFSET 48 /* Indicator LEDs additional brightness */ diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json index 91da72fa8ec..911aa4174af 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json @@ -21,8 +21,9 @@ "rows": ["GP24", "GP23", "GP22", "GP21", "GP25"] }, "diode_direction": "COL2ROW", + "community_layouts": ["65_ansi_blocker"], "layouts": { - "LAYOUT": { + "LAYOUT_65_ansi_blocker": { "layout": [ { "matrix": [0, 0 ], "label":"KC_ESC", "x":0, "y":0, "w":1 }, { "matrix": [0, 1 ], "label":"KC_1", "x":1, "y":0, "w":1 }, @@ -116,61 +117,61 @@ {"flags": 255, "x": 201, "y": 0, "matrix": [ 0, 13 ] }, {"flags": 255, "x": 224, "y": 0, "matrix": [ 0, 15 ] }, - {"flags": 255, "x": 224, "y": 16, "matrix": [ 0, 15 ] }, - {"flags": 255, "x": 205, "y": 16, "matrix": [ 0, 13 ] }, - {"flags": 255, "x": 187, "y": 16, "matrix": [ 0, 12 ] }, - {"flags": 255, "x": 172, "y": 16, "matrix": [ 0, 11 ] }, - {"flags": 255, "x": 157, "y": 16, "matrix": [ 0, 10 ] }, - {"flags": 255, "x": 142, "y": 16, "matrix": [ 0, 9 ] }, - {"flags": 255, "x": 127, "y": 16, "matrix": [ 0, 8 ] }, - {"flags": 255, "x": 112, "y": 16, "matrix": [ 0, 7 ] }, - {"flags": 255, "x": 97, "y": 16, "matrix": [ 0, 6 ] }, - {"flags": 255, "x": 82, "y": 16, "matrix": [ 0, 5 ] }, - {"flags": 255, "x": 67, "y": 16, "matrix": [ 0, 4 ] }, - {"flags": 255, "x": 52, "y": 16, "matrix": [ 0, 3 ] }, - {"flags": 255, "x": 37, "y": 16, "matrix": [ 0, 2 ] }, - {"flags": 255, "x": 23, "y": 16, "matrix": [ 0, 1 ] }, - {"flags": 255, "x": 4, "y": 16, "matrix": [ 0, 0 ] }, + {"flags": 255, "x": 224, "y": 16, "matrix": [ 1, 15 ] }, + {"flags": 255, "x": 205, "y": 16, "matrix": [ 1, 13 ] }, + {"flags": 255, "x": 187, "y": 16, "matrix": [ 1, 12 ] }, + {"flags": 255, "x": 172, "y": 16, "matrix": [ 1, 11 ] }, + {"flags": 255, "x": 157, "y": 16, "matrix": [ 1, 10 ] }, + {"flags": 255, "x": 142, "y": 16, "matrix": [ 1, 9 ] }, + {"flags": 255, "x": 127, "y": 16, "matrix": [ 1, 8 ] }, + {"flags": 255, "x": 112, "y": 16, "matrix": [ 1, 7 ] }, + {"flags": 255, "x": 97, "y": 16, "matrix": [ 1, 6 ] }, + {"flags": 255, "x": 82, "y": 16, "matrix": [ 1, 5 ] }, + {"flags": 255, "x": 67, "y": 16, "matrix": [ 1, 4 ] }, + {"flags": 255, "x": 52, "y": 16, "matrix": [ 1, 3 ] }, + {"flags": 255, "x": 37, "y": 16, "matrix": [ 1, 2 ] }, + {"flags": 255, "x": 23, "y": 16, "matrix": [ 1, 1 ] }, + {"flags": 255, "x": 4, "y": 16, "matrix": [ 1, 0 ] }, - {"flags": 255, "x": 6, "y": 32, "matrix": [ 0, 0 ] }, - {"flags": 255, "x": 26, "y": 32, "matrix": [ 0, 1 ] }, - {"flags": 255, "x": 41, "y": 32, "matrix": [ 0, 2 ] }, - {"flags": 255, "x": 56, "y": 32, "matrix": [ 0, 3 ] }, - {"flags": 255, "x": 71, "y": 32, "matrix": [ 0, 4 ] }, - {"flags": 255, "x": 86, "y": 32, "matrix": [ 0, 5 ] }, - {"flags": 255, "x": 101, "y": 32, "matrix": [ 0, 6 ] }, - {"flags": 255, "x": 116, "y": 32, "matrix": [ 0, 7 ] }, - {"flags": 255, "x": 131, "y": 32, "matrix": [ 0, 8 ] }, - {"flags": 255, "x": 145, "y": 32, "matrix": [ 0, 9 ] }, - {"flags": 255, "x": 160, "y": 32, "matrix": [ 0, 10 ] }, - {"flags": 255, "x": 175, "y": 32, "matrix": [ 0, 11 ] }, - {"flags": 255, "x": 200, "y": 32, "matrix": [ 0, 12 ] }, - {"flags": 255, "x": 224, "y": 32, "matrix": [ 0, 15 ] }, + {"flags": 255, "x": 6, "y": 32, "matrix": [ 2, 0 ] }, + {"flags": 255, "x": 26, "y": 32, "matrix": [ 2, 1 ] }, + {"flags": 255, "x": 41, "y": 32, "matrix": [ 2, 2 ] }, + {"flags": 255, "x": 56, "y": 32, "matrix": [ 2, 3 ] }, + {"flags": 255, "x": 71, "y": 32, "matrix": [ 2, 4 ] }, + {"flags": 255, "x": 86, "y": 32, "matrix": [ 2, 5 ] }, + {"flags": 255, "x": 101, "y": 32, "matrix": [ 2, 6 ] }, + {"flags": 255, "x": 116, "y": 32, "matrix": [ 2, 7 ] }, + {"flags": 255, "x": 131, "y": 32, "matrix": [ 2, 8 ] }, + {"flags": 255, "x": 145, "y": 32, "matrix": [ 2, 9 ] }, + {"flags": 255, "x": 160, "y": 32, "matrix": [ 2, 10 ] }, + {"flags": 255, "x": 175, "y": 32, "matrix": [ 2, 11 ] }, + {"flags": 255, "x": 200, "y": 32, "matrix": [ 2, 12 ] }, + {"flags": 255, "x": 224, "y": 32, "matrix": [ 2, 15 ] }, - {"flags": 255, "x": 224, "y": 48, "matrix": [ 0, 15 ] }, - {"flags": 255, "x": 209, "y": 48, "matrix": [ 0, 14 ] }, - {"flags": 255, "x": 188, "y": 48, "matrix": [ 0, 11 ] }, - {"flags": 255, "x": 168, "y": 48, "matrix": [ 0, 10 ] }, - {"flags": 255, "x": 153, "y": 48, "matrix": [ 0, 9 ] }, - {"flags": 255, "x": 138, "y": 48, "matrix": [ 0, 8 ] }, - {"flags": 255, "x": 123, "y": 48, "matrix": [ 0, 7 ] }, - {"flags": 255, "x": 108, "y": 48, "matrix": [ 0, 6 ] }, - {"flags": 255, "x": 93, "y": 48, "matrix": [ 0, 5 ] }, - {"flags": 255, "x": 78, "y": 48, "matrix": [ 0, 4 ] }, - {"flags": 255, "x": 63, "y": 48, "matrix": [ 0, 3 ] }, - {"flags": 255, "x": 49, "y": 48, "matrix": [ 0, 2 ] }, - {"flags": 255, "x": 34, "y": 48, "matrix": [ 0, 1 ] }, - {"flags": 255, "x": 9, "y": 48, "matrix": [ 0, 0 ] }, + {"flags": 255, "x": 224, "y": 48, "matrix": [ 3, 15 ] }, + {"flags": 255, "x": 209, "y": 48, "matrix": [ 3, 14 ] }, + {"flags": 255, "x": 188, "y": 48, "matrix": [ 3, 11 ] }, + {"flags": 255, "x": 168, "y": 48, "matrix": [ 3, 10 ] }, + {"flags": 255, "x": 153, "y": 48, "matrix": [ 3, 9 ] }, + {"flags": 255, "x": 138, "y": 48, "matrix": [ 3, 8 ] }, + {"flags": 255, "x": 123, "y": 48, "matrix": [ 3, 7 ] }, + {"flags": 255, "x": 108, "y": 48, "matrix": [ 3, 6 ] }, + {"flags": 255, "x": 93, "y": 48, "matrix": [ 3, 5 ] }, + {"flags": 255, "x": 78, "y": 48, "matrix": [ 3, 4 ] }, + {"flags": 255, "x": 63, "y": 48, "matrix": [ 3, 3 ] }, + {"flags": 255, "x": 49, "y": 48, "matrix": [ 3, 2 ] }, + {"flags": 255, "x": 34, "y": 48, "matrix": [ 3, 1 ] }, + {"flags": 255, "x": 9, "y": 48, "matrix": [ 3, 0 ] }, - {"flags": 255, "x": 2, "y": 64, "matrix": [ 0, 0 ] }, - {"flags": 255, "x": 20, "y": 64, "matrix": [ 0, 1 ] }, - {"flags": 255, "x": 39, "y": 64, "matrix": [ 0, 2 ] }, - {"flags": 255, "x": 95, "y": 64, "matrix": [ 0, 5 ] }, - {"flags": 255, "x": 151, "y": 64, "matrix": [ 0, 9 ] }, - {"flags": 255, "x": 170, "y": 64, "matrix": [ 0, 10 ] }, - {"flags": 255, "x": 194, "y": 64, "matrix": [ 0, 13 ] }, - {"flags": 255, "x": 209, "y": 64, "matrix": [ 0, 14 ] }, - {"flags": 255, "x": 224, "y": 64, "matrix": [ 0, 15 ] } + {"flags": 255, "x": 2, "y": 64, "matrix": [ 4, 0 ] }, + {"flags": 255, "x": 20, "y": 64, "matrix": [ 4, 1 ] }, + {"flags": 255, "x": 39, "y": 64, "matrix": [ 4, 2 ] }, + {"flags": 255, "x": 95, "y": 64, "matrix": [ 4, 5 ] }, + {"flags": 255, "x": 151, "y": 64, "matrix": [ 4, 9 ] }, + {"flags": 255, "x": 170, "y": 64, "matrix": [ 4, 10 ] }, + {"flags": 255, "x": 194, "y": 64, "matrix": [ 4, 13 ] }, + {"flags": 255, "x": 209, "y": 64, "matrix": [ 4, 14 ] }, + {"flags": 255, "x": 224, "y": 64, "matrix": [ 4, 15 ] } ], "driver": "ws2812", "max_brightness": 128, @@ -222,7 +223,7 @@ "default": { "animation": "cycle_left_right", "on": true, - "val": 192 + "val": 128 } }, "ws2812": { diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c index d23b8ba576e..15d34133425 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c @@ -22,14 +22,14 @@ enum reformortho_layers { }; const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { - [_QWERTY] = LAYOUT( + [_QWERTY] = LAYOUT_65_ansi_blocker( 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_HOME, 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_PGUP, 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_PGDN, 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_END, KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, KC_RALT, MO(_FUNCTION), KC_LEFT, KC_DOWN, KC_RIGHT ), - [_FUNCTION] = LAYOUT( + [_FUNCTION] = LAYOUT_65_ansi_blocker( 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_NO, NK_TOGG, RGB_TOG, RGB_VAI, KC_NO, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, @@ -57,10 +57,6 @@ bool rgb_matrix_indicators_advanced_user(uint8_t led_min, uint8_t led_max) { // end layer function // capslock indicator - if (!rgb_matrix_indicators_user()) { - return false; - } - if (host_keyboard_led_state().caps_lock) { hsv.h = 43; hsv.s = 105; diff --git a/keyboards/mechanicalkeyboards/point65/readme.md b/keyboards/mechanicalkeyboards/point65/readme.md index 7bdb287ceac..ede74afe528 100644 --- a/keyboards/mechanicalkeyboards/point65/readme.md +++ b/keyboards/mechanicalkeyboards/point65/readme.md @@ -1,6 +1,6 @@ # Mechanical Keyboards Point65 -![Mechanical Keyboards Point65](https://mechanicalkeyboards.com/cdn/shop/files/17705-MIJ95-Point-65-Keyboard-Kit.jpg) +![Mechanical Keyboards Point65](https://i.imgur.com/lTEwGBR.png) ## Description A 65% keyboard by [Mechanical Keyboards](https://mechanicalkeyboards.com) available as either multi layout hotswap, or hotswap with RGB per key backlight. @@ -13,11 +13,11 @@ A 65% keyboard by [Mechanical Keyboards](https://mechanicalkeyboards.com) availa ## Firmware building **Hotswap with 6.25U layout:** - make mechanicalkeyboards/point65/hotswap:default_625u + make mechanicalkeyboards/point65/hotswap:default **Hotswap with 7U layout:** - make mechanicalkeyboards/point65/hotswap:default_75u + make mechanicalkeyboards/point65/hotswap:default_7u **Hotswap RGB:** From eef7957788ccd927617c43359dced726e7f1b3a7 Mon Sep 17 00:00:00 2001 From: Sebastiaan Swinkels Date: Fri, 20 Jun 2025 13:42:30 +0200 Subject: [PATCH 03/11] Addendum to changes requested on qmk pr #25392 Removed redundant default animation and state variables for both PCBs --- keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json | 2 -- keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json | 2 -- 2 files changed, 4 deletions(-) diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json index bd9a500726b..44b2e6d84bc 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json @@ -229,8 +229,6 @@ "solid_multisplash": true }, "default": { - "animation": "cycle_left_right", - "on": true, "val": 128 } }, diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json index 911aa4174af..b39795fd209 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json @@ -221,8 +221,6 @@ "solid_multisplash": true }, "default": { - "animation": "cycle_left_right", - "on": true, "val": 128 } }, From c96860135dac5eff0e95cc0acc6817023542ba5b Mon Sep 17 00:00:00 2001 From: Sebastiaan Swinkels Date: Fri, 20 Jun 2025 22:18:55 +0200 Subject: [PATCH 04/11] Made additional changes requested on qmk #25392 - consolidated keyboard.json common values into info.json - re-formatted all three json files - updated keymap --- .../point65/hotswap/keyboard.json | 370 +++++++----------- .../point65/hotswap/keymaps/default/keymap.c | 2 +- .../hotswap/keymaps/default_7u/keymap.c | 2 +- .../point65/hotswap_rgb/keyboard.json | 358 +++++++---------- .../hotswap_rgb/keymaps/default/keymap.c | 2 +- .../mechanicalkeyboards/point65/info.json | 80 ++++ 6 files changed, 371 insertions(+), 443 deletions(-) create mode 100644 keyboards/mechanicalkeyboards/point65/info.json diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json index 44b2e6d84bc..610b0323ea7 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json @@ -1,239 +1,163 @@ { "keyboard_name": "Point 65 Hotswap", - "manufacturer": "Mechanical Keyboards", + "rgb_matrix": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 255}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 255} + ] + }, "url": "https://mechanicalkeyboards.com/products/mk-point65-keyboard-kit?variant=49803723735340", - "maintainer": "C44Supra", "usb": { - "vid": "0x4242", - "pid": "0xC0F5", - "device_version": "1.0.0" + "pid": "0xC0F5" }, - "bootloader": "rp2040", - "processor": "RP2040", - "matrix_pins": { - "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], - "rows": ["GP24", "GP22", "GP21", "GP19", "GP25"] + "ws2812": { + "pin": "GP23" }, - "features": { - "bootmagic": true, - "nkro": true, - "rgb_matrix": true, - "extrakey": true - }, - "diode_direction": "COL2ROW", + "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_tsangan"], "layout_aliases": { "LAYOUT_65_ansi_blocker": "LAYOUT_all" }, - "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_tsangan"], "layouts": { - "LAYOUT_all": { - "layout": [ - { "matrix": [0, 0 ], "label":"KC_ESC", "x":0, "y":0, "w":1 }, - { "matrix": [0, 1 ], "label":"KC_1", "x":1, "y":0, "w":1 }, - { "matrix": [0, 2 ], "label":"KC_2", "x":2, "y":0, "w":1 }, - { "matrix": [0, 3 ], "label":"KC_3", "x":3, "y":0, "w":1 }, - { "matrix": [0, 4 ], "label":"KC_4", "x":4, "y":0, "w":1 }, - { "matrix": [0, 5 ], "label":"KC_5", "x":5, "y":0, "w":1 }, - { "matrix": [0, 6 ], "label":"KC_6", "x":6, "y":0, "w":1 }, - { "matrix": [0, 7 ], "label":"KC_7", "x":7, "y":0, "w":1 }, - { "matrix": [0, 8 ], "label":"KC_8", "x":8, "y":0, "w":1 }, - { "matrix": [0, 9 ], "label":"KC_9", "x":9, "y":0, "w":1 }, - { "matrix": [0, 10], "label":"KC_0", "x":10, "y":0, "w":1 }, - { "matrix": [0, 11], "label":"KC_MINUS", "x":11, "y":0, "w":1 }, - { "matrix": [0, 12], "label":"KC_EQUAL", "x":12, "y":0, "w":1 }, - { "matrix": [0, 13], "label":"KC_BACKSPACE", "x":13, "y":0, "w":2 }, - { "matrix": [0, 15], "label":"KC_HOME", "x":15, "y":0, "w":1 }, - - { "matrix": [1, 0 ], "label":"KC_TAB", "x":0, "y":1, "w":1.5 }, - { "matrix": [1, 1 ], "label":"KC_Q", "x":1.5, "y":1, "w":1 }, - { "matrix": [1, 2 ], "label":"KC_W", "x":2.5, "y":1, "w":1 }, - { "matrix": [1, 3 ], "label":"KC_E", "x":3.5, "y":1, "w":1 }, - { "matrix": [1, 4 ], "label":"KC_R", "x":4.5, "y":1, "w":1 }, - { "matrix": [1, 5 ], "label":"KC_T", "x":5.5, "y":1, "w":1 }, - { "matrix": [1, 6 ], "label":"KC_Y", "x":6.5, "y":1, "w":1 }, - { "matrix": [1, 7 ], "label":"KC_U", "x":7.5, "y":1, "w":1 }, - { "matrix": [1, 8 ], "label":"KC_I", "x":8.5, "y":1, "w":1 }, - { "matrix": [1, 9 ], "label":"KC_O", "x":9.5, "y":1, "w":1 }, - { "matrix": [1, 10], "label":"KC_P", "x":10.5, "y":1, "w":1 }, - { "matrix": [1, 11], "label":"KC_LEFT_BRACKET", "x":11.5, "y":1, "w":1 }, - { "matrix": [1, 12], "label":"KC_RIGHT_BRACKET", "x":12.5, "y":1, "w":1 }, - { "matrix": [1, 13], "label":"KC_BACKSLASH", "x":13.5, "y":1, "w":1.5 }, - { "matrix": [1, 15], "label":"KC_PGUP", "x":15, "y":1, "w":1 }, - - { "matrix": [2, 0 ], "label":"KC_CAPS", "x":0, "y":2, "w":1.75 }, - { "matrix": [2, 1 ], "label":"KC_A", "x":1.75, "y":2, "w":1 }, - { "matrix": [2, 2 ], "label":"KC_S", "x":2.75, "y":2, "w":1 }, - { "matrix": [2, 3 ], "label":"KC_D", "x":3.75, "y":2, "w":1 }, - { "matrix": [2, 4 ], "label":"KC_F", "x":4.75, "y":2, "w":1 }, - { "matrix": [2, 5 ], "label":"KC_G", "x":5.75, "y":2, "w":1 }, - { "matrix": [2, 6 ], "label":"KC_H", "x":6.75, "y":2, "w":1 }, - { "matrix": [2, 7 ], "label":"KC_J", "x":7.75, "y":2, "w":1 }, - { "matrix": [2, 8 ], "label":"KC_K", "x":8.75, "y":2, "w":1 }, - { "matrix": [2, 9 ], "label":"KC_L", "x":9.75, "y":2, "w":1 }, - { "matrix": [2, 10], "label":"KC_SCLN", "x":10.75, "y":2, "w":1 }, - { "matrix": [2, 11], "label":"KC_QUOT", "x":11.75, "y":2, "w":1 }, - { "matrix": [2, 12], "label":"KC_ENTER", "x":12.75, "y":2, "w":2.25 }, - { "matrix": [2, 15], "label":"KC_PGDN", "x":15, "y":2, "w":1 }, - - { "matrix": [3, 0 ], "label":"KC_LSFT", "x":0, "y":3, "w":2.25 }, - { "matrix": [3, 1 ], "label":"KC_Z", "x":2.25, "y":3, "w":1 }, - { "matrix": [3, 2 ], "label":"KC_X", "x":3.25, "y":3, "w":1 }, - { "matrix": [3, 3 ], "label":"KC_C", "x":4.25, "y":3, "w":1 }, - { "matrix": [3, 4 ], "label":"KC_V", "x":5.25, "y":3, "w":1 }, - { "matrix": [3, 5 ], "label":"KC_B", "x":6.25, "y":3, "w":1 }, - { "matrix": [3, 6 ], "label":"KC_N", "x":7.25, "y":3, "w":1 }, - { "matrix": [3, 7 ], "label":"KC_M", "x":8.25, "y":3, "w":1 }, - { "matrix": [3, 8 ], "label":"KC_COMM", "x":9.25, "y":3, "w":1 }, - { "matrix": [3, 9 ], "label":"KC_DOT", "x":10.25, "y":3, "w":1 }, - { "matrix": [3, 10], "label":"KC_SLSH", "x":11.25, "y":3, "w":1 }, - { "matrix": [3, 11], "label":"KC_RSFT", "x":12.25, "y":3, "w":1.75 }, - { "matrix": [3, 14], "label":"KC_UP", "x":14, "y":3, "w":1 }, - { "matrix": [3, 15], "label":"KC_END", "x":15, "y":3, "w":1 }, - - { "matrix": [4, 0 ], "label":"KC_LCTL", "x":0, "y":4, "w":1.25 }, - { "matrix": [4, 1 ], "label":"KC_LGUI", "x":1.25, "y":4, "w":1.25 }, - { "matrix": [4, 2 ], "label":"KC_LALT", "x":2.5, "y":4, "w":1.25 }, - { "matrix": [4, 5 ], "label":"KC_SPC", "x":3.75, "y":4, "w":6.25 }, - { "matrix": [4, 9 ], "label":"KC_RALT", "x":10, "y":4, "w":1.25 }, - { "matrix": [4, 10], "label":"_FN", "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4, 13], "label":"KC_LEFT", "x":13, "y":4, "w":1 }, - { "matrix": [4, 14], "label":"KC_DOWN", "x":14, "y":4, "w":1 }, - { "matrix": [4, 15], "label":"KC_RGHT", "x":15, "y":4, "w":1 } - ] - }, "LAYOUT_65_ansi_blocker_tsangan": { "layout": [ - { "matrix": [0, 0 ], "label":"KC_ESC", "x":0, "y":0, "w":1 }, - { "matrix": [0, 1 ], "label":"KC_1", "x":1, "y":0, "w":1 }, - { "matrix": [0, 2 ], "label":"KC_2", "x":2, "y":0, "w":1 }, - { "matrix": [0, 3 ], "label":"KC_3", "x":3, "y":0, "w":1 }, - { "matrix": [0, 4 ], "label":"KC_4", "x":4, "y":0, "w":1 }, - { "matrix": [0, 5 ], "label":"KC_5", "x":5, "y":0, "w":1 }, - { "matrix": [0, 6 ], "label":"KC_6", "x":6, "y":0, "w":1 }, - { "matrix": [0, 7 ], "label":"KC_7", "x":7, "y":0, "w":1 }, - { "matrix": [0, 8 ], "label":"KC_8", "x":8, "y":0, "w":1 }, - { "matrix": [0, 9 ], "label":"KC_9", "x":9, "y":0, "w":1 }, - { "matrix": [0, 10], "label":"KC_0", "x":10, "y":0, "w":1 }, - { "matrix": [0, 11], "label":"KC_MINUS", "x":11, "y":0, "w":1 }, - { "matrix": [0, 12], "label":"KC_EQUAL", "x":12, "y":0, "w":1 }, - { "matrix": [0, 13], "label":"KC_BACKSPACE", "x":13, "y":0, "w":2 }, - { "matrix": [0, 15], "label":"KC_HOME", "x":15, "y":0, "w":1 }, - - { "matrix": [1, 0 ], "label":"KC_TAB", "x":0, "y":1, "w":1.5 }, - { "matrix": [1, 1 ], "label":"KC_Q", "x":1.5, "y":1, "w":1 }, - { "matrix": [1, 2 ], "label":"KC_W", "x":2.5, "y":1, "w":1 }, - { "matrix": [1, 3 ], "label":"KC_E", "x":3.5, "y":1, "w":1 }, - { "matrix": [1, 4 ], "label":"KC_R", "x":4.5, "y":1, "w":1 }, - { "matrix": [1, 5 ], "label":"KC_T", "x":5.5, "y":1, "w":1 }, - { "matrix": [1, 6 ], "label":"KC_Y", "x":6.5, "y":1, "w":1 }, - { "matrix": [1, 7 ], "label":"KC_U", "x":7.5, "y":1, "w":1 }, - { "matrix": [1, 8 ], "label":"KC_I", "x":8.5, "y":1, "w":1 }, - { "matrix": [1, 9 ], "label":"KC_O", "x":9.5, "y":1, "w":1 }, - { "matrix": [1, 10], "label":"KC_P", "x":10.5, "y":1, "w":1 }, - { "matrix": [1, 11], "label":"KC_LEFT_BRACKET", "x":11.5, "y":1, "w":1 }, - { "matrix": [1, 12], "label":"KC_RIGHT_BRACKET", "x":12.5, "y":1, "w":1 }, - { "matrix": [1, 13], "label":"KC_BACKSLASH", "x":13.5, "y":1, "w":1.5 }, - { "matrix": [1, 15], "label":"KC_PGUP", "x":15, "y":1, "w":1 }, - - { "matrix": [2, 0 ], "label":"KC_CAPS", "x":0, "y":2, "w":1.75 }, - { "matrix": [2, 1 ], "label":"KC_A", "x":1.75, "y":2, "w":1 }, - { "matrix": [2, 2 ], "label":"KC_S", "x":2.75, "y":2, "w":1 }, - { "matrix": [2, 3 ], "label":"KC_D", "x":3.75, "y":2, "w":1 }, - { "matrix": [2, 4 ], "label":"KC_F", "x":4.75, "y":2, "w":1 }, - { "matrix": [2, 5 ], "label":"KC_G", "x":5.75, "y":2, "w":1 }, - { "matrix": [2, 6 ], "label":"KC_H", "x":6.75, "y":2, "w":1 }, - { "matrix": [2, 7 ], "label":"KC_J", "x":7.75, "y":2, "w":1 }, - { "matrix": [2, 8 ], "label":"KC_K", "x":8.75, "y":2, "w":1 }, - { "matrix": [2, 9 ], "label":"KC_L", "x":9.75, "y":2, "w":1 }, - { "matrix": [2, 10], "label":"KC_SCLN", "x":10.75, "y":2, "w":1 }, - { "matrix": [2, 11], "label":"KC_QUOT", "x":11.75, "y":2, "w":1 }, - { "matrix": [2, 12], "label":"KC_ENTER", "x":12.75, "y":2, "w":2.25 }, - { "matrix": [2, 15], "label":"KC_PGDN", "x":15, "y":2, "w":1 }, - - { "matrix": [3, 0 ], "label":"KC_LSFT", "x":0, "y":3, "w":2.25 }, - { "matrix": [3, 1 ], "label":"KC_Z", "x":2.25, "y":3, "w":1 }, - { "matrix": [3, 2 ], "label":"KC_X", "x":3.25, "y":3, "w":1 }, - { "matrix": [3, 3 ], "label":"KC_C", "x":4.25, "y":3, "w":1 }, - { "matrix": [3, 4 ], "label":"KC_V", "x":5.25, "y":3, "w":1 }, - { "matrix": [3, 5 ], "label":"KC_B", "x":6.25, "y":3, "w":1 }, - { "matrix": [3, 6 ], "label":"KC_N", "x":7.25, "y":3, "w":1 }, - { "matrix": [3, 7 ], "label":"KC_M", "x":8.25, "y":3, "w":1 }, - { "matrix": [3, 8 ], "label":"KC_COMM", "x":9.25, "y":3, "w":1 }, - { "matrix": [3, 9 ], "label":"KC_DOT", "x":10.25, "y":3, "w":1 }, - { "matrix": [3, 10], "label":"KC_SLSH", "x":11.25, "y":3, "w":1 }, - { "matrix": [3, 11], "label":"KC_RSFT", "x":12.25, "y":3, "w":1.75 }, - { "matrix": [3, 14], "label":"KC_UP", "x":14, "y":3, "w":1 }, - { "matrix": [3, 15], "label":"KC_END", "x":15, "y":3, "w":1 }, - - { "matrix": [4, 0 ], "label":"KC_LCTL", "x":0, "y":4, "w":1.5 }, - { "matrix": [4, 1 ], "label":"KC_LGUI", "x":1.5, "y":4, "w":1 }, - { "matrix": [4, 2 ], "label":"KC_LALT", "x":2.5, "y":4, "w":1.5 }, - { "matrix": [4, 5 ], "label":"KC_SPC", "x":4, "y":4, "w":7 }, - { "matrix": [4, 10 ], "label":"_FN", "x":11, "y":4, "w":1.5 }, - { "matrix": [4, 13], "label":"KC_LEFT", "x":13, "y":4, "w":1 }, - { "matrix": [4, 14], "label":"KC_DOWN", "x":14, "y":4, "w":1 }, - { "matrix": [4, 15], "label":"KC_RGHT", "x":15, "y":4, "w":1 } + {"label": "KC_ESC", "matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"label": "KC_1", "matrix": [0, 1], "x": 1, "y": 0, "w": 1}, + {"label": "KC_2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1}, + {"label": "KC_3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1}, + {"label": "KC_4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1}, + {"label": "KC_5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1}, + {"label": "KC_6", "matrix": [0, 6], "x": 6, "y": 0, "w": 1}, + {"label": "KC_7", "matrix": [0, 7], "x": 7, "y": 0, "w": 1}, + {"label": "KC_8", "matrix": [0, 8], "x": 8, "y": 0, "w": 1}, + {"label": "KC_9", "matrix": [0, 9], "x": 9, "y": 0, "w": 1}, + {"label": "KC_0", "matrix": [0, 10], "x": 10, "y": 0, "w": 1}, + {"label": "KC_MINUS", "matrix": [0, 11], "x": 11, "y": 0, "w": 1}, + {"label": "KC_EQUAL", "matrix": [0, 12], "x": 12, "y": 0, "w": 1}, + {"label": "KC_BACKSPACE", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "KC_HOME", "matrix": [0, 15], "x": 15, "y": 0, "w": 1}, + {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1}, + {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1}, + {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1, "w": 1}, + {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1}, + {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1, "w": 1}, + {"label": "KC_Y", "matrix": [1, 6], "x": 6.5, "y": 1, "w": 1}, + {"label": "KC_U", "matrix": [1, 7], "x": 7.5, "y": 1, "w": 1}, + {"label": "KC_I", "matrix": [1, 8], "x": 8.5, "y": 1, "w": 1}, + {"label": "KC_O", "matrix": [1, 9], "x": 9.5, "y": 1, "w": 1}, + {"label": "KC_P", "matrix": [1, 10], "x": 10.5, "y": 1, "w": 1}, + {"label": "KC_LEFT_BRACKET", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1}, + {"label": "KC_RIGHT_BRACKET", "matrix": [1, 12], "x": 12.5, "y": 1, "w": 1}, + {"label": "KC_BACKSLASH", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "KC_PGUP", "matrix": [1, 15], "x": 15, "y": 1, "w": 1}, + {"label": "KC_CAPS", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "KC_A", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1}, + {"label": "KC_S", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1}, + {"label": "KC_D", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1}, + {"label": "KC_F", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1}, + {"label": "KC_G", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1}, + {"label": "KC_H", "matrix": [2, 6], "x": 6.75, "y": 2, "w": 1}, + {"label": "KC_J", "matrix": [2, 7], "x": 7.75, "y": 2, "w": 1}, + {"label": "KC_K", "matrix": [2, 8], "x": 8.75, "y": 2, "w": 1}, + {"label": "KC_L", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1}, + {"label": "KC_SCLN", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1}, + {"label": "KC_QUOT", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1}, + {"label": "KC_ENTER", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "KC_PGDN", "matrix": [2, 15], "x": 15, "y": 2, "w": 1}, + {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "KC_Z", "matrix": [3, 1], "x": 2.25, "y": 3, "w": 1}, + {"label": "KC_X", "matrix": [3, 2], "x": 3.25, "y": 3, "w": 1}, + {"label": "KC_C", "matrix": [3, 3], "x": 4.25, "y": 3, "w": 1}, + {"label": "KC_V", "matrix": [3, 4], "x": 5.25, "y": 3, "w": 1}, + {"label": "KC_B", "matrix": [3, 5], "x": 6.25, "y": 3, "w": 1}, + {"label": "KC_N", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1}, + {"label": "KC_M", "matrix": [3, 7], "x": 8.25, "y": 3, "w": 1}, + {"label": "KC_COMM", "matrix": [3, 8], "x": 9.25, "y": 3, "w": 1}, + {"label": "KC_DOT", "matrix": [3, 9], "x": 10.25, "y": 3, "w": 1}, + {"label": "KC_SLSH", "matrix": [3, 10], "x": 11.25, "y": 3, "w": 1}, + {"label": "KC_RSFT", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "KC_UP", "matrix": [3, 14], "x": 14, "y": 3, "w": 1}, + {"label": "KC_END", "matrix": [3, 15], "x": 15, "y": 3, "w": 1}, + {"label": "KC_LCTL", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.5}, + {"label": "KC_LGUI", "matrix": [4, 1], "x": 1.5, "y": 4, "w": 1}, + {"label": "KC_LALT", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.5}, + {"label": "KC_SPC", "matrix": [4, 5], "x": 4, "y": 4, "w": 7}, + {"label": "_FN", "matrix": [4, 10], "x": 11, "y": 4, "w": 1.5}, + {"label": "KC_LEFT", "matrix": [4, 13], "x": 13, "y": 4, "w": 1}, + {"label": "KC_DOWN", "matrix": [4, 14], "x": 14, "y": 4, "w": 1}, + {"label": "KC_RGHT", "matrix": [4, 15], "x": 15, "y": 4, "w": 1} + ] + }, + "LAYOUT_all": { + "layout": [ + {"label": "KC_ESC", "matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"label": "KC_1", "matrix": [0, 1], "x": 1, "y": 0, "w": 1}, + {"label": "KC_2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1}, + {"label": "KC_3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1}, + {"label": "KC_4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1}, + {"label": "KC_5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1}, + {"label": "KC_6", "matrix": [0, 6], "x": 6, "y": 0, "w": 1}, + {"label": "KC_7", "matrix": [0, 7], "x": 7, "y": 0, "w": 1}, + {"label": "KC_8", "matrix": [0, 8], "x": 8, "y": 0, "w": 1}, + {"label": "KC_9", "matrix": [0, 9], "x": 9, "y": 0, "w": 1}, + {"label": "KC_0", "matrix": [0, 10], "x": 10, "y": 0, "w": 1}, + {"label": "KC_MINUS", "matrix": [0, 11], "x": 11, "y": 0, "w": 1}, + {"label": "KC_EQUAL", "matrix": [0, 12], "x": 12, "y": 0, "w": 1}, + {"label": "KC_BACKSPACE", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "KC_HOME", "matrix": [0, 15], "x": 15, "y": 0, "w": 1}, + {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1}, + {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1}, + {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1, "w": 1}, + {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1}, + {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1, "w": 1}, + {"label": "KC_Y", "matrix": [1, 6], "x": 6.5, "y": 1, "w": 1}, + {"label": "KC_U", "matrix": [1, 7], "x": 7.5, "y": 1, "w": 1}, + {"label": "KC_I", "matrix": [1, 8], "x": 8.5, "y": 1, "w": 1}, + {"label": "KC_O", "matrix": [1, 9], "x": 9.5, "y": 1, "w": 1}, + {"label": "KC_P", "matrix": [1, 10], "x": 10.5, "y": 1, "w": 1}, + {"label": "KC_LEFT_BRACKET", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1}, + {"label": "KC_RIGHT_BRACKET", "matrix": [1, 12], "x": 12.5, "y": 1, "w": 1}, + {"label": "KC_BACKSLASH", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "KC_PGUP", "matrix": [1, 15], "x": 15, "y": 1, "w": 1}, + {"label": "KC_CAPS", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "KC_A", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1}, + {"label": "KC_S", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1}, + {"label": "KC_D", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1}, + {"label": "KC_F", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1}, + {"label": "KC_G", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1}, + {"label": "KC_H", "matrix": [2, 6], "x": 6.75, "y": 2, "w": 1}, + {"label": "KC_J", "matrix": [2, 7], "x": 7.75, "y": 2, "w": 1}, + {"label": "KC_K", "matrix": [2, 8], "x": 8.75, "y": 2, "w": 1}, + {"label": "KC_L", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1}, + {"label": "KC_SCLN", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1}, + {"label": "KC_QUOT", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1}, + {"label": "KC_ENTER", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "KC_PGDN", "matrix": [2, 15], "x": 15, "y": 2, "w": 1}, + {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "KC_Z", "matrix": [3, 1], "x": 2.25, "y": 3, "w": 1}, + {"label": "KC_X", "matrix": [3, 2], "x": 3.25, "y": 3, "w": 1}, + {"label": "KC_C", "matrix": [3, 3], "x": 4.25, "y": 3, "w": 1}, + {"label": "KC_V", "matrix": [3, 4], "x": 5.25, "y": 3, "w": 1}, + {"label": "KC_B", "matrix": [3, 5], "x": 6.25, "y": 3, "w": 1}, + {"label": "KC_N", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1}, + {"label": "KC_M", "matrix": [3, 7], "x": 8.25, "y": 3, "w": 1}, + {"label": "KC_COMM", "matrix": [3, 8], "x": 9.25, "y": 3, "w": 1}, + {"label": "KC_DOT", "matrix": [3, 9], "x": 10.25, "y": 3, "w": 1}, + {"label": "KC_SLSH", "matrix": [3, 10], "x": 11.25, "y": 3, "w": 1}, + {"label": "KC_RSFT", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "KC_UP", "matrix": [3, 14], "x": 14, "y": 3, "w": 1}, + {"label": "KC_END", "matrix": [3, 15], "x": 15, "y": 3, "w": 1}, + {"label": "KC_LCTL", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "KC_LGUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "KC_LALT", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "KC_SPC", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "KC_RALT", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"label": "_FN", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "KC_LEFT", "matrix": [4, 13], "x": 13, "y": 4, "w": 1}, + {"label": "KC_DOWN", "matrix": [4, 14], "x": 14, "y": 4, "w": 1}, + {"label": "KC_RGHT", "matrix": [4, 15], "x": 15, "y": 4, "w": 1} ] } - }, - "rgb_matrix": { - "layout": [ - {"flags": 255, "x": 0, "y": 0, "matrix": [ 0, 0 ] }, - {"flags": 255, "x": 0, "y": 32, "matrix": [ 2, 0 ] } - ], - "driver": "ws2812", - "max_brightness": 128, - "animations": { - "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "raindrops": true, - "jellybean_raindrops": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "pixel_rain": true, - "pixel_flow": true, - "pixel_fractal": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "solid_reactive_wide": true, - "solid_reactive_multiwide": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, - "splash": true, - "multisplash": true, - "solid_splash": true, - "solid_multisplash": true - }, - "default": { - "val": 128 - } - }, - "ws2812": { - "driver": "vendor", - "pin": "GP23" } } diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c index 9f1263f6486..ab0ac1aeebc 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { NK_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_TRNS, - KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT + KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ) }; diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c index 78e4b8c45de..ceb3cd1993b 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { NK_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_TRNS, - KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT + KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ) }; diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json index b39795fd209..ef013a21ebb 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json @@ -1,231 +1,155 @@ { "keyboard_name": "Point 65 Hotswap RGB", - "manufacturer": "Mechanical Keyboards", + "rgb_matrix": { + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 255}, + {"matrix": [0, 1], "x": 15, "y": 0, "flags": 255}, + {"matrix": [0, 2], "x": 30, "y": 0, "flags": 255}, + {"matrix": [0, 3], "x": 45, "y": 0, "flags": 255}, + {"matrix": [0, 4], "x": 60, "y": 0, "flags": 255}, + {"matrix": [0, 5], "x": 75, "y": 0, "flags": 255}, + {"matrix": [0, 6], "x": 89, "y": 0, "flags": 255}, + {"matrix": [0, 7], "x": 104, "y": 0, "flags": 255}, + {"matrix": [0, 8], "x": 119, "y": 0, "flags": 255}, + {"matrix": [0, 9], "x": 134, "y": 0, "flags": 255}, + {"matrix": [0, 10], "x": 149, "y": 0, "flags": 255}, + {"matrix": [0, 11], "x": 164, "y": 0, "flags": 255}, + {"matrix": [0, 12], "x": 179, "y": 0, "flags": 255}, + {"matrix": [0, 13], "x": 201, "y": 0, "flags": 255}, + {"matrix": [0, 15], "x": 224, "y": 0, "flags": 255}, + {"matrix": [1, 15], "x": 224, "y": 16, "flags": 255}, + {"matrix": [1, 13], "x": 205, "y": 16, "flags": 255}, + {"matrix": [1, 12], "x": 187, "y": 16, "flags": 255}, + {"matrix": [1, 11], "x": 172, "y": 16, "flags": 255}, + {"matrix": [1, 10], "x": 157, "y": 16, "flags": 255}, + {"matrix": [1, 9], "x": 142, "y": 16, "flags": 255}, + {"matrix": [1, 8], "x": 127, "y": 16, "flags": 255}, + {"matrix": [1, 7], "x": 112, "y": 16, "flags": 255}, + {"matrix": [1, 6], "x": 97, "y": 16, "flags": 255}, + {"matrix": [1, 5], "x": 82, "y": 16, "flags": 255}, + {"matrix": [1, 4], "x": 67, "y": 16, "flags": 255}, + {"matrix": [1, 3], "x": 52, "y": 16, "flags": 255}, + {"matrix": [1, 2], "x": 37, "y": 16, "flags": 255}, + {"matrix": [1, 1], "x": 23, "y": 16, "flags": 255}, + {"matrix": [1, 0], "x": 4, "y": 16, "flags": 255}, + {"matrix": [2, 0], "x": 6, "y": 32, "flags": 255}, + {"matrix": [2, 1], "x": 26, "y": 32, "flags": 255}, + {"matrix": [2, 2], "x": 41, "y": 32, "flags": 255}, + {"matrix": [2, 3], "x": 56, "y": 32, "flags": 255}, + {"matrix": [2, 4], "x": 71, "y": 32, "flags": 255}, + {"matrix": [2, 5], "x": 86, "y": 32, "flags": 255}, + {"matrix": [2, 6], "x": 101, "y": 32, "flags": 255}, + {"matrix": [2, 7], "x": 116, "y": 32, "flags": 255}, + {"matrix": [2, 8], "x": 131, "y": 32, "flags": 255}, + {"matrix": [2, 9], "x": 145, "y": 32, "flags": 255}, + {"matrix": [2, 10], "x": 160, "y": 32, "flags": 255}, + {"matrix": [2, 11], "x": 175, "y": 32, "flags": 255}, + {"matrix": [2, 12], "x": 200, "y": 32, "flags": 255}, + {"matrix": [2, 15], "x": 224, "y": 32, "flags": 255}, + {"matrix": [3, 15], "x": 224, "y": 48, "flags": 255}, + {"matrix": [3, 14], "x": 209, "y": 48, "flags": 255}, + {"matrix": [3, 11], "x": 188, "y": 48, "flags": 255}, + {"matrix": [3, 10], "x": 168, "y": 48, "flags": 255}, + {"matrix": [3, 9], "x": 153, "y": 48, "flags": 255}, + {"matrix": [3, 8], "x": 138, "y": 48, "flags": 255}, + {"matrix": [3, 7], "x": 123, "y": 48, "flags": 255}, + {"matrix": [3, 6], "x": 108, "y": 48, "flags": 255}, + {"matrix": [3, 5], "x": 93, "y": 48, "flags": 255}, + {"matrix": [3, 4], "x": 78, "y": 48, "flags": 255}, + {"matrix": [3, 3], "x": 63, "y": 48, "flags": 255}, + {"matrix": [3, 2], "x": 49, "y": 48, "flags": 255}, + {"matrix": [3, 1], "x": 34, "y": 48, "flags": 255}, + {"matrix": [3, 0], "x": 9, "y": 48, "flags": 255}, + {"matrix": [4, 0], "x": 2, "y": 64, "flags": 255}, + {"matrix": [4, 1], "x": 20, "y": 64, "flags": 255}, + {"matrix": [4, 2], "x": 39, "y": 64, "flags": 255}, + {"matrix": [4, 5], "x": 95, "y": 64, "flags": 255}, + {"matrix": [4, 9], "x": 151, "y": 64, "flags": 255}, + {"matrix": [4, 10], "x": 170, "y": 64, "flags": 255}, + {"matrix": [4, 13], "x": 194, "y": 64, "flags": 255}, + {"matrix": [4, 14], "x": 209, "y": 64, "flags": 255}, + {"matrix": [4, 15], "x": 224, "y": 64, "flags": 255} + ] + }, "url": "https://mechanicalkeyboards.com/products/mk-point65-keyboard-kit?variant=49803723538732", - "maintainer": "C44Supra", "usb": { - "vid": "0x4242", - "pid": "0xC0F6", - "device_version": "1.0.0" + "pid": "0xC0F6" }, - "bootloader": "rp2040", - "processor": "RP2040", - "features": { - "bootmagic": true, - "nkro": true, - "rgb_matrix": true, - "extrakey": true + "ws2812": { + "pin": "GP19" }, - "matrix_pins": { - "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], - "rows": ["GP24", "GP23", "GP22", "GP21", "GP25"] - }, - "diode_direction": "COL2ROW", "community_layouts": ["65_ansi_blocker"], "layouts": { "LAYOUT_65_ansi_blocker": { "layout": [ - { "matrix": [0, 0 ], "label":"KC_ESC", "x":0, "y":0, "w":1 }, - { "matrix": [0, 1 ], "label":"KC_1", "x":1, "y":0, "w":1 }, - { "matrix": [0, 2 ], "label":"KC_2", "x":2, "y":0, "w":1 }, - { "matrix": [0, 3 ], "label":"KC_3", "x":3, "y":0, "w":1 }, - { "matrix": [0, 4 ], "label":"KC_4", "x":4, "y":0, "w":1 }, - { "matrix": [0, 5 ], "label":"KC_5", "x":5, "y":0, "w":1 }, - { "matrix": [0, 6 ], "label":"KC_6", "x":6, "y":0, "w":1 }, - { "matrix": [0, 7 ], "label":"KC_7", "x":7, "y":0, "w":1 }, - { "matrix": [0, 8 ], "label":"KC_8", "x":8, "y":0, "w":1 }, - { "matrix": [0, 9 ], "label":"KC_9", "x":9, "y":0, "w":1 }, - { "matrix": [0, 10], "label":"KC_0", "x":10, "y":0, "w":1 }, - { "matrix": [0, 11], "label":"KC_MINUS", "x":11, "y":0, "w":1 }, - { "matrix": [0, 12], "label":"KC_EQUAL", "x":12, "y":0, "w":1 }, - { "matrix": [0, 13], "label":"KC_BSPC", "x":13, "y":0, "w":2 }, - { "matrix": [0, 15], "label":"KC_HOME", "x":15, "y":0, "w":1 }, - - { "matrix": [1, 0 ], "label":"KC_TAB", "x":0, "y":1, "w":1.5 }, - { "matrix": [1, 1 ], "label":"KC_Q", "x":1.5, "y":1, "w":1 }, - { "matrix": [1, 2 ], "label":"KC_W", "x":2.5, "y":1, "w":1 }, - { "matrix": [1, 3 ], "label":"KC_E", "x":3.5, "y":1, "w":1 }, - { "matrix": [1, 4 ], "label":"KC_R", "x":4.5, "y":1, "w":1 }, - { "matrix": [1, 5 ], "label":"KC_T", "x":5.5, "y":1, "w":1 }, - { "matrix": [1, 6 ], "label":"KC_Y", "x":6.5, "y":1, "w":1 }, - { "matrix": [1, 7 ], "label":"KC_U", "x":7.5, "y":1, "w":1 }, - { "matrix": [1, 8 ], "label":"KC_I", "x":8.5, "y":1, "w":1 }, - { "matrix": [1, 9 ], "label":"KC_O", "x":9.5, "y":1, "w":1 }, - { "matrix": [1, 10], "label":"KC_P", "x":10.5, "y":1, "w":1 }, - { "matrix": [1, 11], "label":"KC_LEFT_BRACKET", "x":11.5, "y":1, "w":1 }, - { "matrix": [1, 12], "label":"KC_RIGHT_BRACKET", "x":12.5, "y":1, "w":1 }, - { "matrix": [1, 13], "label":"KC_BACKSLASH", "x":13.5, "y":1, "w":1.5 }, - { "matrix": [1, 15], "label":"KC_PGUP", "x":15, "y":1, "w":1 }, - - { "matrix": [2, 0 ], "label":"KC_CAPS", "x":0, "y":2, "w":1.75 }, - { "matrix": [2, 1 ], "label":"KC_A", "x":1.75, "y":2, "w":1 }, - { "matrix": [2, 2 ], "label":"KC_S", "x":2.75, "y":2, "w":1 }, - { "matrix": [2, 3 ], "label":"KC_D", "x":3.75, "y":2, "w":1 }, - { "matrix": [2, 4 ], "label":"KC_F", "x":4.75, "y":2, "w":1 }, - { "matrix": [2, 5 ], "label":"KC_G", "x":5.75, "y":2, "w":1 }, - { "matrix": [2, 6 ], "label":"KC_H", "x":6.75, "y":2, "w":1 }, - { "matrix": [2, 7 ], "label":"KC_J", "x":7.75, "y":2, "w":1 }, - { "matrix": [2, 8 ], "label":"KC_K", "x":8.75, "y":2, "w":1 }, - { "matrix": [2, 9 ], "label":"KC_L", "x":9.75, "y":2, "w":1 }, - { "matrix": [2, 10], "label":"KC_SCLN", "x":10.75, "y":2, "w":1 }, - { "matrix": [2, 11], "label":"KC_QUOT", "x":11.75, "y":2, "w":1 }, - { "matrix": [2, 12], "label":"KC_ENTER", "x":12.75, "y":2, "w":2.25 }, - { "matrix": [2, 15], "label":"KC_PGDN", "x":15, "y":2, "w":1 }, - - { "matrix": [3, 0 ], "label":"KC_LSFT", "x":0, "y":3, "w":2.25 }, - { "matrix": [3, 1 ], "label":"KC_Z", "x":2.25, "y":3, "w":1 }, - { "matrix": [3, 2 ], "label":"KC_X", "x":3.25, "y":3, "w":1 }, - { "matrix": [3, 3 ], "label":"KC_C", "x":4.25, "y":3, "w":1 }, - { "matrix": [3, 4 ], "label":"KC_V", "x":5.25, "y":3, "w":1 }, - { "matrix": [3, 5 ], "label":"KC_B", "x":6.25, "y":3, "w":1 }, - { "matrix": [3, 6 ], "label":"KC_N", "x":7.25, "y":3, "w":1 }, - { "matrix": [3, 7 ], "label":"KC_M", "x":8.25, "y":3, "w":1 }, - { "matrix": [3, 8 ], "label":"KC_COMM", "x":9.25, "y":3, "w":1 }, - { "matrix": [3, 9 ], "label":"KC_DOT", "x":10.25, "y":3, "w":1 }, - { "matrix": [3, 10], "label":"KC_SLSH", "x":11.25, "y":3, "w":1 }, - { "matrix": [3, 11], "label":"KC_RSFT", "x":12.25, "y":3, "w":1.75 }, - { "matrix": [3, 14], "label":"KC_UP", "x":14, "y":3, "w":1 }, - { "matrix": [3, 15], "label":"KC_END", "x":15, "y":3, "w":1 }, - - { "matrix": [4, 0 ], "label":"KC_LCTL", "x":0, "y":4, "w":1.25 }, - { "matrix": [4, 1 ], "label":"KC_LGUI", "x":1.25, "y":4, "w":1.25 }, - { "matrix": [4, 2 ], "label":"KC_LALT", "x":2.5, "y":4, "w":1.25 }, - { "matrix": [4, 5 ], "label":"KC_SPC", "x":3.75, "y":4, "w":6.25 }, - { "matrix": [4, 9 ], "label":"KC_RALT", "x":10, "y":4, "w":1.25 }, - { "matrix": [4, 10], "label":"_FN", "x":11.25, "y":4, "w":1.25 }, - { "matrix": [4, 13], "label":"KC_LEFT", "x":13, "y":4, "w":1 }, - { "matrix": [4, 14], "label":"KC_DOWN", "x":14, "y":4, "w":1 }, - { "matrix": [4, 15], "label":"KC_RGHT", "x":15, "y":4, "w":1 } + {"label": "KC_ESC", "matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"label": "KC_1", "matrix": [0, 1], "x": 1, "y": 0, "w": 1}, + {"label": "KC_2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1}, + {"label": "KC_3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1}, + {"label": "KC_4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1}, + {"label": "KC_5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1}, + {"label": "KC_6", "matrix": [0, 6], "x": 6, "y": 0, "w": 1}, + {"label": "KC_7", "matrix": [0, 7], "x": 7, "y": 0, "w": 1}, + {"label": "KC_8", "matrix": [0, 8], "x": 8, "y": 0, "w": 1}, + {"label": "KC_9", "matrix": [0, 9], "x": 9, "y": 0, "w": 1}, + {"label": "KC_0", "matrix": [0, 10], "x": 10, "y": 0, "w": 1}, + {"label": "KC_MINUS", "matrix": [0, 11], "x": 11, "y": 0, "w": 1}, + {"label": "KC_EQUAL", "matrix": [0, 12], "x": 12, "y": 0, "w": 1}, + {"label": "KC_BSPC", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "KC_HOME", "matrix": [0, 15], "x": 15, "y": 0, "w": 1}, + {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1}, + {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1}, + {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1, "w": 1}, + {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1}, + {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1, "w": 1}, + {"label": "KC_Y", "matrix": [1, 6], "x": 6.5, "y": 1, "w": 1}, + {"label": "KC_U", "matrix": [1, 7], "x": 7.5, "y": 1, "w": 1}, + {"label": "KC_I", "matrix": [1, 8], "x": 8.5, "y": 1, "w": 1}, + {"label": "KC_O", "matrix": [1, 9], "x": 9.5, "y": 1, "w": 1}, + {"label": "KC_P", "matrix": [1, 10], "x": 10.5, "y": 1, "w": 1}, + {"label": "KC_LEFT_BRACKET", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1}, + {"label": "KC_RIGHT_BRACKET", "matrix": [1, 12], "x": 12.5, "y": 1, "w": 1}, + {"label": "KC_BACKSLASH", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "KC_PGUP", "matrix": [1, 15], "x": 15, "y": 1, "w": 1}, + {"label": "KC_CAPS", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "KC_A", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1}, + {"label": "KC_S", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1}, + {"label": "KC_D", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1}, + {"label": "KC_F", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1}, + {"label": "KC_G", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1}, + {"label": "KC_H", "matrix": [2, 6], "x": 6.75, "y": 2, "w": 1}, + {"label": "KC_J", "matrix": [2, 7], "x": 7.75, "y": 2, "w": 1}, + {"label": "KC_K", "matrix": [2, 8], "x": 8.75, "y": 2, "w": 1}, + {"label": "KC_L", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1}, + {"label": "KC_SCLN", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1}, + {"label": "KC_QUOT", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1}, + {"label": "KC_ENTER", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "KC_PGDN", "matrix": [2, 15], "x": 15, "y": 2, "w": 1}, + {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "KC_Z", "matrix": [3, 1], "x": 2.25, "y": 3, "w": 1}, + {"label": "KC_X", "matrix": [3, 2], "x": 3.25, "y": 3, "w": 1}, + {"label": "KC_C", "matrix": [3, 3], "x": 4.25, "y": 3, "w": 1}, + {"label": "KC_V", "matrix": [3, 4], "x": 5.25, "y": 3, "w": 1}, + {"label": "KC_B", "matrix": [3, 5], "x": 6.25, "y": 3, "w": 1}, + {"label": "KC_N", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1}, + {"label": "KC_M", "matrix": [3, 7], "x": 8.25, "y": 3, "w": 1}, + {"label": "KC_COMM", "matrix": [3, 8], "x": 9.25, "y": 3, "w": 1}, + {"label": "KC_DOT", "matrix": [3, 9], "x": 10.25, "y": 3, "w": 1}, + {"label": "KC_SLSH", "matrix": [3, 10], "x": 11.25, "y": 3, "w": 1}, + {"label": "KC_RSFT", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "KC_UP", "matrix": [3, 14], "x": 14, "y": 3, "w": 1}, + {"label": "KC_END", "matrix": [3, 15], "x": 15, "y": 3, "w": 1}, + {"label": "KC_LCTL", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "KC_LGUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "KC_LALT", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "KC_SPC", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "KC_RALT", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"label": "_FN", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "KC_LEFT", "matrix": [4, 13], "x": 13, "y": 4, "w": 1}, + {"label": "KC_DOWN", "matrix": [4, 14], "x": 14, "y": 4, "w": 1}, + {"label": "KC_RGHT", "matrix": [4, 15], "x": 15, "y": 4, "w": 1} ] } - }, - "rgb_matrix": { - "layout": [ - {"flags": 255, "x": 0, "y": 0, "matrix": [ 0, 0 ] }, - {"flags": 255, "x": 15, "y": 0, "matrix": [ 0, 1 ] }, - {"flags": 255, "x": 30, "y": 0, "matrix": [ 0, 2 ] }, - {"flags": 255, "x": 45, "y": 0, "matrix": [ 0, 3 ] }, - {"flags": 255, "x": 60, "y": 0, "matrix": [ 0, 4 ] }, - {"flags": 255, "x": 75, "y": 0, "matrix": [ 0, 5 ] }, - {"flags": 255, "x": 89, "y": 0, "matrix": [ 0, 6 ] }, - {"flags": 255, "x": 104, "y": 0, "matrix": [ 0, 7 ] }, - {"flags": 255, "x": 119, "y": 0, "matrix": [ 0, 8 ] }, - {"flags": 255, "x": 134, "y": 0, "matrix": [ 0, 9 ] }, - {"flags": 255, "x": 149, "y": 0, "matrix": [ 0, 10 ] }, - {"flags": 255, "x": 164, "y": 0, "matrix": [ 0, 11 ] }, - {"flags": 255, "x": 179, "y": 0, "matrix": [ 0, 12 ] }, - {"flags": 255, "x": 201, "y": 0, "matrix": [ 0, 13 ] }, - {"flags": 255, "x": 224, "y": 0, "matrix": [ 0, 15 ] }, - - {"flags": 255, "x": 224, "y": 16, "matrix": [ 1, 15 ] }, - {"flags": 255, "x": 205, "y": 16, "matrix": [ 1, 13 ] }, - {"flags": 255, "x": 187, "y": 16, "matrix": [ 1, 12 ] }, - {"flags": 255, "x": 172, "y": 16, "matrix": [ 1, 11 ] }, - {"flags": 255, "x": 157, "y": 16, "matrix": [ 1, 10 ] }, - {"flags": 255, "x": 142, "y": 16, "matrix": [ 1, 9 ] }, - {"flags": 255, "x": 127, "y": 16, "matrix": [ 1, 8 ] }, - {"flags": 255, "x": 112, "y": 16, "matrix": [ 1, 7 ] }, - {"flags": 255, "x": 97, "y": 16, "matrix": [ 1, 6 ] }, - {"flags": 255, "x": 82, "y": 16, "matrix": [ 1, 5 ] }, - {"flags": 255, "x": 67, "y": 16, "matrix": [ 1, 4 ] }, - {"flags": 255, "x": 52, "y": 16, "matrix": [ 1, 3 ] }, - {"flags": 255, "x": 37, "y": 16, "matrix": [ 1, 2 ] }, - {"flags": 255, "x": 23, "y": 16, "matrix": [ 1, 1 ] }, - {"flags": 255, "x": 4, "y": 16, "matrix": [ 1, 0 ] }, - - {"flags": 255, "x": 6, "y": 32, "matrix": [ 2, 0 ] }, - {"flags": 255, "x": 26, "y": 32, "matrix": [ 2, 1 ] }, - {"flags": 255, "x": 41, "y": 32, "matrix": [ 2, 2 ] }, - {"flags": 255, "x": 56, "y": 32, "matrix": [ 2, 3 ] }, - {"flags": 255, "x": 71, "y": 32, "matrix": [ 2, 4 ] }, - {"flags": 255, "x": 86, "y": 32, "matrix": [ 2, 5 ] }, - {"flags": 255, "x": 101, "y": 32, "matrix": [ 2, 6 ] }, - {"flags": 255, "x": 116, "y": 32, "matrix": [ 2, 7 ] }, - {"flags": 255, "x": 131, "y": 32, "matrix": [ 2, 8 ] }, - {"flags": 255, "x": 145, "y": 32, "matrix": [ 2, 9 ] }, - {"flags": 255, "x": 160, "y": 32, "matrix": [ 2, 10 ] }, - {"flags": 255, "x": 175, "y": 32, "matrix": [ 2, 11 ] }, - {"flags": 255, "x": 200, "y": 32, "matrix": [ 2, 12 ] }, - {"flags": 255, "x": 224, "y": 32, "matrix": [ 2, 15 ] }, - - {"flags": 255, "x": 224, "y": 48, "matrix": [ 3, 15 ] }, - {"flags": 255, "x": 209, "y": 48, "matrix": [ 3, 14 ] }, - {"flags": 255, "x": 188, "y": 48, "matrix": [ 3, 11 ] }, - {"flags": 255, "x": 168, "y": 48, "matrix": [ 3, 10 ] }, - {"flags": 255, "x": 153, "y": 48, "matrix": [ 3, 9 ] }, - {"flags": 255, "x": 138, "y": 48, "matrix": [ 3, 8 ] }, - {"flags": 255, "x": 123, "y": 48, "matrix": [ 3, 7 ] }, - {"flags": 255, "x": 108, "y": 48, "matrix": [ 3, 6 ] }, - {"flags": 255, "x": 93, "y": 48, "matrix": [ 3, 5 ] }, - {"flags": 255, "x": 78, "y": 48, "matrix": [ 3, 4 ] }, - {"flags": 255, "x": 63, "y": 48, "matrix": [ 3, 3 ] }, - {"flags": 255, "x": 49, "y": 48, "matrix": [ 3, 2 ] }, - {"flags": 255, "x": 34, "y": 48, "matrix": [ 3, 1 ] }, - {"flags": 255, "x": 9, "y": 48, "matrix": [ 3, 0 ] }, - - {"flags": 255, "x": 2, "y": 64, "matrix": [ 4, 0 ] }, - {"flags": 255, "x": 20, "y": 64, "matrix": [ 4, 1 ] }, - {"flags": 255, "x": 39, "y": 64, "matrix": [ 4, 2 ] }, - {"flags": 255, "x": 95, "y": 64, "matrix": [ 4, 5 ] }, - {"flags": 255, "x": 151, "y": 64, "matrix": [ 4, 9 ] }, - {"flags": 255, "x": 170, "y": 64, "matrix": [ 4, 10 ] }, - {"flags": 255, "x": 194, "y": 64, "matrix": [ 4, 13 ] }, - {"flags": 255, "x": 209, "y": 64, "matrix": [ 4, 14 ] }, - {"flags": 255, "x": 224, "y": 64, "matrix": [ 4, 15 ] } - ], - "driver": "ws2812", - "max_brightness": 128, - "animations": { - "alphas_mods": true, - "gradient_up_down": true, - "gradient_left_right": true, - "breathing": true, - "band_sat": true, - "band_val": true, - "band_pinwheel_sat": true, - "band_pinwheel_val": true, - "band_spiral_sat": true, - "band_spiral_val": true, - "cycle_all": true, - "cycle_left_right": true, - "cycle_up_down": true, - "rainbow_moving_chevron": true, - "cycle_out_in": true, - "cycle_out_in_dual": true, - "cycle_pinwheel": true, - "cycle_spiral": true, - "dual_beacon": true, - "rainbow_beacon": true, - "rainbow_pinwheels": true, - "raindrops": true, - "jellybean_raindrops": true, - "hue_breathing": true, - "hue_pendulum": true, - "hue_wave": true, - "pixel_rain": true, - "pixel_flow": true, - "pixel_fractal": true, - "typing_heatmap": true, - "digital_rain": true, - "solid_reactive_simple": true, - "solid_reactive": true, - "solid_reactive_wide": true, - "solid_reactive_multiwide": true, - "solid_reactive_cross": true, - "solid_reactive_multicross": true, - "solid_reactive_nexus": true, - "solid_reactive_multinexus": true, - "splash": true, - "multisplash": true, - "solid_splash": true, - "solid_multisplash": true - }, - "default": { - "val": 128 - } - }, - "ws2812": { - "driver": "vendor", - "pin": "GP19" } } diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c index 15d34133425..c35e995897f 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c @@ -34,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { NK_TOGG, RGB_TOG, RGB_VAI, KC_NO, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_TRNS, - KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_MPRV, KC_VOLD, KC_MNXT + KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ) }; diff --git a/keyboards/mechanicalkeyboards/point65/info.json b/keyboards/mechanicalkeyboards/point65/info.json new file mode 100644 index 00000000000..b0bbfde04db --- /dev/null +++ b/keyboards/mechanicalkeyboards/point65/info.json @@ -0,0 +1,80 @@ +{ + "manufacturer": "Mechanical Keyboards", + "maintainer": "C44Supra", + "bootloader": "rp2040", + "diode_direction": "COL2ROW", + "features": { + "bootmagic": true, + "extrakey": true, + "nkro": true, + "rgb_matrix": true + }, + "matrix_pins": { + "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], + "rows": ["GP24", "GP22", "GP21", "GP19", "GP25"] + }, + "processor": "RP2040", + "rgb_matrix": { + "animations": { + "alphas_mods": true, + "band_pinwheel_sat": true, + "band_pinwheel_val": true, + "band_sat": true, + "band_spiral_sat": true, + "band_spiral_val": true, + "band_val": true, + "breathing": true, + "cycle_all": true, + "cycle_left_right": true, + "cycle_out_in": true, + "cycle_out_in_dual": true, + "cycle_pinwheel": true, + "cycle_spiral": true, + "cycle_up_down": true, + "digital_rain": true, + "dual_beacon": true, + "gradient_left_right": true, + "gradient_up_down": true, + "hue_breathing": true, + "hue_pendulum": true, + "hue_wave": true, + "jellybean_raindrops": true, + "multisplash": true, + "pixel_flow": true, + "pixel_fractal": true, + "pixel_rain": true, + "rainbow_beacon": true, + "rainbow_moving_chevron": true, + "rainbow_pinwheels": true, + "raindrops": true, + "solid_multisplash": true, + "solid_reactive": true, + "solid_reactive_cross": true, + "solid_reactive_multicross": true, + "solid_reactive_multinexus": true, + "solid_reactive_multiwide": true, + "solid_reactive_nexus": true, + "solid_reactive_simple": true, + "solid_reactive_wide": true, + "solid_splash": true, + "splash": true, + "typing_heatmap": true + }, + "default": { + "val": 128 + }, + "driver": "ws2812", + "layout": [ + {"matrix": [0, 0], "x": 0, "y": 0, "flags": 255}, + {"matrix": [2, 0], "x": 0, "y": 32, "flags": 255} + ], + "max_brightness": 128 + }, + "usb": { + "device_version": "1.0.0", + "vid": "0x4242" + }, + "ws2812": { + "driver": "vendor" + } +} From 40e888f2fd22aaadfc708b74aa0049208c3ef3a0 Mon Sep 17 00:00:00 2001 From: Sebastiaan Swinkels Date: Fri, 20 Jun 2025 22:24:46 +0200 Subject: [PATCH 05/11] Updated RGB Matrix keycodes in hotswap_rgb keyboard default keymap --- .../point65/hotswap_rgb/keymaps/default/keymap.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c index c35e995897f..b661e7e5055 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keymaps/default/keymap.c @@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FUNCTION] = LAYOUT_65_ansi_blocker( 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_NO, - NK_TOGG, RGB_TOG, RGB_VAI, KC_NO, RGB_HUI, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, RGB_RMOD, RGB_VAD, RGB_MOD, RGB_HUD, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + NK_TOGG, RM_TOGG, RM_VALU, KC_NO, RM_HUEU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, RM_PREV, RM_VALD, RM_NEXT, RM_HUED, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ) From 34f393eb43d0e735c096976d83914562fa1f0fc2 Mon Sep 17 00:00:00 2001 From: Sebastiaan Swinkels Date: Fri, 20 Jun 2025 23:51:30 +0200 Subject: [PATCH 06/11] info.json and keyboard.json updates - moved matrix_pins definitions back into individual keyboard.json files - removed rgb matrix from info.json Moving matrix_pins definition to info.json renders the rgb matrix of hotswap_rgb inoperable, even though the definitions themselves are identical. --- .../mechanicalkeyboards/point65/hotswap/keyboard.json | 4 ++++ .../mechanicalkeyboards/point65/hotswap_rgb/keyboard.json | 4 ++++ keyboards/mechanicalkeyboards/point65/info.json | 8 -------- 3 files changed, 8 insertions(+), 8 deletions(-) diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json index 610b0323ea7..c7064f0d40f 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json @@ -1,5 +1,9 @@ { "keyboard_name": "Point 65 Hotswap", + "matrix_pins": { + "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], + "rows": ["GP24", "GP22", "GP21", "GP19", "GP25"] + }, "rgb_matrix": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 255}, diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json index ef013a21ebb..d3689db2d7e 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json @@ -1,5 +1,9 @@ { "keyboard_name": "Point 65 Hotswap RGB", + "matrix_pins": { + "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], + "rows": ["GP24", "GP23", "GP22", "GP21", "GP25"] + }, "rgb_matrix": { "layout": [ {"matrix": [0, 0], "x": 0, "y": 0, "flags": 255}, diff --git a/keyboards/mechanicalkeyboards/point65/info.json b/keyboards/mechanicalkeyboards/point65/info.json index b0bbfde04db..1100d10dbfd 100644 --- a/keyboards/mechanicalkeyboards/point65/info.json +++ b/keyboards/mechanicalkeyboards/point65/info.json @@ -9,10 +9,6 @@ "nkro": true, "rgb_matrix": true }, - "matrix_pins": { - "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], - "rows": ["GP24", "GP22", "GP21", "GP19", "GP25"] - }, "processor": "RP2040", "rgb_matrix": { "animations": { @@ -64,10 +60,6 @@ "val": 128 }, "driver": "ws2812", - "layout": [ - {"matrix": [0, 0], "x": 0, "y": 0, "flags": 255}, - {"matrix": [2, 0], "x": 0, "y": 32, "flags": 255} - ], "max_brightness": 128 }, "usb": { From 1d2ea13f92818787a71b73565ca61bb36e4b437e Mon Sep 17 00:00:00 2001 From: Sebastiaan Swinkels Date: Sat, 21 Jun 2025 17:09:31 +0200 Subject: [PATCH 07/11] Further file consolidations as requested --- .../point65/{hotswap => }/config.h | 0 .../point65/hotswap/keyboard.json | 74 +----------------- .../point65/hotswap_rgb/config.h | 25 ------ .../point65/hotswap_rgb/keyboard.json | 75 +----------------- .../mechanicalkeyboards/point65/info.json | 76 +++++++++++++++++++ 5 files changed, 78 insertions(+), 172 deletions(-) rename keyboards/mechanicalkeyboards/point65/{hotswap => }/config.h (100%) delete mode 100644 keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/config.h b/keyboards/mechanicalkeyboards/point65/config.h similarity index 100% rename from keyboards/mechanicalkeyboards/point65/hotswap/config.h rename to keyboards/mechanicalkeyboards/point65/config.h diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json index c7064f0d40f..3eb0237fb31 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keyboard.json @@ -1,7 +1,6 @@ { "keyboard_name": "Point 65 Hotswap", "matrix_pins": { - "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], "rows": ["GP24", "GP22", "GP21", "GP19", "GP25"] }, "rgb_matrix": { @@ -19,7 +18,7 @@ }, "community_layouts": ["65_ansi_blocker", "65_ansi_blocker_tsangan"], "layout_aliases": { - "LAYOUT_65_ansi_blocker": "LAYOUT_all" + "LAYOUT_all": "LAYOUT_65_ansi_blocker" }, "layouts": { "LAYOUT_65_ansi_blocker_tsangan": { @@ -91,77 +90,6 @@ {"label": "KC_DOWN", "matrix": [4, 14], "x": 14, "y": 4, "w": 1}, {"label": "KC_RGHT", "matrix": [4, 15], "x": 15, "y": 4, "w": 1} ] - }, - "LAYOUT_all": { - "layout": [ - {"label": "KC_ESC", "matrix": [0, 0], "x": 0, "y": 0, "w": 1}, - {"label": "KC_1", "matrix": [0, 1], "x": 1, "y": 0, "w": 1}, - {"label": "KC_2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1}, - {"label": "KC_3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1}, - {"label": "KC_4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1}, - {"label": "KC_5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1}, - {"label": "KC_6", "matrix": [0, 6], "x": 6, "y": 0, "w": 1}, - {"label": "KC_7", "matrix": [0, 7], "x": 7, "y": 0, "w": 1}, - {"label": "KC_8", "matrix": [0, 8], "x": 8, "y": 0, "w": 1}, - {"label": "KC_9", "matrix": [0, 9], "x": 9, "y": 0, "w": 1}, - {"label": "KC_0", "matrix": [0, 10], "x": 10, "y": 0, "w": 1}, - {"label": "KC_MINUS", "matrix": [0, 11], "x": 11, "y": 0, "w": 1}, - {"label": "KC_EQUAL", "matrix": [0, 12], "x": 12, "y": 0, "w": 1}, - {"label": "KC_BACKSPACE", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"label": "KC_HOME", "matrix": [0, 15], "x": 15, "y": 0, "w": 1}, - {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1}, - {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1}, - {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1, "w": 1}, - {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1}, - {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1, "w": 1}, - {"label": "KC_Y", "matrix": [1, 6], "x": 6.5, "y": 1, "w": 1}, - {"label": "KC_U", "matrix": [1, 7], "x": 7.5, "y": 1, "w": 1}, - {"label": "KC_I", "matrix": [1, 8], "x": 8.5, "y": 1, "w": 1}, - {"label": "KC_O", "matrix": [1, 9], "x": 9.5, "y": 1, "w": 1}, - {"label": "KC_P", "matrix": [1, 10], "x": 10.5, "y": 1, "w": 1}, - {"label": "KC_LEFT_BRACKET", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1}, - {"label": "KC_RIGHT_BRACKET", "matrix": [1, 12], "x": 12.5, "y": 1, "w": 1}, - {"label": "KC_BACKSLASH", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"label": "KC_PGUP", "matrix": [1, 15], "x": 15, "y": 1, "w": 1}, - {"label": "KC_CAPS", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"label": "KC_A", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1}, - {"label": "KC_S", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1}, - {"label": "KC_D", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1}, - {"label": "KC_F", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1}, - {"label": "KC_G", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1}, - {"label": "KC_H", "matrix": [2, 6], "x": 6.75, "y": 2, "w": 1}, - {"label": "KC_J", "matrix": [2, 7], "x": 7.75, "y": 2, "w": 1}, - {"label": "KC_K", "matrix": [2, 8], "x": 8.75, "y": 2, "w": 1}, - {"label": "KC_L", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1}, - {"label": "KC_SCLN", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1}, - {"label": "KC_QUOT", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1}, - {"label": "KC_ENTER", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, - {"label": "KC_PGDN", "matrix": [2, 15], "x": 15, "y": 2, "w": 1}, - {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"label": "KC_Z", "matrix": [3, 1], "x": 2.25, "y": 3, "w": 1}, - {"label": "KC_X", "matrix": [3, 2], "x": 3.25, "y": 3, "w": 1}, - {"label": "KC_C", "matrix": [3, 3], "x": 4.25, "y": 3, "w": 1}, - {"label": "KC_V", "matrix": [3, 4], "x": 5.25, "y": 3, "w": 1}, - {"label": "KC_B", "matrix": [3, 5], "x": 6.25, "y": 3, "w": 1}, - {"label": "KC_N", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1}, - {"label": "KC_M", "matrix": [3, 7], "x": 8.25, "y": 3, "w": 1}, - {"label": "KC_COMM", "matrix": [3, 8], "x": 9.25, "y": 3, "w": 1}, - {"label": "KC_DOT", "matrix": [3, 9], "x": 10.25, "y": 3, "w": 1}, - {"label": "KC_SLSH", "matrix": [3, 10], "x": 11.25, "y": 3, "w": 1}, - {"label": "KC_RSFT", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, - {"label": "KC_UP", "matrix": [3, 14], "x": 14, "y": 3, "w": 1}, - {"label": "KC_END", "matrix": [3, 15], "x": 15, "y": 3, "w": 1}, - {"label": "KC_LCTL", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"label": "KC_LGUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"label": "KC_LALT", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"label": "KC_SPC", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, - {"label": "KC_RALT", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"label": "_FN", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, - {"label": "KC_LEFT", "matrix": [4, 13], "x": 13, "y": 4, "w": 1}, - {"label": "KC_DOWN", "matrix": [4, 14], "x": 14, "y": 4, "w": 1}, - {"label": "KC_RGHT", "matrix": [4, 15], "x": 15, "y": 4, "w": 1} - ] } } } diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h deleted file mode 100644 index 102911dfda5..00000000000 --- a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/config.h +++ /dev/null @@ -1,25 +0,0 @@ -/* Copyright 2024 Sebastiaan Swinkels @ BeanBoards - * - * 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 . - */ - -#pragma once - -/* Double tap the side button to enter bootloader */ -#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET -#define RP2040_BOOTLOADER_DOUBLE_TAP_RESET_TIMEOUT 500U - -/* couple of defaults */ -#define RGB_INDICATOR_POS_OFFSET 48 /* Indicator LEDs additional brightness */ - diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json index d3689db2d7e..0a638b8e7ba 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json @@ -1,7 +1,6 @@ { "keyboard_name": "Point 65 Hotswap RGB", "matrix_pins": { - "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], "rows": ["GP24", "GP23", "GP22", "GP21", "GP25"] }, "rgb_matrix": { @@ -83,77 +82,5 @@ "pin": "GP19" }, "community_layouts": ["65_ansi_blocker"], - "layouts": { - "LAYOUT_65_ansi_blocker": { - "layout": [ - {"label": "KC_ESC", "matrix": [0, 0], "x": 0, "y": 0, "w": 1}, - {"label": "KC_1", "matrix": [0, 1], "x": 1, "y": 0, "w": 1}, - {"label": "KC_2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1}, - {"label": "KC_3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1}, - {"label": "KC_4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1}, - {"label": "KC_5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1}, - {"label": "KC_6", "matrix": [0, 6], "x": 6, "y": 0, "w": 1}, - {"label": "KC_7", "matrix": [0, 7], "x": 7, "y": 0, "w": 1}, - {"label": "KC_8", "matrix": [0, 8], "x": 8, "y": 0, "w": 1}, - {"label": "KC_9", "matrix": [0, 9], "x": 9, "y": 0, "w": 1}, - {"label": "KC_0", "matrix": [0, 10], "x": 10, "y": 0, "w": 1}, - {"label": "KC_MINUS", "matrix": [0, 11], "x": 11, "y": 0, "w": 1}, - {"label": "KC_EQUAL", "matrix": [0, 12], "x": 12, "y": 0, "w": 1}, - {"label": "KC_BSPC", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, - {"label": "KC_HOME", "matrix": [0, 15], "x": 15, "y": 0, "w": 1}, - {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, - {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1}, - {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1}, - {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1, "w": 1}, - {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1}, - {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1, "w": 1}, - {"label": "KC_Y", "matrix": [1, 6], "x": 6.5, "y": 1, "w": 1}, - {"label": "KC_U", "matrix": [1, 7], "x": 7.5, "y": 1, "w": 1}, - {"label": "KC_I", "matrix": [1, 8], "x": 8.5, "y": 1, "w": 1}, - {"label": "KC_O", "matrix": [1, 9], "x": 9.5, "y": 1, "w": 1}, - {"label": "KC_P", "matrix": [1, 10], "x": 10.5, "y": 1, "w": 1}, - {"label": "KC_LEFT_BRACKET", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1}, - {"label": "KC_RIGHT_BRACKET", "matrix": [1, 12], "x": 12.5, "y": 1, "w": 1}, - {"label": "KC_BACKSLASH", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, - {"label": "KC_PGUP", "matrix": [1, 15], "x": 15, "y": 1, "w": 1}, - {"label": "KC_CAPS", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, - {"label": "KC_A", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1}, - {"label": "KC_S", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1}, - {"label": "KC_D", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1}, - {"label": "KC_F", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1}, - {"label": "KC_G", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1}, - {"label": "KC_H", "matrix": [2, 6], "x": 6.75, "y": 2, "w": 1}, - {"label": "KC_J", "matrix": [2, 7], "x": 7.75, "y": 2, "w": 1}, - {"label": "KC_K", "matrix": [2, 8], "x": 8.75, "y": 2, "w": 1}, - {"label": "KC_L", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1}, - {"label": "KC_SCLN", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1}, - {"label": "KC_QUOT", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1}, - {"label": "KC_ENTER", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, - {"label": "KC_PGDN", "matrix": [2, 15], "x": 15, "y": 2, "w": 1}, - {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, - {"label": "KC_Z", "matrix": [3, 1], "x": 2.25, "y": 3, "w": 1}, - {"label": "KC_X", "matrix": [3, 2], "x": 3.25, "y": 3, "w": 1}, - {"label": "KC_C", "matrix": [3, 3], "x": 4.25, "y": 3, "w": 1}, - {"label": "KC_V", "matrix": [3, 4], "x": 5.25, "y": 3, "w": 1}, - {"label": "KC_B", "matrix": [3, 5], "x": 6.25, "y": 3, "w": 1}, - {"label": "KC_N", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1}, - {"label": "KC_M", "matrix": [3, 7], "x": 8.25, "y": 3, "w": 1}, - {"label": "KC_COMM", "matrix": [3, 8], "x": 9.25, "y": 3, "w": 1}, - {"label": "KC_DOT", "matrix": [3, 9], "x": 10.25, "y": 3, "w": 1}, - {"label": "KC_SLSH", "matrix": [3, 10], "x": 11.25, "y": 3, "w": 1}, - {"label": "KC_RSFT", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, - {"label": "KC_UP", "matrix": [3, 14], "x": 14, "y": 3, "w": 1}, - {"label": "KC_END", "matrix": [3, 15], "x": 15, "y": 3, "w": 1}, - {"label": "KC_LCTL", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, - {"label": "KC_LGUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, - {"label": "KC_LALT", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, - {"label": "KC_SPC", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, - {"label": "KC_RALT", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, - {"label": "_FN", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, - {"label": "KC_LEFT", "matrix": [4, 13], "x": 13, "y": 4, "w": 1}, - {"label": "KC_DOWN", "matrix": [4, 14], "x": 14, "y": 4, "w": 1}, - {"label": "KC_RGHT", "matrix": [4, 15], "x": 15, "y": 4, "w": 1} - ] - } - } + } diff --git a/keyboards/mechanicalkeyboards/point65/info.json b/keyboards/mechanicalkeyboards/point65/info.json index 1100d10dbfd..bae20512dd6 100644 --- a/keyboards/mechanicalkeyboards/point65/info.json +++ b/keyboards/mechanicalkeyboards/point65/info.json @@ -9,6 +9,9 @@ "nkro": true, "rgb_matrix": true }, + "matrix_pins": { + "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], + }, "processor": "RP2040", "rgb_matrix": { "animations": { @@ -68,5 +71,78 @@ }, "ws2812": { "driver": "vendor" + }, + "layouts": { + "LAYOUT_65_ansi_blocker": { + "layout": [ + {"label": "KC_ESC", "matrix": [0, 0], "x": 0, "y": 0, "w": 1}, + {"label": "KC_1", "matrix": [0, 1], "x": 1, "y": 0, "w": 1}, + {"label": "KC_2", "matrix": [0, 2], "x": 2, "y": 0, "w": 1}, + {"label": "KC_3", "matrix": [0, 3], "x": 3, "y": 0, "w": 1}, + {"label": "KC_4", "matrix": [0, 4], "x": 4, "y": 0, "w": 1}, + {"label": "KC_5", "matrix": [0, 5], "x": 5, "y": 0, "w": 1}, + {"label": "KC_6", "matrix": [0, 6], "x": 6, "y": 0, "w": 1}, + {"label": "KC_7", "matrix": [0, 7], "x": 7, "y": 0, "w": 1}, + {"label": "KC_8", "matrix": [0, 8], "x": 8, "y": 0, "w": 1}, + {"label": "KC_9", "matrix": [0, 9], "x": 9, "y": 0, "w": 1}, + {"label": "KC_0", "matrix": [0, 10], "x": 10, "y": 0, "w": 1}, + {"label": "KC_MINUS", "matrix": [0, 11], "x": 11, "y": 0, "w": 1}, + {"label": "KC_EQUAL", "matrix": [0, 12], "x": 12, "y": 0, "w": 1}, + {"label": "KC_BSPC", "matrix": [0, 13], "x": 13, "y": 0, "w": 2}, + {"label": "KC_HOME", "matrix": [0, 15], "x": 15, "y": 0, "w": 1}, + {"label": "KC_TAB", "matrix": [1, 0], "x": 0, "y": 1, "w": 1.5}, + {"label": "KC_Q", "matrix": [1, 1], "x": 1.5, "y": 1, "w": 1}, + {"label": "KC_W", "matrix": [1, 2], "x": 2.5, "y": 1, "w": 1}, + {"label": "KC_E", "matrix": [1, 3], "x": 3.5, "y": 1, "w": 1}, + {"label": "KC_R", "matrix": [1, 4], "x": 4.5, "y": 1, "w": 1}, + {"label": "KC_T", "matrix": [1, 5], "x": 5.5, "y": 1, "w": 1}, + {"label": "KC_Y", "matrix": [1, 6], "x": 6.5, "y": 1, "w": 1}, + {"label": "KC_U", "matrix": [1, 7], "x": 7.5, "y": 1, "w": 1}, + {"label": "KC_I", "matrix": [1, 8], "x": 8.5, "y": 1, "w": 1}, + {"label": "KC_O", "matrix": [1, 9], "x": 9.5, "y": 1, "w": 1}, + {"label": "KC_P", "matrix": [1, 10], "x": 10.5, "y": 1, "w": 1}, + {"label": "KC_LEFT_BRACKET", "matrix": [1, 11], "x": 11.5, "y": 1, "w": 1}, + {"label": "KC_RIGHT_BRACKET", "matrix": [1, 12], "x": 12.5, "y": 1, "w": 1}, + {"label": "KC_BACKSLASH", "matrix": [1, 13], "x": 13.5, "y": 1, "w": 1.5}, + {"label": "KC_PGUP", "matrix": [1, 15], "x": 15, "y": 1, "w": 1}, + {"label": "KC_CAPS", "matrix": [2, 0], "x": 0, "y": 2, "w": 1.75}, + {"label": "KC_A", "matrix": [2, 1], "x": 1.75, "y": 2, "w": 1}, + {"label": "KC_S", "matrix": [2, 2], "x": 2.75, "y": 2, "w": 1}, + {"label": "KC_D", "matrix": [2, 3], "x": 3.75, "y": 2, "w": 1}, + {"label": "KC_F", "matrix": [2, 4], "x": 4.75, "y": 2, "w": 1}, + {"label": "KC_G", "matrix": [2, 5], "x": 5.75, "y": 2, "w": 1}, + {"label": "KC_H", "matrix": [2, 6], "x": 6.75, "y": 2, "w": 1}, + {"label": "KC_J", "matrix": [2, 7], "x": 7.75, "y": 2, "w": 1}, + {"label": "KC_K", "matrix": [2, 8], "x": 8.75, "y": 2, "w": 1}, + {"label": "KC_L", "matrix": [2, 9], "x": 9.75, "y": 2, "w": 1}, + {"label": "KC_SCLN", "matrix": [2, 10], "x": 10.75, "y": 2, "w": 1}, + {"label": "KC_QUOT", "matrix": [2, 11], "x": 11.75, "y": 2, "w": 1}, + {"label": "KC_ENTER", "matrix": [2, 12], "x": 12.75, "y": 2, "w": 2.25}, + {"label": "KC_PGDN", "matrix": [2, 15], "x": 15, "y": 2, "w": 1}, + {"label": "KC_LSFT", "matrix": [3, 0], "x": 0, "y": 3, "w": 2.25}, + {"label": "KC_Z", "matrix": [3, 1], "x": 2.25, "y": 3, "w": 1}, + {"label": "KC_X", "matrix": [3, 2], "x": 3.25, "y": 3, "w": 1}, + {"label": "KC_C", "matrix": [3, 3], "x": 4.25, "y": 3, "w": 1}, + {"label": "KC_V", "matrix": [3, 4], "x": 5.25, "y": 3, "w": 1}, + {"label": "KC_B", "matrix": [3, 5], "x": 6.25, "y": 3, "w": 1}, + {"label": "KC_N", "matrix": [3, 6], "x": 7.25, "y": 3, "w": 1}, + {"label": "KC_M", "matrix": [3, 7], "x": 8.25, "y": 3, "w": 1}, + {"label": "KC_COMM", "matrix": [3, 8], "x": 9.25, "y": 3, "w": 1}, + {"label": "KC_DOT", "matrix": [3, 9], "x": 10.25, "y": 3, "w": 1}, + {"label": "KC_SLSH", "matrix": [3, 10], "x": 11.25, "y": 3, "w": 1}, + {"label": "KC_RSFT", "matrix": [3, 11], "x": 12.25, "y": 3, "w": 1.75}, + {"label": "KC_UP", "matrix": [3, 14], "x": 14, "y": 3, "w": 1}, + {"label": "KC_END", "matrix": [3, 15], "x": 15, "y": 3, "w": 1}, + {"label": "KC_LCTL", "matrix": [4, 0], "x": 0, "y": 4, "w": 1.25}, + {"label": "KC_LGUI", "matrix": [4, 1], "x": 1.25, "y": 4, "w": 1.25}, + {"label": "KC_LALT", "matrix": [4, 2], "x": 2.5, "y": 4, "w": 1.25}, + {"label": "KC_SPC", "matrix": [4, 5], "x": 3.75, "y": 4, "w": 6.25}, + {"label": "KC_RALT", "matrix": [4, 9], "x": 10, "y": 4, "w": 1.25}, + {"label": "_FN", "matrix": [4, 10], "x": 11.25, "y": 4, "w": 1.25}, + {"label": "KC_LEFT", "matrix": [4, 13], "x": 13, "y": 4, "w": 1}, + {"label": "KC_DOWN", "matrix": [4, 14], "x": 14, "y": 4, "w": 1}, + {"label": "KC_RGHT", "matrix": [4, 15], "x": 15, "y": 4, "w": 1} + ] + } } } From 5f4ab7beb8ad914ba6cbe0baa15db490b80cb89b Mon Sep 17 00:00:00 2001 From: Sebastiaan Swinkels Date: Sat, 21 Jun 2025 17:13:00 +0200 Subject: [PATCH 08/11] json re-formatted w/ format-json --- .../mechanicalkeyboards/point65/hotswap_rgb/keyboard.json | 3 +-- keyboards/mechanicalkeyboards/point65/info.json | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json index 0a638b8e7ba..55f206fe125 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json +++ b/keyboards/mechanicalkeyboards/point65/hotswap_rgb/keyboard.json @@ -81,6 +81,5 @@ "ws2812": { "pin": "GP19" }, - "community_layouts": ["65_ansi_blocker"], - + "community_layouts": ["65_ansi_blocker"] } diff --git a/keyboards/mechanicalkeyboards/point65/info.json b/keyboards/mechanicalkeyboards/point65/info.json index bae20512dd6..d9c1a56b1ce 100644 --- a/keyboards/mechanicalkeyboards/point65/info.json +++ b/keyboards/mechanicalkeyboards/point65/info.json @@ -10,7 +10,7 @@ "rgb_matrix": true }, "matrix_pins": { - "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"], + "cols": ["GP28", "GP27", "GP26", "GP29", "GP0", "GP11", "GP10", "GP9", "GP8", "GP7", "GP6", "GP5", "GP4", "GP3", "GP2", "GP1"] }, "processor": "RP2040", "rgb_matrix": { From f76d088497fd331a0318a5110d80ca16be3c5948 Mon Sep 17 00:00:00 2001 From: Sebastiaan Swinkels Date: Fri, 4 Jul 2025 18:25:16 +0200 Subject: [PATCH 09/11] Added RGB Matrix controls to Hotswap keymaps as requested --- .../point65/hotswap/keymaps/default/keymap.c | 4 ++-- .../point65/hotswap/keymaps/default_7u/keymap.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c index ab0ac1aeebc..ad763457332 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default/keymap.c @@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FUNCTION] = 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_NO, - NK_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + NK_TOGG, RM_TOGG, RM_VALU, KC_NO, RM_HUEU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, RM_PREV, RM_VALD, RM_NEXT, RM_HUED, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ) diff --git a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c index ceb3cd1993b..7349f6e6418 100644 --- a/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c +++ b/keyboards/mechanicalkeyboards/point65/hotswap/keymaps/default_7u/keymap.c @@ -31,8 +31,8 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { ), [_FUNCTION] = LAYOUT_65_ansi_blocker_tsangan( 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_NO, - NK_TOGG, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, - KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + NK_TOGG, RM_TOGG, RM_VALU, KC_NO, RM_HUEU, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, + KC_NO, RM_PREV, RM_VALD, RM_NEXT, RM_HUED, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_NO, KC_MUTE, KC_NO, KC_NO, KC_NO, KC_MPLY, KC_VOLU, KC_TRNS, KC_NO, KC_NO, KC_NO, KC_TRNS, KC_TRNS, KC_MPRV, KC_VOLD, KC_MNXT ) From d8149da4c389be30fc9c293c79b3f5f14d9fda93 Mon Sep 17 00:00:00 2001 From: Sebastiaan Swinkels Date: Tue, 15 Jul 2025 16:11:49 +0200 Subject: [PATCH 10/11] Removed default RGB brightness value setting, reformatted readme.md --- keyboards/mechanicalkeyboards/point65/info.json | 3 --- keyboards/mechanicalkeyboards/point65/readme.md | 2 -- 2 files changed, 5 deletions(-) diff --git a/keyboards/mechanicalkeyboards/point65/info.json b/keyboards/mechanicalkeyboards/point65/info.json index d9c1a56b1ce..bf94deeb797 100644 --- a/keyboards/mechanicalkeyboards/point65/info.json +++ b/keyboards/mechanicalkeyboards/point65/info.json @@ -59,9 +59,6 @@ "splash": true, "typing_heatmap": true }, - "default": { - "val": 128 - }, "driver": "ws2812", "max_brightness": 128 }, diff --git a/keyboards/mechanicalkeyboards/point65/readme.md b/keyboards/mechanicalkeyboards/point65/readme.md index ede74afe528..d49a9cd83c7 100644 --- a/keyboards/mechanicalkeyboards/point65/readme.md +++ b/keyboards/mechanicalkeyboards/point65/readme.md @@ -5,9 +5,7 @@ A 65% keyboard by [Mechanical Keyboards](https://mechanicalkeyboards.com) available as either multi layout hotswap, or hotswap with RGB per key backlight. > Keyboard Maintainer: [C44Supra](https://github.com/C44Supra) -> > Hardware Supported: MK Point65 hotswap, MK Point65 hotswap RGB -> > Hardware Availability: [MK Point65 Keyboard Kit](https://mechanicalkeyboards.com/products/mk-point65-keyboard-kit) ## Firmware building From 0200bd33e0e57b6f082bd1612e5ed69a84b58326 Mon Sep 17 00:00:00 2001 From: Sebastiaan Swinkels Date: Tue, 15 Jul 2025 16:42:12 +0200 Subject: [PATCH 11/11] fixed oversight in list --- keyboards/mechanicalkeyboards/point65/readme.md | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/keyboards/mechanicalkeyboards/point65/readme.md b/keyboards/mechanicalkeyboards/point65/readme.md index d49a9cd83c7..7a50f6793d1 100644 --- a/keyboards/mechanicalkeyboards/point65/readme.md +++ b/keyboards/mechanicalkeyboards/point65/readme.md @@ -4,9 +4,9 @@ ## Description A 65% keyboard by [Mechanical Keyboards](https://mechanicalkeyboards.com) available as either multi layout hotswap, or hotswap with RGB per key backlight. -> Keyboard Maintainer: [C44Supra](https://github.com/C44Supra) -> Hardware Supported: MK Point65 hotswap, MK Point65 hotswap RGB -> Hardware Availability: [MK Point65 Keyboard Kit](https://mechanicalkeyboards.com/products/mk-point65-keyboard-kit) +* Keyboard Maintainer: [C44Supra](https://github.com/C44Supra) +* Hardware Supported: MK Point65 hotswap, MK Point65 hotswap RGB +* Hardware Availability: [MK Point65 Keyboard Kit](https://mechanicalkeyboards.com/products/mk-point65-keyboard-kit) ## Firmware building **Hotswap with 6.25U layout:**