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:**