From 522048725f6b076bdad1251243c65dd2acf6595d Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 8 Apr 2023 18:08:08 +1000 Subject: Move `RGB_MATRIX_DRIVER` to data driven (#20350) --- keyboards/hfdkb/keyboard_sw/k83/info.json | 3 +++ keyboards/hfdkb/keyboard_sw/k83/rules.mk | 1 - 2 files changed, 3 insertions(+), 1 deletion(-) (limited to 'keyboards/hfdkb/keyboard_sw') diff --git a/keyboards/hfdkb/keyboard_sw/k83/info.json b/keyboards/hfdkb/keyboard_sw/k83/info.json index 6810aff30f..efdea0336c 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/info.json +++ b/keyboards/hfdkb/keyboard_sw/k83/info.json @@ -7,6 +7,9 @@ "pid": "0x0007", "device_version": "1.0.0" }, + "rgb_matrix": { + "driver": "IS31FL3733" + }, "processor": "WB32FQ95", "bootloader": "wb32-dfu", "matrix_pins": { diff --git a/keyboards/hfdkb/keyboard_sw/k83/rules.mk b/keyboards/hfdkb/keyboard_sw/k83/rules.mk index 176dd64c1c..756d0c0719 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/rules.mk +++ b/keyboards/hfdkb/keyboard_sw/k83/rules.mk @@ -14,7 +14,6 @@ AUDIO_ENABLE = no # Audio output DIP_SWITCH_ENABLE = yes # DPI Switch ENCODER_ENABLE = yes RGB_MATRIX_ENABLE = yes -RGB_MATRIX_DRIVER = IS31FL3733 EEPROM_DRIVER = wear_leveling WEAR_LEVELING_DRIVER = spi_flash #RGB_MATRIX_CUSTOM_USER = yes #Add turnoff LED -- cgit v1.2.3 From 5bd68e3695a82ff504c358c33445b4530c2a327f Mon Sep 17 00:00:00 2001 From: Ryan Date: Wed, 12 Apr 2023 13:42:51 +1000 Subject: Move single `LAYOUT`s to data driven (#20365) --- keyboards/hfdkb/keyboard_sw/k83/info.json | 175 ++++++++++++++++-------------- keyboards/hfdkb/keyboard_sw/k83/k83.c | 3 +- keyboards/hfdkb/keyboard_sw/k83/k83.h | 39 ------- 3 files changed, 94 insertions(+), 123 deletions(-) delete mode 100644 keyboards/hfdkb/keyboard_sw/k83/k83.h (limited to 'keyboards/hfdkb/keyboard_sw') diff --git a/keyboards/hfdkb/keyboard_sw/k83/info.json b/keyboards/hfdkb/keyboard_sw/k83/info.json index efdea0336c..329b07fab7 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/info.json +++ b/keyboards/hfdkb/keyboard_sw/k83/info.json @@ -25,94 +25,103 @@ "layouts": { "LAYOUT": { "layout": [ - { "label": "Esc", "x": 0, "y": 0 }, - { "label": "F1", "x": 2, "y": 0 }, - { "label": "F2", "x": 3, "y": 0 }, - { "label": "F3", "x": 4, "y": 0 }, - { "label": "F4", "x": 5, "y": 0 }, - { "label": "F5", "x": 6.5, "y": 0 }, - { "label": "F6", "x": 7.5, "y": 0 }, - { "label": "F7", "x": 8.5, "y": 0 }, - { "label": "F8", "x": 9.5, "y": 0 }, - { "label": "F9", "x": 11, "y": 0 }, - { "label": "F10", "x": 12, "y": 0 }, - { "label": "F11", "x": 13, "y": 0 }, - { "label": "F12", "x": 14, "y": 0 }, - { "label": "PrtSc", "x": 15.25, "y": 0 }, - { "label": "PrtSc", "x": 15.25, "y": 0 }, + {"matrix": [0, 0], "x": 0, "y": 0}, - { "label": "~", "x": 0, "y": 1.25 }, - { "label": "!", "x": 1, "y": 1.25 }, - { "label": "@", "x": 2, "y": 1.25 }, - { "label": "#", "x": 3, "y": 1.25 }, - { "label": "$", "x": 4, "y": 1.25 }, - { "label": "%", "x": 5, "y": 1.25 }, - { "label": "^", "x": 6, "y": 1.25 }, - { "label": "&", "x": 7, "y": 1.25 }, - { "label": "*", "x": 8, "y": 1.25 }, - { "label": "(", "x": 9, "y": 1.25 }, - { "label": ")", "x": 10, "y": 1.25 }, - { "label": "_", "x": 11, "y": 1.25 }, - { "label": "+", "x": 12, "y": 1.25 }, - { "label": "Bksp", "x": 14, "y": 1.25 }, - { "label": "Insert", "x": 15.25, "y": 1.25 }, + {"matrix": [0, 1], "x": 2, "y": 0}, + {"matrix": [0, 2], "x": 3, "y": 0}, + {"matrix": [0, 3], "x": 4, "y": 0}, + {"matrix": [0, 4], "x": 5, "y": 0}, - { "label": "Tab", "x": 0, "y": 2.25, "w": 1.5 }, - { "label": "Q", "x": 1.5, "y": 2.25 }, - { "label": "W", "x": 2.5, "y": 2.25 }, - { "label": "E", "x": 3.5, "y": 2.25 }, - { "label": "R", "x": 4.5, "y": 2.25 }, - { "label": "T", "x": 5.5, "y": 2.25 }, - { "label": "Y", "x": 6.5, "y": 2.25 }, - { "label": "U", "x": 7.5, "y": 2.25 }, - { "label": "I", "x": 8.5, "y": 2.25 }, - { "label": "O", "x": 9.5, "y": 2.25 }, - { "label": "P", "x": 10.5, "y": 2.25 }, - { "label": "{", "x": 11.5, "y": 2.25 }, - { "label": "}", "x": 12.5, "y": 2.25 }, - { "label": "|", "x": 13.5, "y": 2.25, "w": 1.5 }, - { "label": "Delete", "x": 15.25, "y": 2.25 }, + {"matrix": [0, 5], "x": 6.5, "y": 0}, + {"matrix": [0, 6], "x": 7.5, "y": 0}, + {"matrix": [0, 7], "x": 8.5, "y": 0}, + {"matrix": [0, 8], "x": 9.5, "y": 0}, - { "label": "Caps Lock", "x": 0, "y": 3.25, "w": 1.75 }, - { "label": "A", "x": 1.75, "y": 3.25 }, - { "label": "S", "x": 2.75, "y": 3.25 }, - { "label": "D", "x": 3.75, "y": 3.25 }, - { "label": "F", "x": 4.75, "y": 3.25 }, - { "label": "G", "x": 5.75, "y": 3.25 }, - { "label": "H", "x": 6.75, "y": 3.25 }, - { "label": "J", "x": 7.75, "y": 3.25 }, - { "label": "K", "x": 8.75, "y": 3.25 }, - { "label": "L", "x": 9.75, "y": 3.25 }, - { "label": ":", "x": 10.75, "y": 3.25 }, - { "label": "\"", "x": 11.75, "y": 3.25 }, - { "label": "Enter", "x": 13.75, "y": 3.25, "w": 1.25 }, - { "label": "End", "x": 16.25, "y": 2.25 }, + {"matrix": [0, 9], "x": 11, "y": 0}, + {"matrix": [0, 10], "x": 12, "y": 0}, + {"matrix": [0, 11], "x": 13, "y": 0}, + {"matrix": [0, 12], "x": 14, "y": 0}, - { "label": "Shift", "x": 0, "y": 4.25, "w": 1.25 }, - { "label": "Z", "x": 2.25, "y": 4.25 }, - { "label": "X", "x": 3.25, "y": 4.25 }, - { "label": "C", "x": 4.25, "y": 4.25 }, - { "label": "V", "x": 5.25, "y": 4.25 }, - { "label": "B", "x": 6.25, "y": 4.25 }, - { "label": "N", "x": 7.25, "y": 4.25 }, - { "label": "M", "x": 8.25, "y": 4.25 }, - { "label": "<", "x": 9.25, "y": 4.25 }, - { "label": ">", "x": 10.25, "y": 4.25 }, - { "label": "?", "x": 11.25, "y": 4.25 }, - { "label": "Shift", "x": 12.25, "y": 4.25, "w": 1.75 }, - { "label": "Up", "x": 16.25, "y": 4.25 }, - { "label": "Up", "x": 16.25, "y": 4.25 }, + {"matrix": [0, 13], "x": 15.25, "y": 0}, + {"matrix": [0, 15], "x": 15.25, "y": 0}, - { "label": "Ctrl", "x": 0, "y": 5.25, "w": 1.25 }, - { "label": "Win", "x": 1.25, "y": 5.25, "w": 1.25 }, - { "label": "Alt", "x": 2.5, "y": 5.25, "w": 1.25 }, - { "label": "Space", "x": 3.75, "y": 5.25, "w": 6.25 }, - { "label": "Alt", "x": 10, "y": 5.25, "w": 1.25 }, - { "label": "Menu", "x": 12.5, "y": 5.25, "w": 1.25 }, - { "label": "Ctrl", "x": 13.75, "y": 5.25, "w": 1.25 }, - { "label": "Left", "x": 15.25, "y": 5.25 }, - { "label": "Down", "x": 16.25, "y": 5.25 }, - { "label": "Right", "x": 17.25, "y": 5.25 } + {"matrix": [1, 0], "x": 0, "y": 1.25}, + {"matrix": [1, 1], "x": 1, "y": 1.25}, + {"matrix": [1, 2], "x": 2, "y": 1.25}, + {"matrix": [1, 3], "x": 3, "y": 1.25}, + {"matrix": [1, 4], "x": 4, "y": 1.25}, + {"matrix": [1, 5], "x": 5, "y": 1.25}, + {"matrix": [1, 6], "x": 6, "y": 1.25}, + {"matrix": [1, 7], "x": 7, "y": 1.25}, + {"matrix": [1, 8], "x": 8, "y": 1.25}, + {"matrix": [1, 9], "x": 9, "y": 1.25}, + {"matrix": [1, 10], "x": 10, "y": 1.25}, + {"matrix": [1, 11], "x": 11, "y": 1.25}, + {"matrix": [1, 12], "x": 12, "y": 1.25}, + {"matrix": [1, 13], "x": 14, "y": 1.25}, + + {"matrix": [1, 15], "x": 15.25, "y": 1.25}, + + {"matrix": [2, 0], "x": 0, "y": 2.25, "w": 1.5}, + {"matrix": [2, 1], "x": 1.5, "y": 2.25}, + {"matrix": [2, 2], "x": 2.5, "y": 2.25}, + {"matrix": [2, 3], "x": 3.5, "y": 2.25}, + {"matrix": [2, 4], "x": 4.5, "y": 2.25}, + {"matrix": [2, 5], "x": 5.5, "y": 2.25}, + {"matrix": [2, 6], "x": 6.5, "y": 2.25}, + {"matrix": [2, 7], "x": 7.5, "y": 2.25}, + {"matrix": [2, 8], "x": 8.5, "y": 2.25}, + {"matrix": [2, 9], "x": 9.5, "y": 2.25}, + {"matrix": [2, 10], "x": 10.5, "y": 2.25}, + {"matrix": [2, 11], "x": 11.5, "y": 2.25}, + {"matrix": [2, 12], "x": 12.5, "y": 2.25}, + {"matrix": [2, 13], "x": 13.5, "y": 2.25, "w": 1.5}, + + {"matrix": [2, 15], "x": 15.25, "y": 2.25}, + + {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.75}, + {"matrix": [3, 1], "x": 1.75, "y": 3.25}, + {"matrix": [3, 2], "x": 2.75, "y": 3.25}, + {"matrix": [3, 3], "x": 3.75, "y": 3.25}, + {"matrix": [3, 4], "x": 4.75, "y": 3.25}, + {"matrix": [3, 5], "x": 5.75, "y": 3.25}, + {"matrix": [3, 6], "x": 6.75, "y": 3.25}, + {"matrix": [3, 7], "x": 7.75, "y": 3.25}, + {"matrix": [3, 8], "x": 8.75, "y": 3.25}, + {"matrix": [3, 9], "x": 9.75, "y": 3.25}, + {"matrix": [3, 10], "x": 10.75, "y": 3.25}, + {"matrix": [3, 11], "x": 11.75, "y": 3.25}, + {"matrix": [3, 13], "x": 13.75, "y": 3.25, "w": 1.25}, + + {"matrix": [3, 15], "x": 16.25, "y": 2.25}, + + {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25}, + {"matrix": [4, 1], "x": 2.25, "y": 4.25}, + {"matrix": [4, 2], "x": 3.25, "y": 4.25}, + {"matrix": [4, 3], "x": 4.25, "y": 4.25}, + {"matrix": [4, 4], "x": 5.25, "y": 4.25}, + {"matrix": [4, 5], "x": 6.25, "y": 4.25}, + {"matrix": [4, 6], "x": 7.25, "y": 4.25}, + {"matrix": [4, 7], "x": 8.25, "y": 4.25}, + {"matrix": [4, 8], "x": 9.25, "y": 4.25}, + {"matrix": [4, 9], "x": 10.25, "y": 4.25}, + {"matrix": [4, 10], "x": 11.25, "y": 4.25}, + {"matrix": [4, 13], "x": 12.25, "y": 4.25, "w": 1.75}, + + {"matrix": [4, 14], "x": 16.25, "y": 4.25}, + {"matrix": [4, 15], "x": 16.25, "y": 4.25}, + + {"matrix": [5, 0], "x": 0, "y": 5.25, "w": 1.25}, + {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25}, + {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 5], "x": 3.75, "y": 5.25, "w": 6.25}, + {"matrix": [5, 9], "x": 10, "y": 5.25, "w": 1.25}, + {"matrix": [5, 10], "x": 12.5, "y": 5.25, "w": 1.25}, + {"matrix": [5, 11], "x": 13.75, "y": 5.25, "w": 1.25}, + + {"matrix": [5, 13], "x": 15.25, "y": 5.25}, + {"matrix": [5, 14], "x": 16.25, "y": 5.25}, + {"matrix": [5, 15], "x": 17.25, "y": 5.25} ] } } diff --git a/keyboards/hfdkb/keyboard_sw/k83/k83.c b/keyboards/hfdkb/keyboard_sw/k83/k83.c index f21ac50cd7..86b52cfe92 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/k83.c +++ b/keyboards/hfdkb/keyboard_sw/k83/k83.c @@ -14,7 +14,8 @@ * along with this program. If not, see . */ -#include "k83.h" +#include "quantum.h" + // clang-format off #ifdef RGB_MATRIX_ENABLE const is31_led PROGMEM g_is31_leds[RGB_MATRIX_LED_COUNT] = { diff --git a/keyboards/hfdkb/keyboard_sw/k83/k83.h b/keyboards/hfdkb/keyboard_sw/k83/k83.h deleted file mode 100644 index 17f6187b01..0000000000 --- a/keyboards/hfdkb/keyboard_sw/k83/k83.h +++ /dev/null @@ -1,39 +0,0 @@ -/* Copyright (C) 2022 jonylee@hfd - * - * 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 - -#include "quantum.h" - -#define LAYOUT(\ - K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, K015, \ - K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, K115, \ - K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, K215, \ - K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, K313, K315, \ - K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, K413, K414, K415, \ - K500, K501, K502, K505, K509, K510, K511, K513, K514, K515 \ -) { \ - { K000, K001, K002, K003, K004, K005, K006, K007, K008, K009, K010, K011, K012, K013, KC_NO, K015 }, \ - { K100, K101, K102, K103, K104, K105, K106, K107, K108, K109, K110, K111, K112, K113, KC_NO, K115 }, \ - { K200, K201, K202, K203, K204, K205, K206, K207, K208, K209, K210, K211, K212, K213, KC_NO, K215 }, \ - { K300, K301, K302, K303, K304, K305, K306, K307, K308, K309, K310, K311, KC_NO, K313, KC_NO, K315 }, \ - { K400, K401, K402, K403, K404, K405, K406, K407, K408, K409, K410, KC_NO, KC_NO, K413, K414, K415 }, \ - { K500, K501, K502, KC_NO, KC_NO, K505, KC_NO, KC_NO, KC_NO, K509, K510, K511, KC_NO, K513, K514, K515 } \ -} -// clang-format on - - - -- cgit v1.2.3 From c9f619124d41637ece157570703423c3890cb6c2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sun, 16 Apr 2023 01:18:44 +1000 Subject: Encodermap direction define. (#20454) --- keyboards/hfdkb/keyboard_sw/k83/keymaps/default/keymap.c | 2 +- keyboards/hfdkb/keyboard_sw/k83/keymaps/via/keymap.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'keyboards/hfdkb/keyboard_sw') diff --git a/keyboards/hfdkb/keyboard_sw/k83/keymaps/default/keymap.c b/keyboards/hfdkb/keyboard_sw/k83/keymaps/default/keymap.c index 16efd29b5c..712383d48d 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/keymaps/default/keymap.c +++ b/keyboards/hfdkb/keyboard_sw/k83/keymaps/default/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) }, [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, diff --git a/keyboards/hfdkb/keyboard_sw/k83/keymaps/via/keymap.c b/keyboards/hfdkb/keyboard_sw/k83/keymaps/via/keymap.c index 16efd29b5c..712383d48d 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/keymaps/via/keymap.c +++ b/keyboards/hfdkb/keyboard_sw/k83/keymaps/via/keymap.c @@ -63,7 +63,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = { }; #if defined(ENCODER_MAP_ENABLE) -const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][2] = { +const uint16_t PROGMEM encoder_map[][NUM_ENCODERS][NUM_DIRECTIONS] = { [WIN_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, [WIN_FN] = { ENCODER_CCW_CW(RGB_SAI, RGB_SAD) }, [MAC_B] = { ENCODER_CCW_CW(KC_VOLU, KC_VOLD) }, -- cgit v1.2.3 From 798cbfe6a3430be9f73d3bc7c76550394077ccdb Mon Sep 17 00:00:00 2001 From: Ryan Date: Sun, 16 Apr 2023 15:37:24 +1000 Subject: Fix info.json LTO and format encoder definitions (#20456) --- keyboards/hfdkb/keyboard_sw/k83/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/hfdkb/keyboard_sw') diff --git a/keyboards/hfdkb/keyboard_sw/k83/info.json b/keyboards/hfdkb/keyboard_sw/k83/info.json index 329b07fab7..330a7d551f 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/info.json +++ b/keyboards/hfdkb/keyboard_sw/k83/info.json @@ -19,7 +19,7 @@ "diode_direction": "ROW2COL", "encoder": { "rotary": [ - { "pin_a": "B14", "pin_b": "B13","resolution": 4 } + {"pin_a": "B14", "pin_b": "B13", "resolution": 4} ] }, "layouts": { -- cgit v1.2.3 From 12d42cedd2624db0d5cfe6f538211f9dfcd19822 Mon Sep 17 00:00:00 2001 From: Ryan Date: Mon, 1 May 2023 13:33:10 +1000 Subject: Move `FORCE_NKRO` to data driven (#20604) --- keyboards/hfdkb/keyboard_sw/k83/config.h | 2 -- keyboards/hfdkb/keyboard_sw/k83/info.json | 3 ++- 2 files changed, 2 insertions(+), 3 deletions(-) (limited to 'keyboards/hfdkb/keyboard_sw') diff --git a/keyboards/hfdkb/keyboard_sw/k83/config.h b/keyboards/hfdkb/keyboard_sw/k83/config.h index f5525a9943..a4660c93be 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/config.h +++ b/keyboards/hfdkb/keyboard_sw/k83/config.h @@ -18,8 +18,6 @@ #define RGB_TRIGGER_ON_KEYDOWN -/* Force NKRO on boot up regardless of the setting saved in the EEPROM (uncomment to enable it) */ -#define FORCE_NKRO /* encoder resolution */ #define TAP_CODE_DELAY 15 diff --git a/keyboards/hfdkb/keyboard_sw/k83/info.json b/keyboards/hfdkb/keyboard_sw/k83/info.json index 330a7d551f..0fc817ffdc 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/info.json +++ b/keyboards/hfdkb/keyboard_sw/k83/info.json @@ -5,7 +5,8 @@ "usb": { "vid": "0xFFFE", "pid": "0x0007", - "device_version": "1.0.0" + "device_version": "1.0.0", + "force_nkro": true }, "rgb_matrix": { "driver": "IS31FL3733" -- cgit v1.2.3 From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001 From: Ryan Date: Tue, 2 May 2023 08:25:15 +1000 Subject: `info.json` whitespace cleanups (#20651) --- keyboards/hfdkb/keyboard_sw/k83/info.json | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'keyboards/hfdkb/keyboard_sw') diff --git a/keyboards/hfdkb/keyboard_sw/k83/info.json b/keyboards/hfdkb/keyboard_sw/k83/info.json index 0fc817ffdc..559fa3d790 100644 --- a/keyboards/hfdkb/keyboard_sw/k83/info.json +++ b/keyboards/hfdkb/keyboard_sw/k83/info.json @@ -14,7 +14,7 @@ "processor": "WB32FQ95", "bootloader": "wb32-dfu", "matrix_pins": { - "cols": ["C1","C2","C3","A0","A1","A2","A3","A4","A5","A6","A7","C4","C5","B0","B1","B2"], + "cols": ["C1", "C2", "C3", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "C4", "C5", "B0", "B1", "B2"], "rows": ["B15", "C6", "C7", "C8", "C9", "A8"] }, "diode_direction": "ROW2COL", -- cgit v1.2.3