From 0e3cc6af12ad0337574280f783ee118a79c6ea55 Mon Sep 17 00:00:00 2001 From: Ryan Date: Sat, 6 Aug 2022 18:45:43 +1000 Subject: Move keyboard USB IDs and strings to data driven: X (#17925) --- keyboards/xelus/pachi/mini_32u4/config.h | 7 ------- keyboards/xelus/pachi/mini_32u4/info.json | 8 +++++++- keyboards/xelus/pachi/rev1/config.h | 7 ------- keyboards/xelus/pachi/rev1/info.json | 8 +++++++- keyboards/xelus/pachi/rgb/rev1/config.h | 7 ------- keyboards/xelus/pachi/rgb/rev1/info.json | 8 +++++++- keyboards/xelus/pachi/rgb/rev2/config.h | 7 ------- keyboards/xelus/pachi/rgb/rev2/info.json | 8 +++++++- 8 files changed, 28 insertions(+), 32 deletions(-) (limited to 'keyboards/xelus/pachi') diff --git a/keyboards/xelus/pachi/mini_32u4/config.h b/keyboards/xelus/pachi/mini_32u4/config.h index cf15d57cfc..f2abc3619f 100644 --- a/keyboards/xelus/pachi/mini_32u4/config.h +++ b/keyboards/xelus/pachi/mini_32u4/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x5041 // PA -#define DEVICE_VER 0x0001 -#define MANUFACTURER Xelus -#define PRODUCT Xelus Pachi Mini - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/xelus/pachi/mini_32u4/info.json b/keyboards/xelus/pachi/mini_32u4/info.json index 3b0128ee82..ca78bdbffe 100644 --- a/keyboards/xelus/pachi/mini_32u4/info.json +++ b/keyboards/xelus/pachi/mini_32u4/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Xelus Pachi Mini", + "keyboard_name": "Pachi Mini", + "manufacturer": "Xelus", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x5845", + "pid": "0x5041", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xelus/pachi/rev1/config.h b/keyboards/xelus/pachi/rev1/config.h index 2379700138..8a8c51779f 100644 --- a/keyboards/xelus/pachi/rev1/config.h +++ b/keyboards/xelus/pachi/rev1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5845 // XE -#define PRODUCT_ID 0x5041 // PA -#define DEVICE_VER 0x0001 -#define MANUFACTURER Xelus -#define PRODUCT Xelus Pachi - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/xelus/pachi/rev1/info.json b/keyboards/xelus/pachi/rev1/info.json index 2fb0c55479..1b14340edd 100644 --- a/keyboards/xelus/pachi/rev1/info.json +++ b/keyboards/xelus/pachi/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Xelus Pachi Rev 1", + "keyboard_name": "Pachi Rev 1", + "manufacturer": "Xelus", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x5845", + "pid": "0x5041", + "device_version": "0.0.1" + }, "layouts": { "LAYOUT_all": { "layout": [ diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h index 2711b5c7a8..6f4dfa24d1 100644 --- a/keyboards/xelus/pachi/rgb/rev1/config.h +++ b/keyboards/xelus/pachi/rgb/rev1/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5845 // "XE" -#define PRODUCT_ID 0x5052 // "PR" -#define DEVICE_VER 0x0001 -#define MANUFACTURER Xelus -#define PRODUCT Xelus Pachi RGB Rev1 - /* key matrix size */ #define MATRIX_ROWS 6 #define MATRIX_COLS 17 diff --git a/keyboards/xelus/pachi/rgb/rev1/info.json b/keyboards/xelus/pachi/rgb/rev1/info.json index 7448e755f0..24b6c4834a 100644 --- a/keyboards/xelus/pachi/rgb/rev1/info.json +++ b/keyboards/xelus/pachi/rgb/rev1/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Xelus Pachi RGB Rev 1", + "keyboard_name": "Pachi RGB Rev 1", + "manufacturer": "Xelus", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x5845", + "pid": "0x5052", + "device_version": "0.0.1" + }, "layout_aliases": { "LAYOUT_ansi_tsangan": "LAYOUT_tkl_ansi_tsangan" }, diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h index 35a4cf238f..b5c85deb78 100644 --- a/keyboards/xelus/pachi/rgb/rev2/config.h +++ b/keyboards/xelus/pachi/rgb/rev2/config.h @@ -16,13 +16,6 @@ #pragma once -/* USB Device descriptor parameter */ -#define VENDOR_ID 0x5845 // "XE" -#define PRODUCT_ID 0x5053 // "PR" + 1 -#define DEVICE_VER 0x0002 -#define MANUFACTURER Xelus -#define PRODUCT Xelus Pachi RGB Rev 2 - /* key matrix size */ #define MATRIX_ROWS 12 #define MATRIX_COLS 9 diff --git a/keyboards/xelus/pachi/rgb/rev2/info.json b/keyboards/xelus/pachi/rgb/rev2/info.json index 7448e755f0..46a4de5920 100644 --- a/keyboards/xelus/pachi/rgb/rev2/info.json +++ b/keyboards/xelus/pachi/rgb/rev2/info.json @@ -1,7 +1,13 @@ { - "keyboard_name": "Xelus Pachi RGB Rev 1", + "keyboard_name": "Pachi RGB Rev 2", + "manufacturer": "Xelus", "url": "", "maintainer": "Xelus22", + "usb": { + "vid": "0x5845", + "pid": "0x5053", + "device_version": "0.0.2" + }, "layout_aliases": { "LAYOUT_ansi_tsangan": "LAYOUT_tkl_ansi_tsangan" }, -- cgit v1.2.1 From f27b617f36d55ac5469247016a1b79304f892366 Mon Sep 17 00:00:00 2001 From: Stefan Kerkmann Date: Sat, 6 Aug 2022 12:51:13 +0200 Subject: [Core] Process all changed keys in one scan loop, deprecate `QMK_KEYS_PER_SCAN` (#15292) --- .../xelus/pachi/mini_32u4/keymaps/default/config.h | 18 ------------------ keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h | 2 -- keyboards/xelus/pachi/rev1/keymaps/default/config.h | 18 ------------------ keyboards/xelus/pachi/rev1/keymaps/via/config.h | 2 -- keyboards/xelus/pachi/rgb/keymaps/default/config.h | 18 ------------------ keyboards/xelus/pachi/rgb/keymaps/via/config.h | 2 -- 6 files changed, 60 deletions(-) delete mode 100644 keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h delete mode 100644 keyboards/xelus/pachi/rev1/keymaps/default/config.h delete mode 100644 keyboards/xelus/pachi/rgb/keymaps/default/config.h (limited to 'keyboards/xelus/pachi') diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h b/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h deleted file mode 100644 index 5d972dd48c..0000000000 --- a/keyboards/xelus/pachi/mini_32u4/keymaps/default/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * 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 QMK_KEYS_PER_SCAN 4 diff --git a/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h b/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h index fc3a2bd0b2..47bbf2bf81 100644 --- a/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h +++ b/keyboards/xelus/pachi/mini_32u4/keymaps/via/config.h @@ -18,5 +18,3 @@ // 3 layers or else it will not fit in EEPROM #define DYNAMIC_KEYMAP_LAYER_COUNT 3 - -#define QMK_KEYS_PER_SCAN 4 diff --git a/keyboards/xelus/pachi/rev1/keymaps/default/config.h b/keyboards/xelus/pachi/rev1/keymaps/default/config.h deleted file mode 100644 index 5d972dd48c..0000000000 --- a/keyboards/xelus/pachi/rev1/keymaps/default/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * 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 QMK_KEYS_PER_SCAN 4 diff --git a/keyboards/xelus/pachi/rev1/keymaps/via/config.h b/keyboards/xelus/pachi/rev1/keymaps/via/config.h index fc3a2bd0b2..47bbf2bf81 100644 --- a/keyboards/xelus/pachi/rev1/keymaps/via/config.h +++ b/keyboards/xelus/pachi/rev1/keymaps/via/config.h @@ -18,5 +18,3 @@ // 3 layers or else it will not fit in EEPROM #define DYNAMIC_KEYMAP_LAYER_COUNT 3 - -#define QMK_KEYS_PER_SCAN 4 diff --git a/keyboards/xelus/pachi/rgb/keymaps/default/config.h b/keyboards/xelus/pachi/rgb/keymaps/default/config.h deleted file mode 100644 index 5d972dd48c..0000000000 --- a/keyboards/xelus/pachi/rgb/keymaps/default/config.h +++ /dev/null @@ -1,18 +0,0 @@ -/* Copyright 2021 Harrison Chan (Xelus) - * - * 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 QMK_KEYS_PER_SCAN 4 diff --git a/keyboards/xelus/pachi/rgb/keymaps/via/config.h b/keyboards/xelus/pachi/rgb/keymaps/via/config.h index 1213e7a8f2..0e34ad2c1a 100644 --- a/keyboards/xelus/pachi/rgb/keymaps/via/config.h +++ b/keyboards/xelus/pachi/rgb/keymaps/via/config.h @@ -21,5 +21,3 @@ // Enable RGB Matrix #define VIA_QMK_RGBLIGHT_ENABLE - -#define QMK_KEYS_PER_SCAN 4 -- cgit v1.2.1 From 154d35ac146422bef938ed9756f6e0012baa83a2 Mon Sep 17 00:00:00 2001 From: Nick Brassel Date: Sat, 6 Aug 2022 23:23:35 +1000 Subject: Remove `UNUSED_PINS` (#17931) --- keyboards/xelus/pachi/rgb/rev1/config.h | 1 - keyboards/xelus/pachi/rgb/rev2/config.h | 1 - 2 files changed, 2 deletions(-) (limited to 'keyboards/xelus/pachi') diff --git a/keyboards/xelus/pachi/rgb/rev1/config.h b/keyboards/xelus/pachi/rgb/rev1/config.h index 6f4dfa24d1..9eda99ed32 100644 --- a/keyboards/xelus/pachi/rgb/rev1/config.h +++ b/keyboards/xelus/pachi/rgb/rev1/config.h @@ -23,7 +23,6 @@ /* key matrix pins */ #define MATRIX_ROW_PINS { B14, B13, B12, B2, A8, B15 } #define MATRIX_COL_PINS { C13, C14, C15, H0, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, H1, B10, B11 } -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW diff --git a/keyboards/xelus/pachi/rgb/rev2/config.h b/keyboards/xelus/pachi/rgb/rev2/config.h index b5c85deb78..6295228c31 100644 --- a/keyboards/xelus/pachi/rgb/rev2/config.h +++ b/keyboards/xelus/pachi/rgb/rev2/config.h @@ -23,7 +23,6 @@ /* key matrix pins */ #define MATRIX_ROW_PINS { A5, A6, B0, A7, A8, B1, B4, B5, A15, B3, A13, A14 } #define MATRIX_COL_PINS { C14, C15, A0, A1, A2, A3, A4, A10, A9} -#define UNUSED_PINS /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION COL2ROW -- cgit v1.2.1