From 137938b67afbf35fd34f2e5cbe3c5c6367a1d0cc Mon Sep 17 00:00:00 2001
From: Joel Challis <git@zvecr.com>
Date: Fri, 9 Feb 2024 06:56:13 +0000
Subject: Migrate dip switch config to info.json - keychron (#23037)

---
 keyboards/keychron/q2/config.h  | 6 ------
 keyboards/keychron/q2/info.json | 3 +++
 keyboards/keychron/q2/q2.c      | 8 --------
 3 files changed, 3 insertions(+), 14 deletions(-)

(limited to 'keyboards/keychron/q2')

diff --git a/keyboards/keychron/q2/config.h b/keyboards/keychron/q2/config.h
index d0beff49f0..e55d78afd5 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 47d9aa83b1..e18c9b2448 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 7ff85556de..1dd839eccc 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) {
-- 
cgit v1.2.3