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/q12/config.h  |  8 --------
 keyboards/keychron/q12/info.json |  5 +++++
 keyboards/keychron/q12/q12.c     | 10 ----------
 3 files changed, 5 insertions(+), 18 deletions(-)
 create mode 100644 keyboards/keychron/q12/info.json

(limited to 'keyboards/keychron/q12')

diff --git a/keyboards/keychron/q12/config.h b/keyboards/keychron/q12/config.h
index 2f6a277439..e13238d9ee 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 0000000000..7019c8755b
--- /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 3d8eab5659..9a019af6ac 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)) {
-- 
cgit v1.2.3