From 137938b67afbf35fd34f2e5cbe3c5c6367a1d0cc Mon Sep 17 00:00:00 2001 From: Joel Challis Date: Fri, 9 Feb 2024 06:56:13 +0000 Subject: [PATCH] Migrate dip switch config to info.json - keychron (#23037) --- keyboards/keychron/c1_pro/c1_pro.c | 13 ------------- keyboards/keychron/c1_pro/config.h | 6 ------ keyboards/keychron/c1_pro/info.json | 3 +++ keyboards/keychron/c2_pro/c2_pro.c | 12 ------------ keyboards/keychron/c2_pro/config.h | 6 ------ keyboards/keychron/c2_pro/info.json | 3 +++ keyboards/keychron/q10/config.h | 6 ------ keyboards/keychron/q10/info.json | 5 +++++ keyboards/keychron/q10/q10.c | 9 --------- keyboards/keychron/q11/config.h | 9 --------- keyboards/keychron/q11/info.json | 6 ++++++ keyboards/keychron/q11/q11.c | 19 ------------------- keyboards/keychron/q12/config.h | 8 -------- keyboards/keychron/q12/info.json | 5 +++++ keyboards/keychron/q12/q12.c | 10 ---------- keyboards/keychron/q1v1/ansi/ansi.c | 9 --------- .../keychron/q1v1/ansi_encoder/ansi_encoder.c | 9 --------- keyboards/keychron/q1v1/config.h | 6 ------ keyboards/keychron/q1v1/info.json | 3 +++ keyboards/keychron/q1v1/iso/iso.c | 9 --------- .../keychron/q1v1/iso_encoder/iso_encoder.c | 9 --------- keyboards/keychron/q1v2/config.h | 9 --------- keyboards/keychron/q1v2/info.json | 3 +++ keyboards/keychron/q1v2/q1v2.c | 9 --------- keyboards/keychron/q2/config.h | 6 ------ keyboards/keychron/q2/info.json | 3 +++ keyboards/keychron/q2/q2.c | 8 -------- keyboards/keychron/q3/config.h | 6 ------ keyboards/keychron/q3/info.json | 3 +++ keyboards/keychron/q3/q3.c | 13 ------------- keyboards/keychron/q4/config.h | 6 ------ keyboards/keychron/q4/info.json | 3 +++ keyboards/keychron/q4/q4.c | 8 -------- keyboards/keychron/q5/config.h | 6 ------ keyboards/keychron/q5/info.json | 3 +++ keyboards/keychron/q5/q5.c | 9 --------- keyboards/keychron/q6/config.h | 6 ------ keyboards/keychron/q6/info.json | 5 +++++ keyboards/keychron/q6/q6.c | 9 --------- keyboards/keychron/q60/config.h | 6 ------ keyboards/keychron/q60/info.json | 5 +++++ keyboards/keychron/q60/q60.c | 8 -------- keyboards/keychron/q65/config.h | 6 ------ keyboards/keychron/q65/info.json | 5 +++++ keyboards/keychron/q65/q65.c | 8 -------- keyboards/keychron/q7/config.h | 6 ------ keyboards/keychron/q7/info.json | 3 +++ keyboards/keychron/q7/q7.c | 8 -------- keyboards/keychron/q8/config.h | 6 ------ keyboards/keychron/q8/info.json | 3 +++ keyboards/keychron/q8/q8.c | 8 -------- keyboards/keychron/q9/config.h | 6 ------ keyboards/keychron/q9/info.json | 3 +++ keyboards/keychron/q9/q9.c | 7 ------- keyboards/keychron/q9_plus/config.h | 6 ------ keyboards/keychron/q9_plus/info.json | 3 +++ keyboards/keychron/q9_plus/q9_plus.c | 7 ------- keyboards/keychron/s1/config.h | 6 ------ keyboards/keychron/s1/info.json | 5 +++++ keyboards/keychron/s1/s1.c | 9 --------- keyboards/keychron/v1/config.h | 6 ------ keyboards/keychron/v1/info.json | 5 +++++ keyboards/keychron/v1/v1.c | 9 --------- keyboards/keychron/v10/config.h | 6 ------ keyboards/keychron/v10/info.json | 5 +++++ keyboards/keychron/v10/v10.c | 9 --------- keyboards/keychron/v2/config.h | 6 ------ keyboards/keychron/v2/info.json | 5 +++++ keyboards/keychron/v2/v2.c | 8 -------- keyboards/keychron/v3/config.h | 6 ------ keyboards/keychron/v3/info.json | 5 +++++ keyboards/keychron/v3/v3.c | 13 ------------- keyboards/keychron/v4/config.h | 6 ------ keyboards/keychron/v4/info.json | 5 +++++ keyboards/keychron/v4/v4.c | 8 -------- keyboards/keychron/v5/config.h | 6 ------ keyboards/keychron/v5/info.json | 5 +++++ keyboards/keychron/v5/v5.c | 9 --------- keyboards/keychron/v6/config.h | 5 ----- keyboards/keychron/v6/info.json | 5 +++++ keyboards/keychron/v6/v6.c | 9 --------- keyboards/keychron/v7/config.h | 6 ------ keyboards/keychron/v7/info.json | 5 +++++ keyboards/keychron/v7/v7.c | 8 -------- keyboards/keychron/v8/config.h | 6 ------ keyboards/keychron/v8/info.json | 5 +++++ keyboards/keychron/v8/v8.c | 8 -------- 87 files changed, 117 insertions(+), 466 deletions(-) create mode 100644 keyboards/keychron/q10/info.json create mode 100644 keyboards/keychron/q12/info.json create mode 100644 keyboards/keychron/q6/info.json create mode 100644 keyboards/keychron/q60/info.json create mode 100644 keyboards/keychron/q65/info.json create mode 100644 keyboards/keychron/s1/info.json create mode 100644 keyboards/keychron/v1/info.json create mode 100644 keyboards/keychron/v10/info.json create mode 100644 keyboards/keychron/v2/info.json create mode 100644 keyboards/keychron/v3/info.json create mode 100644 keyboards/keychron/v4/info.json create mode 100644 keyboards/keychron/v5/info.json create mode 100644 keyboards/keychron/v6/info.json create mode 100644 keyboards/keychron/v7/info.json create mode 100644 keyboards/keychron/v8/info.json diff --git a/keyboards/keychron/c1_pro/c1_pro.c b/keyboards/keychron/c1_pro/c1_pro.c index 607cd958ade90087e2bb31d4fff0eb6ec85def9f..178dca81215abbd63e9d2306b7f2524362e17286 100644 --- a/keyboards/keychron/c1_pro/c1_pro.c +++ b/keyboards/keychron/c1_pro/c1_pro.c @@ -16,19 +16,6 @@ #include "quantum.h" -// clang-format off - -const matrix_row_t matrix_mask[] = { - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111101111, -}; - -// clang-format on - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/c1_pro/config.h b/keyboards/keychron/c1_pro/config.h index 2d8149047125398652ce7e9809075d7d59d1738e..78415190b72692a72b93782a2c870d85887f9ffd 100644 --- a/keyboards/keychron/c1_pro/config.h +++ b/keyboards/keychron/c1_pro/config.h @@ -16,12 +16,6 @@ #pragma once -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { { 5, 4 } } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* EEPROM Driver Configuration */ #define WEAR_LEVELING_LOGICAL_SIZE 2048 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2) diff --git a/keyboards/keychron/c1_pro/info.json b/keyboards/keychron/c1_pro/info.json index 9c9b4bf16f85e4c16f878cb568e3399b1755a6c0..080392ea489949ac113feae8308e8a0f8c9d9176 100644 --- a/keyboards/keychron/c1_pro/info.json +++ b/keyboards/keychron/c1_pro/info.json @@ -17,6 +17,9 @@ "mousekey": true, "nkro": true }, + "dip_switch": { + "matrix_grid": [ [5, 4] ] + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "A10", "H3"], "rows": ["B5", "B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/c2_pro/c2_pro.c b/keyboards/keychron/c2_pro/c2_pro.c index 2cd58ab4d796f4d252431742074f8b979501f0ba..593e40499704485e1380734146b157c55aaf772e 100644 --- a/keyboards/keychron/c2_pro/c2_pro.c +++ b/keyboards/keychron/c2_pro/c2_pro.c @@ -16,18 +16,6 @@ #include "quantum.h" -// clang-format off -const matrix_row_t matrix_mask[] = { - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111101111, -}; - -// clang-format on - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/c2_pro/config.h b/keyboards/keychron/c2_pro/config.h index 6971ebd1aa8cf7fe837e27a633d31d2a03d7f2e7..7422e29f6f0d4e0eed423c950134aa487395f966 100644 --- a/keyboards/keychron/c2_pro/config.h +++ b/keyboards/keychron/c2_pro/config.h @@ -16,12 +16,6 @@ #pragma once -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { { 5, 4 } } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* EEPROM Driver Configuration */ #define WEAR_LEVELING_LOGICAL_SIZE 2048 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2) diff --git a/keyboards/keychron/c2_pro/info.json b/keyboards/keychron/c2_pro/info.json index dd97dd7adf24e58207130a4f7371281bc4c76a34..736a2e86a1639e63d3cced4e7b77c1ed7594e7c6 100644 --- a/keyboards/keychron/c2_pro/info.json +++ b/keyboards/keychron/c2_pro/info.json @@ -17,6 +17,9 @@ "mousekey": true, "nkro": true }, + "dip_switch": { + "matrix_grid": [ [5, 4] ] + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "NO_PIN", "C14"], "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], diff --git a/keyboards/keychron/q10/config.h b/keyboards/keychron/q10/config.h index e999515abc4970713135a53657f2a2db1659def9..0a19cc008ca773800a903000a8651fc664d57a6d 100644 --- a/keyboards/keychron/q10/config.h +++ b/keyboards/keychron/q10/config.h @@ -44,12 +44,6 @@ #define SNLED27351_CURRENT_TUNE \ { 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {5,5} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* Disable RGB lighting when PC is in suspend */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/q10/info.json b/keyboards/keychron/q10/info.json new file mode 100644 index 0000000000000000000000000000000000000000..98a376bd205ec341e9b1b3ffcd15560b3bd7b759 --- /dev/null +++ b/keyboards/keychron/q10/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [5, 5] ] + } +} diff --git a/keyboards/keychron/q10/q10.c b/keyboards/keychron/q10/q10.c index 455a2a25f28bd0eb08d065a857ac628db4de2868..754b1481750333887ea8fc88c59184d5c6399c9f 100644 --- a/keyboards/keychron/q10/q10.c +++ b/keyboards/keychron/q10/q10.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111011111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/q11/config.h b/keyboards/keychron/q11/config.h index 949e5cf1da95a7396db9c66dc1ccee34cfc5ea9a..184785ed9805aa91bb6e2c2af4dd983dc970b871 100755 --- a/keyboards/keychron/q11/config.h +++ b/keyboards/keychron/q11/config.h @@ -16,15 +16,6 @@ #pragma once -// Connects each switch in the dip switch to the GPIO pin of the MCU -#define DIP_SWITCH_PINS \ - { A8 } - -/* handedness */ -#define SPLIT_HAND_MATRIX_GRID A2, A15 - -#define MATRIX_MASKED // actual mask is defined by `matrix_mask` in `q11.c` - /* RGB Matrix Driver Configuration */ #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND diff --git a/keyboards/keychron/q11/info.json b/keyboards/keychron/q11/info.json index f240c7080102f0b81b16bdfe25b4144cf84e8248..8b962e4a768cddebe781333914f7b08d9c4afaba 100755 --- a/keyboards/keychron/q11/info.json +++ b/keyboards/keychron/q11/info.json @@ -11,6 +11,9 @@ "bootmagic": { "matrix": [0, 1] }, + "dip_switch": { + "pins": ["A8"] + }, "features": { "bootmagic": true, "command": false, @@ -36,6 +39,9 @@ ] } }, + "handedness": { + "matrix_grid": ["A2", "A15"] + }, "matrix_pins": { "right": { "cols": ["A8", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"], diff --git a/keyboards/keychron/q11/q11.c b/keyboards/keychron/q11/q11.c index bf7bab4b5397ffc3df1bf88fce1c976828b9df71..f643113ea3b95d30c7ef2094c1d28b57fcd6222c 100755 --- a/keyboards/keychron/q11/q11.c +++ b/keyboards/keychron/q11/q11.c @@ -16,25 +16,6 @@ #include "quantum.h" -// Mask out handedness diode to prevent it -// from keeping the keyboard awake -// - just mirroring `KC_NO` in the `LAYOUT` -// macro to keep it simple -const matrix_row_t matrix_mask[] = { - 0b011111111, - 0b011111111, - 0b011011111, - 0b001111111, - 0b011111111, - 0b001011111, - 0b111111111, - 0b101111111, - 0b111111111, - 0b110111111, - 0b010111111, - 0b111011110, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { if (!dip_switch_update_user(index, active)) { diff --git a/keyboards/keychron/q12/config.h b/keyboards/keychron/q12/config.h index 2f6a277439e4d69b96224917f22f7383208e82df..e13238d9ee248060767af71864c1aac52b623324 100644 --- a/keyboards/keychron/q12/config.h +++ b/keyboards/keychron/q12/config.h @@ -39,16 +39,8 @@ #define SNLED27351_CURRENT_TUNE \ { 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55, 0xAD, 0xAD, 0x55 } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID \ - { \ - { 5, 4 } \ - } #define SCAN_COUNT_MAX 100 -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/q12/info.json b/keyboards/keychron/q12/info.json new file mode 100644 index 0000000000000000000000000000000000000000..7019c8755b15b24afa8699915befeaf4558e3cc4 --- /dev/null +++ b/keyboards/keychron/q12/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [5, 4] ] + } +} diff --git a/keyboards/keychron/q12/q12.c b/keyboards/keychron/q12/q12.c index 3d8eab56590b2f7c0518e6c27fa9f901069ac1aa..9a019af6aced968b769e0cf1b145e30deb5348eb 100644 --- a/keyboards/keychron/q12/q12.c +++ b/keyboards/keychron/q12/q12.c @@ -16,16 +16,6 @@ #include "quantum.h" -// clang-format off -const matrix_row_t matrix_mask[] = { - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111101111, -}; -// clang-format on #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { if (!dip_switch_update_user(index, active)) { diff --git a/keyboards/keychron/q1v1/ansi/ansi.c b/keyboards/keychron/q1v1/ansi/ansi.c index bc352a19641c5063e235d590d2d98400936de8b6..f45907eaf6385af95f4b0d1341e156653d1414cf 100644 --- a/keyboards/keychron/q1v1/ansi/ansi.c +++ b/keyboards/keychron/q1v1/ansi/ansi.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b0111111111111101, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, -}; - #ifdef RGB_MATRIX_ENABLE const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = { /* Refer to IS31 manual for these locations diff --git a/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c index 387f3e0b3264d4d661260e8e73a73d5f4e6a76f3..1c15ac633d5cd9df20e7aa079752da84a764e0df 100644 --- a/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c +++ b/keyboards/keychron/q1v1/ansi_encoder/ansi_encoder.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b0111111111111101, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, -}; - #ifdef RGB_MATRIX_ENABLE const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = { /* Refer to IS31 manual for these locations diff --git a/keyboards/keychron/q1v1/config.h b/keyboards/keychron/q1v1/config.h index aa6658e1ba5cb0bb5c593de893d95ff84f56a175..c61d83a0ab9a0863dc4e690b3d1c44875636f53d 100644 --- a/keyboards/keychron/q1v1/config.h +++ b/keyboards/keychron/q1v1/config.h @@ -20,12 +20,6 @@ #define IS31FL3733_I2C_ADDRESS_1 IS31FL3733_I2C_ADDRESS_GND_GND #define IS31FL3733_I2C_ADDRESS_2 IS31FL3733_I2C_ADDRESS_VCC_VCC -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {0,1} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* Encoder Configuration*/ #define ENCODER_DEFAULT_POS 0x3 diff --git a/keyboards/keychron/q1v1/info.json b/keyboards/keychron/q1v1/info.json index 0041687269341cdab81a56cdeccc60830c04cc63..f4a3c5bb2409abac3db68329a0d13bc31b94abe9 100644 --- a/keyboards/keychron/q1v1/info.json +++ b/keyboards/keychron/q1v1/info.json @@ -17,6 +17,9 @@ "nkro": true, "rgb_matrix": true }, + "dip_switch": { + "matrix_grid": [ [0, 1] ] + }, "matrix_pins": { "cols": ["D5", "D4", "D6", "D7", "B4", "B5", "B6", "C6", "C7", "F7", "F6", "F5", "F4", "F1", "F0"], "rows": ["D3", "D2", "B3", "B2", "B1", "B0"] diff --git a/keyboards/keychron/q1v1/iso/iso.c b/keyboards/keychron/q1v1/iso/iso.c index ad3152adcd444cfb68f81d6aece7eaa4505eec49..109eb012828f90816298bdacd6829c55d72b9219 100644 --- a/keyboards/keychron/q1v1/iso/iso.c +++ b/keyboards/keychron/q1v1/iso/iso.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b0111111111111101, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, -}; - #ifdef RGB_MATRIX_ENABLE const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = { /* Refer to IS31 manual for these locations diff --git a/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c index 19122aa18d9b12d7ad954cc40ce67326474ab394..e46a17cdc633d73e6e3c68c002f5f2108901efc1 100644 --- a/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c +++ b/keyboards/keychron/q1v1/iso_encoder/iso_encoder.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b0111111111111101, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, - 0b0111111111111111, -}; - #ifdef RGB_MATRIX_ENABLE const is31fl3733_led_t PROGMEM g_is31fl3733_leds[IS31FL3733_LED_COUNT] = { diff --git a/keyboards/keychron/q1v2/config.h b/keyboards/keychron/q1v2/config.h index 67c7cae5bb7ca17bb8cd3c4a206da35dcdc8bebb..7f94cbee5593eba6fb2483b6f3d160c5b4c09643 100644 --- a/keyboards/keychron/q1v2/config.h +++ b/keyboards/keychron/q1v2/config.h @@ -27,15 +27,6 @@ #define I2C1_TIMINGR_SCLH 15U #define I2C1_TIMINGR_SCLL 51U -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID \ - { \ - { 5, 4 } \ - } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* Disable RGB lighting when PC is in suspend */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/q1v2/info.json b/keyboards/keychron/q1v2/info.json index b40c41c7606e3bd46f4a7792d05f6b8950dc65a9..03411bd4def9b7dc77b8effff458b606b7e15425 100644 --- a/keyboards/keychron/q1v2/info.json +++ b/keyboards/keychron/q1v2/info.json @@ -18,6 +18,9 @@ "rgb_matrix": true, "dip_switch": true }, + "dip_switch": { + "matrix_grid": [ [5, 4] ] + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", null, null, null, null, null, null, null, null], "rows": ["B5", "B4", "B3", "A15", "A14", "A13"], diff --git a/keyboards/keychron/q1v2/q1v2.c b/keyboards/keychron/q1v2/q1v2.c index 4f83a760d3853b34386f203a70379a55c4508763..1de8f205c7e6bc235da3201f53f43a19b4a227b8 100644 --- a/keyboards/keychron/q1v2/q1v2.c +++ b/keyboards/keychron/q1v2/q1v2.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { if (!dip_switch_update_user(index, active)) { diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h index d0beff49f0a43775a6af5b23310711cf92d7a53a..e55d78afd52b9259d2b8da96377e8512bad0099f 100644 --- a/keyboards/keychron/q2/config.h +++ b/keyboards/keychron/q2/config.h @@ -18,18 +18,12 @@ #define MATRIX_UNSELECT_DRIVE_HIGH -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {4, 4} } - /* RGB Matrix Driver Configuration */ #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/q2/info.json b/keyboards/keychron/q2/info.json index 47d9aa83b1888f412f3a93573a835ffd1752033a..e18c9b2448c2fefeb09289bb96544a5cb27bae45 100644 --- a/keyboards/keychron/q2/info.json +++ b/keyboards/keychron/q2/info.json @@ -22,6 +22,9 @@ "nkro": true, "rgb_matrix": true }, + "dip_switch": { + "matrix_grid": [ [4, 4] ] + }, "matrix_pins": { "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"], "rows": ["B4", "B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/q2/q2.c b/keyboards/keychron/q2/q2.c index 7ff85556def563717311e1d0e5f570ac2b82196f..1dd839eccc2276fb1ce668f3af6ac86e46cd913b 100644 --- a/keyboards/keychron/q2/q2.c +++ b/keyboards/keychron/q2/q2.c @@ -16,14 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/q3/config.h b/keyboards/keychron/q3/config.h index 6af0afd18ff4841b8ccb9a61d88f292e80621df9..176e14a5e269b21fea2643110bd7732cb37f59f5 100644 --- a/keyboards/keychron/q3/config.h +++ b/keyboards/keychron/q3/config.h @@ -29,12 +29,6 @@ #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {5, 4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* Encoder Configuration*/ #define ENCODER_DEFAULT_POS 0x3 diff --git a/keyboards/keychron/q3/info.json b/keyboards/keychron/q3/info.json index c08d73f26a1e4d861f69fd87354830d0b6dc02b4..6d1bb49d6e16a54093947297fc3fb698532f5d07 100644 --- a/keyboards/keychron/q3/info.json +++ b/keyboards/keychron/q3/info.json @@ -3,6 +3,9 @@ "maintainer": "lalalademaxiya1", "bootloader": "stm32-dfu", "diode_direction": "ROW2COL", + "dip_switch": { + "matrix_grid": [ [5, 4] ] + }, "eeprom": { "wear_leveling": { "backing_size": 4096 diff --git a/keyboards/keychron/q3/q3.c b/keyboards/keychron/q3/q3.c index 2bf8bf08a0b1a45d2c5cea677804275bc74c0b6a..846b58d4a7b9e5069e9dbfcb0920caf024ff39e4 100644 --- a/keyboards/keychron/q3/q3.c +++ b/keyboards/keychron/q3/q3.c @@ -17,19 +17,6 @@ #include "quantum.h" #include "rgb_matrix.h" -// clang-format off - -const matrix_row_t matrix_mask[] = { - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111101111, -}; - -// clang-format on - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/q4/config.h b/keyboards/keychron/q4/config.h index 97f480ea31cf2c04ca39b4b5bb80d198efddd073..a46d98eb06ea419c114691c37a17b1748f305741 100644 --- a/keyboards/keychron/q4/config.h +++ b/keyboards/keychron/q4/config.h @@ -16,12 +16,6 @@ #pragma once -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {4,4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/q4/info.json b/keyboards/keychron/q4/info.json index 0a9dcf495783634bad5dbd9cbf4c4c6eb052c9c9..4e88d4db6af1541960309ce4dbbbdac7b0cc8080 100644 --- a/keyboards/keychron/q4/info.json +++ b/keyboards/keychron/q4/info.json @@ -4,6 +4,9 @@ "maintainer": "lalalademaxiya1", "bootloader": "stm32-dfu", "diode_direction": "ROW2COL", + "dip_switch": { + "matrix_grid": [ [4, 4] ] + }, "dynamic_keymap": { "layer_count": 5 }, diff --git a/keyboards/keychron/q4/q4.c b/keyboards/keychron/q4/q4.c index c3cb67bcc2ecd04a7332726e1d45e93ab036104d..54ad01250fc8e71af67a496d4a34d6c6c4c2a316 100644 --- a/keyboards/keychron/q4/q4.c +++ b/keyboards/keychron/q4/q4.c @@ -16,14 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b11111111111111, - 0b11111111111111, - 0b11111111111111, - 0b11111111111111, - 0b11111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/q5/config.h b/keyboards/keychron/q5/config.h index 240baeea6c8ea4b40a0371e7b506706112a7f53f..3fa24219993456518eeb43864091846bc75d7b9f 100644 --- a/keyboards/keychron/q5/config.h +++ b/keyboards/keychron/q5/config.h @@ -33,12 +33,6 @@ #define SNLED27351_CURRENT_TUNE \ { 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56 } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {5, 4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/q5/info.json b/keyboards/keychron/q5/info.json index 243f70ddf1ffb3a95fbad34866620824ff9037a6..f1cdd43c4e41f7af704e1bcf94c891597ca6f1aa 100644 --- a/keyboards/keychron/q5/info.json +++ b/keyboards/keychron/q5/info.json @@ -4,6 +4,9 @@ "maintainer": "lalalademaxiya1", "bootloader": "stm32-dfu", "diode_direction": "ROW2COL", + "dip_switch": { + "matrix_grid": [ [5, 4] ] + }, "eeprom": { "wear_leveling": { "backing_size": 4096 diff --git a/keyboards/keychron/q5/q5.c b/keyboards/keychron/q5/q5.c index 7a1cabcd1a5b6f676f8d692921470da261cf90a5..4026e9dea83c01325ea9ee6fa979be1cc72b821d 100644 --- a/keyboards/keychron/q5/q5.c +++ b/keyboards/keychron/q5/q5.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/q6/config.h b/keyboards/keychron/q6/config.h index ff8cd1142b3437c357c677f72f21185c6bfdacc1..4b9963de854952215c9c0ea3b912fb58b00cc8a5 100644 --- a/keyboards/keychron/q6/config.h +++ b/keyboards/keychron/q6/config.h @@ -30,12 +30,6 @@ #define SNLED27351_CURRENT_TUNE \ { 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52, 0xA4, 0xA4, 0x52 } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {5, 4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/q6/info.json b/keyboards/keychron/q6/info.json new file mode 100644 index 0000000000000000000000000000000000000000..7019c8755b15b24afa8699915befeaf4558e3cc4 --- /dev/null +++ b/keyboards/keychron/q6/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [5, 4] ] + } +} diff --git a/keyboards/keychron/q6/q6.c b/keyboards/keychron/q6/q6.c index 8a9750e9de4f75f09162efa63bd49b5a5d45dafc..c1dc38a3fcf043074a5fb504c4f08fa8ff5d933e 100644 --- a/keyboards/keychron/q6/q6.c +++ b/keyboards/keychron/q6/q6.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/q60/config.h b/keyboards/keychron/q60/config.h index 3a6c3ea8ee410feb1d46a673944c56f7090693be..c22e74da97ba29c144a82b7b2994396b576fb1ed 100644 --- a/keyboards/keychron/q60/config.h +++ b/keyboards/keychron/q60/config.h @@ -29,12 +29,6 @@ #define SNLED27351_CURRENT_TUNE \ { 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60, 0xD8, 0xD8, 0x60 } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {4,4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/q60/info.json b/keyboards/keychron/q60/info.json new file mode 100644 index 0000000000000000000000000000000000000000..5084aad927207f678edfc1fc7c84dda9cf50c5d3 --- /dev/null +++ b/keyboards/keychron/q60/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [4, 4] ] + } +} diff --git a/keyboards/keychron/q60/q60.c b/keyboards/keychron/q60/q60.c index d97f72fb8ea193550b1e58fd187e9d5d2ca309c1..c6f2d1a38c7425cd634a249325a414588dba6d2a 100644 --- a/keyboards/keychron/q60/q60.c +++ b/keyboards/keychron/q60/q60.c @@ -16,14 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b11111111111111, - 0b11111111111111, - 0b11111111111111, - 0b11111111111111, - 0b11111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/q65/config.h b/keyboards/keychron/q65/config.h index 99eb4572cfbc996fc857b10979e0be83c2397156..abea6f65993ec3fdfddc3ee654fe78348e477d7f 100644 --- a/keyboards/keychron/q65/config.h +++ b/keyboards/keychron/q65/config.h @@ -40,12 +40,6 @@ #define SNLED27351_CURRENT_TUNE \ { 0xB8, 0xB8, 0x58, 0xB8, 0xB8, 0x58, 0xB8, 0xB8, 0x58, 0xB8, 0xB8, 0x58 } -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {4,4} } - /* Turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/q65/info.json b/keyboards/keychron/q65/info.json new file mode 100644 index 0000000000000000000000000000000000000000..5084aad927207f678edfc1fc7c84dda9cf50c5d3 --- /dev/null +++ b/keyboards/keychron/q65/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [4, 4] ] + } +} diff --git a/keyboards/keychron/q65/q65.c b/keyboards/keychron/q65/q65.c index 18fa8697c79db10ceef160e8c8a922c32c04bf2a..e293733bfe669a36170c8b038230b742efea914a 100644 --- a/keyboards/keychron/q65/q65.c +++ b/keyboards/keychron/q65/q65.c @@ -16,14 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/q7/config.h b/keyboards/keychron/q7/config.h index 00f09dd1bf8dcd53843041bc9d6412326b958d42..4a2a6af9e3a9ab4fd276cf1934926ac8b192b902 100644 --- a/keyboards/keychron/q7/config.h +++ b/keyboards/keychron/q7/config.h @@ -30,9 +30,3 @@ #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL #define SNLED27351_CURRENT_TUNE \ { 0xF8, 0xF8, 0x80, 0xF8, 0xF8, 0x80, 0xF8, 0xF8, 0x80, 0xF8, 0xF8, 0x80 } - -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {4,4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED \ No newline at end of file diff --git a/keyboards/keychron/q7/info.json b/keyboards/keychron/q7/info.json index d6d0c5d1fc995c7e33852cbf8762df9e80b350cb..6b8a94ce991397ed2f6a3f396336574f7ac348a8 100644 --- a/keyboards/keychron/q7/info.json +++ b/keyboards/keychron/q7/info.json @@ -4,6 +4,9 @@ "maintainer": "lalalademaxiya1", "bootloader": "stm32-dfu", "diode_direction": "ROW2COL", + "dip_switch": { + "matrix_grid": [ [4, 4] ] + }, "dynamic_keymap": { "layer_count": 5 }, diff --git a/keyboards/keychron/q7/q7.c b/keyboards/keychron/q7/q7.c index abd4ac11f03063aaf6a26c8f2052607709fb4aaa..d020f6ab43078f02df054c52608bafd0151454ff 100644 --- a/keyboards/keychron/q7/q7.c +++ b/keyboards/keychron/q7/q7.c @@ -16,14 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/q8/config.h b/keyboards/keychron/q8/config.h index 163d3775d9560ec8a79d4c067df2e18e707426c5..df9c1a9a3077ee04046a08275f6f952404a1d838 100644 --- a/keyboards/keychron/q8/config.h +++ b/keyboards/keychron/q8/config.h @@ -34,12 +34,6 @@ #define SNLED27351_CURRENT_TUNE \ { 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60 } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {4, 4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* Encoder Configuration */ #define ENCODER_DEFAULT_POS 0x3 diff --git a/keyboards/keychron/q8/info.json b/keyboards/keychron/q8/info.json index 7f98bf537c6252c860c237f05b3d0ba7d1947943..4d4677f8af6617d7851544e083f480d94e38b721 100644 --- a/keyboards/keychron/q8/info.json +++ b/keyboards/keychron/q8/info.json @@ -4,6 +4,9 @@ "maintainer": "lalalademaxiya1", "bootloader": "stm32-dfu", "diode_direction": "ROW2COL", + "dip_switch": { + "matrix_grid": [ [4, 4] ] + }, "dynamic_keymap": { "layer_count": 5 }, diff --git a/keyboards/keychron/q8/q8.c b/keyboards/keychron/q8/q8.c index a653bdc8b9340975eab0f4f405c7637a2f0e69b6..c28f992f8e7c7d62633d1b946ced7adf2256a5ed 100644 --- a/keyboards/keychron/q8/q8.c +++ b/keyboards/keychron/q8/q8.c @@ -16,14 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b111111111111111, - 0b111111111111111, - 0b111111111111111, - 0b111111111111111, - 0b111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/q9/config.h b/keyboards/keychron/q9/config.h index 8b5cc06d8bd93e3727ca4494aafaafff5da703b8..09b7be04596120f53a340cd9db71acf5d3ce594d 100644 --- a/keyboards/keychron/q9/config.h +++ b/keyboards/keychron/q9/config.h @@ -16,12 +16,6 @@ #pragma once -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { { 3, 4 } } - /* RGB Matrix Driver Configuration */ #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND diff --git a/keyboards/keychron/q9/info.json b/keyboards/keychron/q9/info.json index 5cc519c72041cb8aacc8091827874e58417fd499..5dd1134ba6b04e62e69f54287efe2f4945deac34 100644 --- a/keyboards/keychron/q9/info.json +++ b/keyboards/keychron/q9/info.json @@ -22,6 +22,9 @@ "nkro": true, "rgb_matrix": true }, + "dip_switch": { + "matrix_grid": [ [3, 4] ] + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], "rows": ["B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/q9/q9.c b/keyboards/keychron/q9/q9.c index 51dea886f1cad4b5ccb2aa91966ebb8b20943ec1..d020f6ab43078f02df054c52608bafd0151454ff 100644 --- a/keyboards/keychron/q9/q9.c +++ b/keyboards/keychron/q9/q9.c @@ -16,13 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b111111111111111, - 0b111111111111111, - 0b111111111111111, - 0b111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/q9_plus/config.h b/keyboards/keychron/q9_plus/config.h index cbd3c8b11b23d6e792886aa70b1d3b8be2fa25ea..16a274217d8939af0e134483a78e86aed23d14d1 100755 --- a/keyboards/keychron/q9_plus/config.h +++ b/keyboards/keychron/q9_plus/config.h @@ -16,12 +16,6 @@ #pragma once -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID {{ 3, 4 }} - /* RGB Matrix Driver Configuration */ #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND diff --git a/keyboards/keychron/q9_plus/info.json b/keyboards/keychron/q9_plus/info.json index 9f8703de37b1161e44eac6b327d20cc8292e2bb7..0abc5b591e51cff2615e1ce38871ef4c4aedb530 100755 --- a/keyboards/keychron/q9_plus/info.json +++ b/keyboards/keychron/q9_plus/info.json @@ -19,6 +19,9 @@ "nkro": true, "rgb_matrix": true }, + "dip_switch": { + "matrix_grid": [ [3, 4] ] + }, "matrix_pins": { "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], "rows": ["B3", "A15", "A14", "A13"] diff --git a/keyboards/keychron/q9_plus/q9_plus.c b/keyboards/keychron/q9_plus/q9_plus.c index 848117d323bea754b357d2853c8e3bad8dd23beb..77fd5f3cb003dd53680d4e764ba092441e390d42 100755 --- a/keyboards/keychron/q9_plus/q9_plus.c +++ b/keyboards/keychron/q9_plus/q9_plus.c @@ -16,13 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b111111111111111, - 0b111111111111111, - 0b111111111111111, - 0b111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { if (!dip_switch_update_user(index, active)) { diff --git a/keyboards/keychron/s1/config.h b/keyboards/keychron/s1/config.h index 8c9838952272b353740af9888dc653ecc679f988..adea1822e578524c1cbcddde8ceabbb1076545eb 100644 --- a/keyboards/keychron/s1/config.h +++ b/keyboards/keychron/s1/config.h @@ -16,12 +16,6 @@ #pragma once -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {5,4} } - /* EEPROM Driver Configuration */ #define WEAR_LEVELING_LOGICAL_SIZE 2048 #define WEAR_LEVELING_BACKING_SIZE (WEAR_LEVELING_LOGICAL_SIZE * 2) diff --git a/keyboards/keychron/s1/info.json b/keyboards/keychron/s1/info.json new file mode 100644 index 0000000000000000000000000000000000000000..7019c8755b15b24afa8699915befeaf4558e3cc4 --- /dev/null +++ b/keyboards/keychron/s1/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [5, 4] ] + } +} diff --git a/keyboards/keychron/s1/s1.c b/keyboards/keychron/s1/s1.c index d8488dd6ea6fa0617401073d13c644af42416caa..2f1b905505f404735454a12997ffddef7eccbb36 100644 --- a/keyboards/keychron/s1/s1.c +++ b/keyboards/keychron/s1/s1.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b111111111111111, - 0b111111111111111, - 0b111111111111111, - 0b111111111111111, - 0b111111111111111, - 0b111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/v1/config.h b/keyboards/keychron/v1/config.h index 84334306ddc731ff600325f4ac91f9a29d94fdf6..8fe64959375272484710d1e8df19146f3f07b08a 100644 --- a/keyboards/keychron/v1/config.h +++ b/keyboards/keychron/v1/config.h @@ -25,12 +25,6 @@ /* COL2ROW or ROW2COL */ #define DIODE_DIRECTION ROW2COL -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {5,4} } - /* RGB Matrix Driver Configuration */ #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND diff --git a/keyboards/keychron/v1/info.json b/keyboards/keychron/v1/info.json new file mode 100644 index 0000000000000000000000000000000000000000..7019c8755b15b24afa8699915befeaf4558e3cc4 --- /dev/null +++ b/keyboards/keychron/v1/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [5, 4] ] + } +} diff --git a/keyboards/keychron/v1/v1.c b/keyboards/keychron/v1/v1.c index 79c59191747569d07767bf627078f3cc76a5c14f..7f93b37bcc3be44c82ea3640a44b3523767d3b23 100644 --- a/keyboards/keychron/v1/v1.c +++ b/keyboards/keychron/v1/v1.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/v10/config.h b/keyboards/keychron/v10/config.h index 01d3b3e042123061b203b1b9751deb92bcef642f..719a5829fff471918beeb4c78aa68f383d26b3c3 100644 --- a/keyboards/keychron/v10/config.h +++ b/keyboards/keychron/v10/config.h @@ -44,12 +44,6 @@ #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL #define SNLED27351_CURRENT_TUNE { 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A, 0x98, 0x98, 0x4A } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {5,5} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* Disable RGB lighting when PC is in suspend */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/v10/info.json b/keyboards/keychron/v10/info.json new file mode 100644 index 0000000000000000000000000000000000000000..98a376bd205ec341e9b1b3ffcd15560b3bd7b759 --- /dev/null +++ b/keyboards/keychron/v10/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [5, 5] ] + } +} diff --git a/keyboards/keychron/v10/v10.c b/keyboards/keychron/v10/v10.c index 2e1e3f090f035b35039bbda410818551debb4eaa..1bde388544ccdd2c8a4dc0d379806d56dafea5ee 100644 --- a/keyboards/keychron/v10/v10.c +++ b/keyboards/keychron/v10/v10.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111011111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/v2/config.h b/keyboards/keychron/v2/config.h index f42e87368bda0016d3777c393f910028dfda9b7a..e90e60fa35b5e755b2a381d6ba14481e208eb4d1 100644 --- a/keyboards/keychron/v2/config.h +++ b/keyboards/keychron/v2/config.h @@ -32,12 +32,6 @@ #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {4,4} } - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/v2/info.json b/keyboards/keychron/v2/info.json new file mode 100644 index 0000000000000000000000000000000000000000..5084aad927207f678edfc1fc7c84dda9cf50c5d3 --- /dev/null +++ b/keyboards/keychron/v2/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [4, 4] ] + } +} diff --git a/keyboards/keychron/v2/v2.c b/keyboards/keychron/v2/v2.c index 7703c280df0854f8b146fc1b8cfdf34dc334b5ca..f2aed82fa91c38cb2fe974da46db7990582d529b 100644 --- a/keyboards/keychron/v2/v2.c +++ b/keyboards/keychron/v2/v2.c @@ -16,14 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b111111111111111, - 0b111111111111111, - 0b111111111111111, - 0b111111111111111, - 0b111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/v3/config.h b/keyboards/keychron/v3/config.h index 9532062aaa623bd2553dcca402bce13ac1184df7..6fe3e4dd9706ae9c1096fdadbd91912a9562e2fd 100644 --- a/keyboards/keychron/v3/config.h +++ b/keyboards/keychron/v3/config.h @@ -32,12 +32,6 @@ #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {5, 4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/v3/info.json b/keyboards/keychron/v3/info.json new file mode 100644 index 0000000000000000000000000000000000000000..7019c8755b15b24afa8699915befeaf4558e3cc4 --- /dev/null +++ b/keyboards/keychron/v3/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [5, 4] ] + } +} diff --git a/keyboards/keychron/v3/v3.c b/keyboards/keychron/v3/v3.c index 17ea8f0e9790c7bd2d5f90665c089aa66ec255f5..4452556ca6886da30c17d1a468b8ef81a964c476 100644 --- a/keyboards/keychron/v3/v3.c +++ b/keyboards/keychron/v3/v3.c @@ -16,19 +16,6 @@ #include "quantum.h" -// clang-format off - -const matrix_row_t matrix_mask[] = { - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111101111, -}; - -// clang-format on - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/v4/config.h b/keyboards/keychron/v4/config.h index 27147555ea9dc2d35310bf3c875e8d8c6147c19e..4c121c9edeeeadaecb886a4a36c84fbb13881fb2 100644 --- a/keyboards/keychron/v4/config.h +++ b/keyboards/keychron/v4/config.h @@ -29,12 +29,6 @@ #define SNLED27351_CURRENT_TUNE \ { 0xD0, 0xD0, 0x60, 0xD0, 0xD0, 0x60, 0xD0, 0xD0, 0x60, 0xD0, 0xD0, 0x60 } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {4,4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/v4/info.json b/keyboards/keychron/v4/info.json new file mode 100644 index 0000000000000000000000000000000000000000..5084aad927207f678edfc1fc7c84dda9cf50c5d3 --- /dev/null +++ b/keyboards/keychron/v4/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [4, 4] ] + } +} diff --git a/keyboards/keychron/v4/v4.c b/keyboards/keychron/v4/v4.c index 402eadf2d77a9a6fb0b57c86d9777dd73b706fad..d020f6ab43078f02df054c52608bafd0151454ff 100644 --- a/keyboards/keychron/v4/v4.c +++ b/keyboards/keychron/v4/v4.c @@ -16,14 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b11111111111111, - 0b11111111111111, - 0b11111111111111, - 0b11111111111111, - 0b11111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/v5/config.h b/keyboards/keychron/v5/config.h index 128c0aa9f19c367ac1f6c46bc45218319191de27..d49649c80903facb55ae94f90dc142f929ce435b 100644 --- a/keyboards/keychron/v5/config.h +++ b/keyboards/keychron/v5/config.h @@ -39,12 +39,6 @@ #define SNLED27351_CURRENT_TUNE \ { 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56, 0xB6, 0xB6, 0x56 } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {5, 4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/v5/info.json b/keyboards/keychron/v5/info.json new file mode 100644 index 0000000000000000000000000000000000000000..7019c8755b15b24afa8699915befeaf4558e3cc4 --- /dev/null +++ b/keyboards/keychron/v5/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [5, 4] ] + } +} diff --git a/keyboards/keychron/v5/v5.c b/keyboards/keychron/v5/v5.c index 6d87524b2333c16d80397c00d40912d61a798c0b..050ea18c0cff60cf10aa727557a4c4db29cf29fa 100644 --- a/keyboards/keychron/v5/v5.c +++ b/keyboards/keychron/v5/v5.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111111111, - 0b111111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/v6/config.h b/keyboards/keychron/v6/config.h index 129f3925bb7d10419cf44484d1f8d20098c2557f..ff16573b93ee6889f7bf652ce04dac4745d690c1 100644 --- a/keyboards/keychron/v6/config.h +++ b/keyboards/keychron/v6/config.h @@ -33,13 +33,8 @@ /* Limit the maximum brigtness current of colour white to 500mA */ #define SNLED27351_CURRENT_TUNE { 0xA8, 0xA8, 0x48, 0xA8, 0xA8, 0x48, 0xA8, 0xA8, 0x48, 0xA8, 0xA8, 0x48 } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {5, 4} } #define SCAN_COUNT_MAX 100 -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/v6/info.json b/keyboards/keychron/v6/info.json new file mode 100644 index 0000000000000000000000000000000000000000..7019c8755b15b24afa8699915befeaf4558e3cc4 --- /dev/null +++ b/keyboards/keychron/v6/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [5, 4] ] + } +} diff --git a/keyboards/keychron/v6/v6.c b/keyboards/keychron/v6/v6.c index 0f9305d2d05fe2d946d0ae328e28a7d399b14c2a..8aeab5e952ff39787f1ff0a1f334a8fa32cefe16 100644 --- a/keyboards/keychron/v6/v6.c +++ b/keyboards/keychron/v6/v6.c @@ -16,15 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111111111, - 0b11111111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/v7/config.h b/keyboards/keychron/v7/config.h index 500e4df30d5603cbe2004cbe525225405c85b8dc..40c4aee28b1ef1d6287ab2885c1e18baeccc1729 100644 --- a/keyboards/keychron/v7/config.h +++ b/keyboards/keychron/v7/config.h @@ -30,12 +30,6 @@ #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL #define SNLED27351_CURRENT_TUNE { 0xFC, 0xFC, 0x70, 0xFC, 0xFC, 0x70, 0xFC, 0xFC, 0x70, 0xFC, 0xFC, 0x70 } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {4,4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/v7/info.json b/keyboards/keychron/v7/info.json new file mode 100644 index 0000000000000000000000000000000000000000..5084aad927207f678edfc1fc7c84dda9cf50c5d3 --- /dev/null +++ b/keyboards/keychron/v7/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [4, 4] ] + } +} diff --git a/keyboards/keychron/v7/v7.c b/keyboards/keychron/v7/v7.c index e6b8309cae7c5f6878b98c8b31c46f290dd125c8..215b4922dc1241c850c4a675099a0612582f0427 100644 --- a/keyboards/keychron/v7/v7.c +++ b/keyboards/keychron/v7/v7.c @@ -16,14 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111111111, - 0b1111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) { diff --git a/keyboards/keychron/v8/config.h b/keyboards/keychron/v8/config.h index c9db5c07550ec779afb0213001b47c1d4c6d95b3..7b139dbd54aeb495dd60e347f1301f687a4acd3c 100644 --- a/keyboards/keychron/v8/config.h +++ b/keyboards/keychron/v8/config.h @@ -33,12 +33,6 @@ #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL #define SNLED27351_CURRENT_TUNE { 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60, 0xC4, 0xC4, 0x60 } -/* DIP switch */ -#define DIP_SWITCH_MATRIX_GRID { {4, 4} } - -/* Disable DIP switch in matrix data */ -#define MATRIX_MASKED - /* Turn off effects when suspended */ #define RGB_MATRIX_SLEEP diff --git a/keyboards/keychron/v8/info.json b/keyboards/keychron/v8/info.json new file mode 100644 index 0000000000000000000000000000000000000000..5084aad927207f678edfc1fc7c84dda9cf50c5d3 --- /dev/null +++ b/keyboards/keychron/v8/info.json @@ -0,0 +1,5 @@ +{ + "dip_switch": { + "matrix_grid": [ [4, 4] ] + } +} diff --git a/keyboards/keychron/v8/v8.c b/keyboards/keychron/v8/v8.c index 38d3cada17af7a1d57b62615ea2c3254b7ca8d54..5cc6c0782c7dcf427c44edc9a9d1d11c13708a81 100644 --- a/keyboards/keychron/v8/v8.c +++ b/keyboards/keychron/v8/v8.c @@ -16,14 +16,6 @@ #include "quantum.h" -const matrix_row_t matrix_mask[] = { - 0b111111111111111, - 0b111111111111111, - 0b111111111111111, - 0b111111111111111, - 0b111111111101111, -}; - #ifdef DIP_SWITCH_ENABLE bool dip_switch_update_kb(uint8_t index, bool active) {