From 1022afa6c24a64c78d1c9be99a695ff5335876f7 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 11 Mar 2023 04:59:07 +1100
Subject: Move matrix config to info.json, part 8 (#20030)

---
 keyboards/keychron/q8/ansi/info.json         | 5 +++++
 keyboards/keychron/q8/ansi_encoder/info.json | 5 +++++
 keyboards/keychron/q8/config.h               | 9 ---------
 keyboards/keychron/q8/iso/info.json          | 5 +++++
 keyboards/keychron/q8/iso_encoder/info.json  | 5 +++++
 5 files changed, 20 insertions(+), 9 deletions(-)

(limited to 'keyboards/keychron/q8')

diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json
index b80cb42432..96efa35d26 100644
--- a/keyboards/keychron/q8/ansi/info.json
+++ b/keyboards/keychron/q8/ansi/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0180",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json
index b75a878198..071a7a25f9 100644
--- a/keyboards/keychron/q8/ansi_encoder/info.json
+++ b/keyboards/keychron/q8/ansi_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0181",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "A10"}
diff --git a/keyboards/keychron/q8/config.h b/keyboards/keychron/q8/config.h
index 017f463d84..e0f6c673a5 100644
--- a/keyboards/keychron/q8/config.h
+++ b/keyboards/keychron/q8/config.h
@@ -16,15 +16,6 @@
 
 #pragma once
 
-/* COL2ROW or ROW2COL */
-#define DIODE_DIRECTION ROW2COL
-
-/* Key matrix pins */
-#define MATRIX_ROW_PINS \
-    { B4, B3, A15, A14, A13 }
-#define MATRIX_COL_PINS \
-    { C14, C15, A0, A1, A2, A3, A4, A5, A6, A7, B0, B1, A8, A9, H3 }
-
 /* If PH3 used with a stronger pull resistor then the following definition needs be included */
 // #define MATRIX_UNSELECT_DRIVE_HIGH
 
diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json
index c5a5b7653e..e716b347a0 100644
--- a/keyboards/keychron/q8/iso/info.json
+++ b/keyboards/keychron/q8/iso/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0182",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "processor": "STM32L432",
     "bootloader": "stm32-dfu",
     "layouts": {
diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index 45181452be..f70548f3c4 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x0183",
         "device_version": "1.0.0"
     },
+    "matrix_pins": {
+        "cols": ["C14", "C15", "A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "A8", "A9", "H3"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "B5", "pin_b": "A10"}
-- 
cgit v1.2.3


From 9dbee3e23d28e5f61384bbb5650505a572022341 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Thu, 16 Mar 2023 20:18:33 +1100
Subject: Remove useless "ifdef KEYBOARD_*" (#20078)

Co-authored-by: Nick Brassel <nick@tzarc.org>
---
 keyboards/keychron/q8/ansi/ansi.h                 | 19 ---------------
 keyboards/keychron/q8/ansi_encoder/ansi_encoder.h | 19 ---------------
 keyboards/keychron/q8/iso/iso.h                   | 19 ---------------
 keyboards/keychron/q8/iso_encoder/iso_encoder.h   | 19 ---------------
 keyboards/keychron/q8/q8.c                        |  2 +-
 keyboards/keychron/q8/q8.h                        | 29 -----------------------
 6 files changed, 1 insertion(+), 106 deletions(-)
 delete mode 100644 keyboards/keychron/q8/ansi/ansi.h
 delete mode 100644 keyboards/keychron/q8/ansi_encoder/ansi_encoder.h
 delete mode 100644 keyboards/keychron/q8/iso/iso.h
 delete mode 100644 keyboards/keychron/q8/iso_encoder/iso_encoder.h
 delete mode 100644 keyboards/keychron/q8/q8.h

(limited to 'keyboards/keychron/q8')

diff --git a/keyboards/keychron/q8/ansi/ansi.h b/keyboards/keychron/q8/ansi/ansi.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/ansi/ansi.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h b/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/ansi_encoder/ansi_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/iso/iso.h b/keyboards/keychron/q8/iso/iso.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/iso/iso.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/iso_encoder/iso_encoder.h b/keyboards/keychron/q8/iso_encoder/iso_encoder.h
deleted file mode 100644
index db52563dc4..0000000000
--- a/keyboards/keychron/q8/iso_encoder/iso_encoder.h
+++ /dev/null
@@ -1,19 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
diff --git a/keyboards/keychron/q8/q8.c b/keyboards/keychron/q8/q8.c
index d86ced3d1b..a653bdc8b9 100644
--- a/keyboards/keychron/q8/q8.c
+++ b/keyboards/keychron/q8/q8.c
@@ -14,7 +14,7 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#include "q8.h"
+#include "quantum.h"
 
 const matrix_row_t matrix_mask[] = {
     0b111111111111111,
diff --git a/keyboards/keychron/q8/q8.h b/keyboards/keychron/q8/q8.h
deleted file mode 100644
index 02981db19c..0000000000
--- a/keyboards/keychron/q8/q8.h
+++ /dev/null
@@ -1,29 +0,0 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
- *
- * 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 <http://www.gnu.org/licenses/>.
- */
-
-#pragma once
-
-#include "quantum.h"
-
-#if   defined(KEYBOARD_keychron_q8_ansi)
-#    include "ansi.h"
-#elif defined(KEYBOARD_keychron_q8_ansi_encoder)
-#    include "ansi_encoder.h"
-#elif defined(KEYBOARD_keychron_q8_iso)
-#    include "iso.h"
-#elif defined(KEYBOARD_keychron_q8_iso_encoder)
-#    include "iso_encoder.h"
-#endif
-- 
cgit v1.2.3


From 522048725f6b076bdad1251243c65dd2acf6595d Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Sat, 8 Apr 2023 18:08:08 +1000
Subject: Move `RGB_MATRIX_DRIVER` to data driven (#20350)

---
 keyboards/keychron/q8/ansi/info.json         | 3 +++
 keyboards/keychron/q8/ansi/rules.mk          | 1 -
 keyboards/keychron/q8/ansi_encoder/info.json | 3 +++
 keyboards/keychron/q8/ansi_encoder/rules.mk  | 1 -
 keyboards/keychron/q8/iso/info.json          | 3 +++
 keyboards/keychron/q8/iso/rules.mk           | 1 -
 keyboards/keychron/q8/iso_encoder/info.json  | 3 +++
 keyboards/keychron/q8/iso_encoder/rules.mk   | 1 -
 8 files changed, 12 insertions(+), 4 deletions(-)

(limited to 'keyboards/keychron/q8')

diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json
index 96efa35d26..194b7ee983 100644
--- a/keyboards/keychron/q8/ansi/info.json
+++ b/keyboards/keychron/q8/ansi/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0180",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "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/q8/ansi/rules.mk b/keyboards/keychron/q8/ansi/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q8/ansi/rules.mk
+++ b/keyboards/keychron/q8/ansi/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json
index 071a7a25f9..09d3c183e2 100644
--- a/keyboards/keychron/q8/ansi_encoder/info.json
+++ b/keyboards/keychron/q8/ansi_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0181",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "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/q8/ansi_encoder/rules.mk b/keyboards/keychron/q8/ansi_encoder/rules.mk
index d0d74a11b5..e94a89ab85 100644
--- a/keyboards/keychron/q8/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q8/ansi_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json
index e716b347a0..3502848441 100644
--- a/keyboards/keychron/q8/iso/info.json
+++ b/keyboards/keychron/q8/iso/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0182",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "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/q8/iso/rules.mk b/keyboards/keychron/q8/iso/rules.mk
index 345807d824..2b4a67b1ee 100644
--- a/keyboards/keychron/q8/iso/rules.mk
+++ b/keyboards/keychron/q8/iso/rules.mk
@@ -12,7 +12,6 @@ RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
 AUDIO_ENABLE = no           # Audio output
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index f70548f3c4..721ab371f0 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -8,6 +8,9 @@
         "pid": "0x0183",
         "device_version": "1.0.0"
     },
+    "rgb_matrix": {
+        "driver": "CKLED2001"
+    },
     "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/q8/iso_encoder/rules.mk b/keyboards/keychron/q8/iso_encoder/rules.mk
index 5240004b8c..6a772965ff 100644
--- a/keyboards/keychron/q8/iso_encoder/rules.mk
+++ b/keyboards/keychron/q8/iso_encoder/rules.mk
@@ -13,7 +13,6 @@ AUDIO_ENABLE = no           # Audio output
 ENCODER_ENABLE = yes        # Enable Encoder
 DIP_SWITCH_ENABLE = yes
 RGB_MATRIX_ENABLE = yes
-RGB_MATRIX_DRIVER = CKLED2001
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 
-- 
cgit v1.2.3


From c9f619124d41637ece157570703423c3890cb6c2 Mon Sep 17 00:00:00 2001
From: Nick Brassel <nick@tzarc.org>
Date: Sun, 16 Apr 2023 01:18:44 +1000
Subject: Encodermap direction define. (#20454)

---
 keyboards/keychron/q8/ansi_encoder/keymaps/default/keymap.c  | 2 +-
 keyboards/keychron/q8/ansi_encoder/keymaps/keychron/keymap.c | 2 +-
 keyboards/keychron/q8/ansi_encoder/keymaps/via/keymap.c      | 2 +-
 keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c   | 2 +-
 keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c  | 2 +-
 keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c       | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

(limited to 'keyboards/keychron/q8')

diff --git a/keyboards/keychron/q8/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q8/ansi_encoder/keymaps/default/keymap.c
index 248ea1fe4a..a86ae6d8cf 100644
--- a/keyboards/keychron/q8/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q8/ansi_encoder/keymaps/default/keymap.c
@@ -67,7 +67,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] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [_FN1]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
diff --git a/keyboards/keychron/q8/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q8/ansi_encoder/keymaps/keychron/keymap.c
index 1ece0b6de7..bb5c406046 100644
--- a/keyboards/keychron/q8/ansi_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q8/ansi_encoder/keymaps/keychron/keymap.c
@@ -65,7 +65,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] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [_FN1]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
diff --git a/keyboards/keychron/q8/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q8/ansi_encoder/keymaps/via/keymap.c
index 248ea1fe4a..a86ae6d8cf 100644
--- a/keyboards/keychron/q8/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q8/ansi_encoder/keymaps/via/keymap.c
@@ -67,7 +67,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] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [_FN1]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c b/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c
index a779fdc130..7db63d4118 100644
--- a/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q8/iso_encoder/keymaps/default/keymap.c
@@ -67,7 +67,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] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [_FN1]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c
index 4884aeaeae..b3abda2975 100644
--- a/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q8/iso_encoder/keymaps/keychron/keymap.c
@@ -65,7 +65,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] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [_FN1]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
diff --git a/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c b/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c
index da409a551d..8b66a40c6b 100644
--- a/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q8/iso_encoder/keymaps/via/keymap.c
@@ -67,7 +67,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] = {
     [MAC_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [WIN_BASE] = {ENCODER_CCW_CW(KC_VOLD, KC_VOLU)},
     [_FN1]   = {ENCODER_CCW_CW(RGB_VAD, RGB_VAI)},
-- 
cgit v1.2.3


From 79aa31994698c9050141714f77c0177edbcd9488 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Tue, 2 May 2023 08:25:15 +1000
Subject: `info.json` whitespace cleanups (#20651)

---
 keyboards/keychron/q8/ansi/info.json         | 46 ++++++++++++++--------------
 keyboards/keychron/q8/ansi_encoder/info.json | 46 ++++++++++++++--------------
 keyboards/keychron/q8/iso/info.json          | 46 ++++++++++++++--------------
 keyboards/keychron/q8/iso_encoder/info.json  | 46 ++++++++++++++--------------
 4 files changed, 92 insertions(+), 92 deletions(-)

(limited to 'keyboards/keychron/q8')

diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json
index 194b7ee983..7ec38683c5 100644
--- a/keyboards/keychron/q8/ansi/info.json
+++ b/keyboards/keychron/q8/ansi/info.json
@@ -31,11 +31,11 @@
                 {"matrix":[0, 7], "x":9.5, "y":0.25},
                 {"matrix":[0, 8], "x":10.5, "y":0.25},
                 {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0,10], "x":12.5, "y":0.25},
-                {"matrix":[0,11], "x":13.5, "y":0},
-                {"matrix":[0,12], "x":14.5, "y":0.25},
-                {"matrix":[0,13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0,14], "x":18, "y":0},
+                {"matrix":[0, 10], "x":12.5, "y":0.25},
+                {"matrix":[0, 11], "x":13.5, "y":0},
+                {"matrix":[0, 12], "x":14.5, "y":0.25},
+                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
+                {"matrix":[0, 14], "x":18, "y":0},
 
                 {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
                 {"matrix":[1, 1], "x":2, "y":1.25},
@@ -47,11 +47,11 @@
                 {"matrix":[1, 7], "x":10, "y":1.25},
                 {"matrix":[1, 8], "x":11, "y":1.25},
                 {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1,10], "x":13.25, "y":1.25},
-                {"matrix":[1,11], "x":14.25, "y":1.25},
-                {"matrix":[1,12], "x":15.25, "y":1.25},
-                {"matrix":[1,13], "x":16.25, "y":1.25, "w":1.5},
-                {"matrix":[1,14], "x":18.25, "y":1.5},
+                {"matrix":[1, 10], "x":13.25, "y":1.25},
+                {"matrix":[1, 11], "x":14.25, "y":1.25},
+                {"matrix":[1, 12], "x":15.25, "y":1.25},
+                {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5},
+                {"matrix":[1, 14], "x":18.25, "y":1.5},
 
                 {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
                 {"matrix":[2, 1], "x":2, "y":2.25},
@@ -62,11 +62,11 @@
                 {"matrix":[2, 7], "x":9.25, "y":2.25},
                 {"matrix":[2, 8], "x":10.25, "y":2.25},
                 {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2,10], "x":12.25, "y":2.25},
-                {"matrix":[2,11], "x":13.75, "y":2.25},
-                {"matrix":[2,12], "x":14.75, "y":2.25},
-                {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25},
-                {"matrix":[2,14], "x":18.5, "y":2.5},
+                {"matrix":[2, 10], "x":12.25, "y":2.25},
+                {"matrix":[2, 11], "x":13.75, "y":2.25},
+                {"matrix":[2, 12], "x":14.75, "y":2.25},
+                {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25},
+                {"matrix":[2, 14], "x":18.5, "y":2.5},
 
                 {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
                 {"matrix":[3, 2], "x":2.25, "y":3.25},
@@ -77,11 +77,11 @@
                 {"matrix":[3, 7], "x":8.5, "y":3.25},
                 {"matrix":[3, 8], "x":9.5, "y":3.25},
                 {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3,10], "x":11.5, "y":3.25},
-                {"matrix":[3,11], "x":12.5, "y":3.25},
-                {"matrix":[3,12], "x":14.25, "y":3.25},
-                {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3,14], "x":17.25, "y":3.5},
+                {"matrix":[3, 10], "x":11.5, "y":3.25},
+                {"matrix":[3, 11], "x":12.5, "y":3.25},
+                {"matrix":[3, 12], "x":14.25, "y":3.25},
+                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
+                {"matrix":[3, 14], "x":17.25, "y":3.5},
 
                 {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
                 {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
@@ -91,9 +91,9 @@
                 {"matrix":[4, 7], "x":8.75, "y":4.25},
                 {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
                 {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4,12], "x":16.25, "y":4.5},
-                {"matrix":[4,13], "x":17.25, "y":4.5},
-                {"matrix":[4,14], "x":18.25, "y":4.5}
+                {"matrix":[4, 12], "x":16.25, "y":4.5},
+                {"matrix":[4, 13], "x":17.25, "y":4.5},
+                {"matrix":[4, 14], "x":18.25, "y":4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json
index 09d3c183e2..c506224a32 100644
--- a/keyboards/keychron/q8/ansi_encoder/info.json
+++ b/keyboards/keychron/q8/ansi_encoder/info.json
@@ -36,11 +36,11 @@
                 {"matrix":[0, 7], "x":9.5, "y":0.25},
                 {"matrix":[0, 8], "x":10.5, "y":0.25},
                 {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0,10], "x":12.5, "y":0.25},
-                {"matrix":[0,11], "x":13.5, "y":0},
-                {"matrix":[0,12], "x":14.5, "y":0.25},
-                {"matrix":[0,13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0,14], "x":18, "y":0},
+                {"matrix":[0, 10], "x":12.5, "y":0.25},
+                {"matrix":[0, 11], "x":13.5, "y":0},
+                {"matrix":[0, 12], "x":14.5, "y":0.25},
+                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
+                {"matrix":[0, 14], "x":18, "y":0},
 
                 {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
                 {"matrix":[1, 1], "x":2, "y":1.25},
@@ -52,11 +52,11 @@
                 {"matrix":[1, 7], "x":10, "y":1.25},
                 {"matrix":[1, 8], "x":11, "y":1.25},
                 {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1,10], "x":13.25, "y":1.25},
-                {"matrix":[1,11], "x":14.25, "y":1.25},
-                {"matrix":[1,12], "x":15.25, "y":1.25},
-                {"matrix":[1,13], "x":16.25, "y":1.25, "w":1.5},
-                {"matrix":[1,14], "x":18.25, "y":1.5},
+                {"matrix":[1, 10], "x":13.25, "y":1.25},
+                {"matrix":[1, 11], "x":14.25, "y":1.25},
+                {"matrix":[1, 12], "x":15.25, "y":1.25},
+                {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5},
+                {"matrix":[1, 14], "x":18.25, "y":1.5},
 
                 {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
                 {"matrix":[2, 1], "x":2, "y":2.25},
@@ -67,11 +67,11 @@
                 {"matrix":[2, 7], "x":9.25, "y":2.25},
                 {"matrix":[2, 8], "x":10.25, "y":2.25},
                 {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2,10], "x":12.25, "y":2.25},
-                {"matrix":[2,11], "x":13.75, "y":2.25},
-                {"matrix":[2,12], "x":14.75, "y":2.25},
-                {"matrix":[2,13], "x":15.75, "y":2.25, "w":2.25},
-                {"matrix":[2,14], "x":18.5, "y":2.5},
+                {"matrix":[2, 10], "x":12.25, "y":2.25},
+                {"matrix":[2, 11], "x":13.75, "y":2.25},
+                {"matrix":[2, 12], "x":14.75, "y":2.25},
+                {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25},
+                {"matrix":[2, 14], "x":18.5, "y":2.5},
 
                 {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
                 {"matrix":[3, 2], "x":2.25, "y":3.25},
@@ -82,11 +82,11 @@
                 {"matrix":[3, 7], "x":8.5, "y":3.25},
                 {"matrix":[3, 8], "x":9.5, "y":3.25},
                 {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3,10], "x":11.5, "y":3.25},
-                {"matrix":[3,11], "x":12.5, "y":3.25},
-                {"matrix":[3,12], "x":14.25, "y":3.25},
-                {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3,14], "x":17.25, "y":3.5},
+                {"matrix":[3, 10], "x":11.5, "y":3.25},
+                {"matrix":[3, 11], "x":12.5, "y":3.25},
+                {"matrix":[3, 12], "x":14.25, "y":3.25},
+                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
+                {"matrix":[3, 14], "x":17.25, "y":3.5},
 
                 {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
                 {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
@@ -96,9 +96,9 @@
                 {"matrix":[4, 7], "x":8.75, "y":4.25},
                 {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
                 {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4,12], "x":16.25, "y":4.5},
-                {"matrix":[4,13], "x":17.25, "y":4.5},
-                {"matrix":[4,14], "x":18.25, "y":4.5}
+                {"matrix":[4, 12], "x":16.25, "y":4.5},
+                {"matrix":[4, 13], "x":17.25, "y":4.5},
+                {"matrix":[4, 14], "x":18.25, "y":4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json
index 3502848441..60b4006150 100644
--- a/keyboards/keychron/q8/iso/info.json
+++ b/keyboards/keychron/q8/iso/info.json
@@ -31,11 +31,11 @@
                 {"matrix":[0, 7], "x":9.5, "y":0.25},
                 {"matrix":[0, 8], "x":10.5, "y":0.25},
                 {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0,10], "x":12.5, "y":0.25},
-                {"matrix":[0,11], "x":13.5, "y":0},
-                {"matrix":[0,12], "x":14.5, "y":0.25},
-                {"matrix":[0,13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0,14], "x":18, "y":0.25},
+                {"matrix":[0, 10], "x":12.5, "y":0.25},
+                {"matrix":[0, 11], "x":13.5, "y":0},
+                {"matrix":[0, 12], "x":14.5, "y":0.25},
+                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
+                {"matrix":[0, 14], "x":18, "y":0.25},
 
                 {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
                 {"matrix":[1, 1], "x":2, "y":1.25},
@@ -47,10 +47,10 @@
                 {"matrix":[1, 7], "x":10, "y":1.25},
                 {"matrix":[1, 8], "x":11, "y":1.25},
                 {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1,10], "x":13.25, "y":1.25},
-                {"matrix":[1,11], "x":14.25, "y":1.25},
-                {"matrix":[1,12], "x":15.25, "y":1.25},
-                {"matrix":[1,14], "x":18.25, "y":1.5},
+                {"matrix":[1, 10], "x":13.25, "y":1.25},
+                {"matrix":[1, 11], "x":14.25, "y":1.25},
+                {"matrix":[1, 12], "x":15.25, "y":1.25},
+                {"matrix":[1, 14], "x":18.25, "y":1.5},
 
                 {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
                 {"matrix":[2, 1], "x":2, "y":2.25},
@@ -61,12 +61,12 @@
                 {"matrix":[2, 7], "x":9.25, "y":2.25},
                 {"matrix":[2, 8], "x":10.25, "y":2.25},
                 {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2,10], "x":12.25, "y":2.25},
-                {"matrix":[2,11], "x":13.5, "y":2.25},
-                {"matrix":[2,12], "x":14.5, "y":2.25},
-                {"matrix":[2,13], "x":15.5, "y":2.25},
-                {"matrix":[1,13], "x":16.5, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2,14], "x":18.5, "y":2.5},
+                {"matrix":[2, 10], "x":12.25, "y":2.25},
+                {"matrix":[2, 11], "x":13.5, "y":2.25},
+                {"matrix":[2, 12], "x":14.5, "y":2.25},
+                {"matrix":[2, 13], "x":15.5, "y":2.25},
+                {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2},
+                {"matrix":[2, 14], "x":18.5, "y":2.5},
 
                 {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
                 {"matrix":[3, 1], "x":1.25, "y":3.25},
@@ -78,11 +78,11 @@
                 {"matrix":[3, 7], "x":8.5, "y":3.25},
                 {"matrix":[3, 8], "x":9.5, "y":3.25},
                 {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3,10], "x":11.5, "y":3.25},
-                {"matrix":[3,11], "x":12.5, "y":3.25},
-                {"matrix":[3,12], "x":14.25, "y":3.25},
-                {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3,14], "x":17.25, "y":3.5},
+                {"matrix":[3, 10], "x":11.5, "y":3.25},
+                {"matrix":[3, 11], "x":12.5, "y":3.25},
+                {"matrix":[3, 12], "x":14.25, "y":3.25},
+                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
+                {"matrix":[3, 14], "x":17.25, "y":3.5},
 
                 {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
                 {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
@@ -92,9 +92,9 @@
                 {"matrix":[4, 7], "x":8.75, "y":4.25},
                 {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
                 {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4,12], "x":16.25, "y":4.5},
-                {"matrix":[4,13], "x":17.25, "y":4.5},
-                {"matrix":[4,14], "x":18.25, "y":4.5}
+                {"matrix":[4, 12], "x":16.25, "y":4.5},
+                {"matrix":[4, 13], "x":17.25, "y":4.5},
+                {"matrix":[4, 14], "x":18.25, "y":4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index 721ab371f0..ebcf8a8ee0 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -36,11 +36,11 @@
                 {"matrix":[0, 7], "x":9.5, "y":0.25},
                 {"matrix":[0, 8], "x":10.5, "y":0.25},
                 {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0,10], "x":12.5, "y":0.25},
-                {"matrix":[0,11], "x":13.5, "y":0},
-                {"matrix":[0,12], "x":14.5, "y":0.25},
-                {"matrix":[0,13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0,14], "x":18, "y":0.25},
+                {"matrix":[0, 10], "x":12.5, "y":0.25},
+                {"matrix":[0, 11], "x":13.5, "y":0},
+                {"matrix":[0, 12], "x":14.5, "y":0.25},
+                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
+                {"matrix":[0, 14], "x":18, "y":0.25},
 
                 {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
                 {"matrix":[1, 1], "x":2, "y":1.25},
@@ -52,10 +52,10 @@
                 {"matrix":[1, 7], "x":10, "y":1.25},
                 {"matrix":[1, 8], "x":11, "y":1.25},
                 {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1,10], "x":13.25, "y":1.25},
-                {"matrix":[1,11], "x":14.25, "y":1.25},
-                {"matrix":[1,12], "x":15.25, "y":1.25},
-                {"matrix":[1,14], "x":18.25, "y":1.5},
+                {"matrix":[1, 10], "x":13.25, "y":1.25},
+                {"matrix":[1, 11], "x":14.25, "y":1.25},
+                {"matrix":[1, 12], "x":15.25, "y":1.25},
+                {"matrix":[1, 14], "x":18.25, "y":1.5},
 
                 {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
                 {"matrix":[2, 1], "x":2, "y":2.25},
@@ -66,12 +66,12 @@
                 {"matrix":[2, 7], "x":9.25, "y":2.25},
                 {"matrix":[2, 8], "x":10.25, "y":2.25},
                 {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2,10], "x":12.25, "y":2.25},
-                {"matrix":[2,11], "x":13.5, "y":2.25},
-                {"matrix":[2,12], "x":14.5, "y":2.25},
-                {"matrix":[2,13], "x":15.5, "y":2.25},
-                {"matrix":[1,13], "x":16.5, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2,14], "x":18.5, "y":2.5},
+                {"matrix":[2, 10], "x":12.25, "y":2.25},
+                {"matrix":[2, 11], "x":13.5, "y":2.25},
+                {"matrix":[2, 12], "x":14.5, "y":2.25},
+                {"matrix":[2, 13], "x":15.5, "y":2.25},
+                {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2},
+                {"matrix":[2, 14], "x":18.5, "y":2.5},
 
                 {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
                 {"matrix":[3, 1], "x":1.25, "y":3.25},
@@ -83,11 +83,11 @@
                 {"matrix":[3, 7], "x":8.5, "y":3.25},
                 {"matrix":[3, 8], "x":9.5, "y":3.25},
                 {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3,10], "x":11.5, "y":3.25},
-                {"matrix":[3,11], "x":12.5, "y":3.25},
-                {"matrix":[3,12], "x":14.25, "y":3.25},
-                {"matrix":[3,13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3,14], "x":17.25, "y":3.5},
+                {"matrix":[3, 10], "x":11.5, "y":3.25},
+                {"matrix":[3, 11], "x":12.5, "y":3.25},
+                {"matrix":[3, 12], "x":14.25, "y":3.25},
+                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
+                {"matrix":[3, 14], "x":17.25, "y":3.5},
 
                 {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
                 {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
@@ -97,9 +97,9 @@
                 {"matrix":[4, 7], "x":8.75, "y":4.25},
                 {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
                 {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4,12], "x":16.25, "y":4.5},
-                {"matrix":[4,13], "x":17.25, "y":4.5},
-                {"matrix":[4,14], "x":18.25, "y":4.5}
+                {"matrix":[4, 12], "x":16.25, "y":4.5},
+                {"matrix":[4, 13], "x":17.25, "y":4.5},
+                {"matrix":[4, 14], "x":18.25, "y":4.5}
             ]
         }
     }
-- 
cgit v1.2.3


From a5e46d80822797cd2e0dc2a2b81c4ccce9e167f4 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Wed, 3 May 2023 12:19:34 +1000
Subject: More `info.json` whitespace cleanups (#20665)

---
 keyboards/keychron/q8/ansi/info.json         | 138 +++++++++++++-------------
 keyboards/keychron/q8/ansi_encoder/info.json | 138 +++++++++++++-------------
 keyboards/keychron/q8/iso/info.json          | 140 +++++++++++++--------------
 keyboards/keychron/q8/iso_encoder/info.json  | 140 +++++++++++++--------------
 4 files changed, 278 insertions(+), 278 deletions(-)

(limited to 'keyboards/keychron/q8')

diff --git a/keyboards/keychron/q8/ansi/info.json b/keyboards/keychron/q8/ansi/info.json
index 7ec38683c5..6ef7d5fee1 100644
--- a/keyboards/keychron/q8/ansi/info.json
+++ b/keyboards/keychron/q8/ansi/info.json
@@ -21,79 +21,79 @@
     "layouts": {
         "LAYOUT_ansi_69": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":9.25, "y":2.25},
-                {"matrix":[2, 8], "x":10.25, "y":2.25},
-                {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2, 10], "x":12.25, "y":2.25},
-                {"matrix":[2, 11], "x":13.75, "y":2.25},
-                {"matrix":[2, 12], "x":14.75, "y":2.25},
-                {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "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":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "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": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q8/ansi_encoder/info.json b/keyboards/keychron/q8/ansi_encoder/info.json
index c506224a32..a8838ae8d1 100644
--- a/keyboards/keychron/q8/ansi_encoder/info.json
+++ b/keyboards/keychron/q8/ansi_encoder/info.json
@@ -26,79 +26,79 @@
     "layouts": {
         "LAYOUT_ansi_69": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 13], "x":16.25, "y":1.25, "w":1.5},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 13], "x": 16.25, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":9.25, "y":2.25},
-                {"matrix":[2, 8], "x":10.25, "y":2.25},
-                {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2, 10], "x":12.25, "y":2.25},
-                {"matrix":[2, 11], "x":13.75, "y":2.25},
-                {"matrix":[2, 12], "x":14.75, "y":2.25},
-                {"matrix":[2, 13], "x":15.75, "y":2.25, "w":2.25},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.75, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.75, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.75, "y": 2.25, "w": 2.25},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":2.25},
-                {"matrix":[3, 2], "x":2.25, "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":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 2.25},
+                {"matrix": [3, 2], "x": 2.25, "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": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q8/iso/info.json b/keyboards/keychron/q8/iso/info.json
index 60b4006150..bf7405cce2 100644
--- a/keyboards/keychron/q8/iso/info.json
+++ b/keyboards/keychron/q8/iso/info.json
@@ -21,80 +21,80 @@
     "layouts": {
         "LAYOUT_iso_70": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0.25},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0.25},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":9.25, "y":2.25},
-                {"matrix":[2, 8], "x":10.25, "y":2.25},
-                {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2, 10], "x":12.25, "y":2.25},
-                {"matrix":[2, 11], "x":13.5, "y":2.25},
-                {"matrix":[2, 12], "x":14.5, "y":2.25},
-                {"matrix":[2, 13], "x":15.5, "y":2.25},
-                {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.5, "y": 2.25},
+                {"matrix": [1, 13], "x": 16.5, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "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":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "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": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
diff --git a/keyboards/keychron/q8/iso_encoder/info.json b/keyboards/keychron/q8/iso_encoder/info.json
index ebcf8a8ee0..f55ccaf202 100644
--- a/keyboards/keychron/q8/iso_encoder/info.json
+++ b/keyboards/keychron/q8/iso_encoder/info.json
@@ -26,80 +26,80 @@
     "layouts": {
         "LAYOUT_iso_70": {
             "layout": [
-                {"matrix":[0, 0], "x":0.75, "y":0.25},
-                {"matrix":[0, 1], "x":1.75, "y":0.25},
-                {"matrix":[0, 2], "x":2.75, "y":0},
-                {"matrix":[0, 3], "x":3.75, "y":0.25},
-                {"matrix":[0, 4], "x":4.75, "y":0.25},
-                {"matrix":[0, 5], "x":5.75, "y":0.25},
-                {"matrix":[0, 6], "x":6.75, "y":0.25},
-                {"matrix":[0, 7], "x":9.5, "y":0.25},
-                {"matrix":[0, 8], "x":10.5, "y":0.25},
-                {"matrix":[0, 9], "x":11.5, "y":0.25},
-                {"matrix":[0, 10], "x":12.5, "y":0.25},
-                {"matrix":[0, 11], "x":13.5, "y":0},
-                {"matrix":[0, 12], "x":14.5, "y":0.25},
-                {"matrix":[0, 13], "x":15.5, "y":0.25, "w":2},
-                {"matrix":[0, 14], "x":18, "y":0.25},
+                {"matrix": [0, 0], "x": 0.75, "y": 0.25},
+                {"matrix": [0, 1], "x": 1.75, "y": 0.25},
+                {"matrix": [0, 2], "x": 2.75, "y": 0},
+                {"matrix": [0, 3], "x": 3.75, "y": 0.25},
+                {"matrix": [0, 4], "x": 4.75, "y": 0.25},
+                {"matrix": [0, 5], "x": 5.75, "y": 0.25},
+                {"matrix": [0, 6], "x": 6.75, "y": 0.25},
+                {"matrix": [0, 7], "x": 9.5, "y": 0.25},
+                {"matrix": [0, 8], "x": 10.5, "y": 0.25},
+                {"matrix": [0, 9], "x": 11.5, "y": 0.25},
+                {"matrix": [0, 10], "x": 12.5, "y": 0.25},
+                {"matrix": [0, 11], "x": 13.5, "y": 0},
+                {"matrix": [0, 12], "x": 14.5, "y": 0.25},
+                {"matrix": [0, 13], "x": 15.5, "y": 0.25, "w": 2},
+                {"matrix": [0, 14], "x": 18, "y": 0.25},
 
-                {"matrix":[1, 0], "x":0.5, "y":1.25, "w":1.5},
-                {"matrix":[1, 1], "x":2, "y":1.25},
-                {"matrix":[1, 2], "x":3.25, "y":1.25},
-                {"matrix":[1, 3], "x":4.25, "y":1.25},
-                {"matrix":[1, 4], "x":5.25, "y":1.25},
-                {"matrix":[1, 5], "x":6.25, "y":1.25},
-                {"matrix":[1, 6], "x":9, "y":1.25},
-                {"matrix":[1, 7], "x":10, "y":1.25},
-                {"matrix":[1, 8], "x":11, "y":1.25},
-                {"matrix":[1, 9], "x":12, "y":1.25},
-                {"matrix":[1, 10], "x":13.25, "y":1.25},
-                {"matrix":[1, 11], "x":14.25, "y":1.25},
-                {"matrix":[1, 12], "x":15.25, "y":1.25},
-                {"matrix":[1, 14], "x":18.25, "y":1.5},
+                {"matrix": [1, 0], "x": 0.5, "y": 1.25, "w": 1.5},
+                {"matrix": [1, 1], "x": 2, "y": 1.25},
+                {"matrix": [1, 2], "x": 3.25, "y": 1.25},
+                {"matrix": [1, 3], "x": 4.25, "y": 1.25},
+                {"matrix": [1, 4], "x": 5.25, "y": 1.25},
+                {"matrix": [1, 5], "x": 6.25, "y": 1.25},
+                {"matrix": [1, 6], "x": 9, "y": 1.25},
+                {"matrix": [1, 7], "x": 10, "y": 1.25},
+                {"matrix": [1, 8], "x": 11, "y": 1.25},
+                {"matrix": [1, 9], "x": 12, "y": 1.25},
+                {"matrix": [1, 10], "x": 13.25, "y": 1.25},
+                {"matrix": [1, 11], "x": 14.25, "y": 1.25},
+                {"matrix": [1, 12], "x": 15.25, "y": 1.25},
+                {"matrix": [1, 14], "x": 18.25, "y": 1.5},
 
-                {"matrix":[2, 0], "x":0.25, "y":2.25, "w":1.75},
-                {"matrix":[2, 1], "x":2, "y":2.25},
-                {"matrix":[2, 2], "x":3.5, "y":2.25},
-                {"matrix":[2, 3], "x":4.5, "y":2.25},
-                {"matrix":[2, 4], "x":5.5, "y":2.25},
-                {"matrix":[2, 5], "x":6.5, "y":2.25},
-                {"matrix":[2, 7], "x":9.25, "y":2.25},
-                {"matrix":[2, 8], "x":10.25, "y":2.25},
-                {"matrix":[2, 9], "x":11.25, "y":2.25},
-                {"matrix":[2, 10], "x":12.25, "y":2.25},
-                {"matrix":[2, 11], "x":13.5, "y":2.25},
-                {"matrix":[2, 12], "x":14.5, "y":2.25},
-                {"matrix":[2, 13], "x":15.5, "y":2.25},
-                {"matrix":[1, 13], "x":16.5, "y":1.25, "w":1.25, "h":2},
-                {"matrix":[2, 14], "x":18.5, "y":2.5},
+                {"matrix": [2, 0], "x": 0.25, "y": 2.25, "w": 1.75},
+                {"matrix": [2, 1], "x": 2, "y": 2.25},
+                {"matrix": [2, 2], "x": 3.5, "y": 2.25},
+                {"matrix": [2, 3], "x": 4.5, "y": 2.25},
+                {"matrix": [2, 4], "x": 5.5, "y": 2.25},
+                {"matrix": [2, 5], "x": 6.5, "y": 2.25},
+                {"matrix": [2, 7], "x": 9.25, "y": 2.25},
+                {"matrix": [2, 8], "x": 10.25, "y": 2.25},
+                {"matrix": [2, 9], "x": 11.25, "y": 2.25},
+                {"matrix": [2, 10], "x": 12.25, "y": 2.25},
+                {"matrix": [2, 11], "x": 13.5, "y": 2.25},
+                {"matrix": [2, 12], "x": 14.5, "y": 2.25},
+                {"matrix": [2, 13], "x": 15.5, "y": 2.25},
+                {"matrix": [1, 13], "x": 16.5, "y": 1.25, "w": 1.25, "h": 2},
+                {"matrix": [2, 14], "x": 18.5, "y": 2.5},
 
-                {"matrix":[3, 0], "x":0, "y":3.25, "w":1.25},
-                {"matrix":[3, 1], "x":1.25, "y":3.25},
-                {"matrix":[3, 2], "x":2.25, "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":8.5, "y":3.25},
-                {"matrix":[3, 8], "x":9.5, "y":3.25},
-                {"matrix":[3, 9], "x":10.5, "y":3.25},
-                {"matrix":[3, 10], "x":11.5, "y":3.25},
-                {"matrix":[3, 11], "x":12.5, "y":3.25},
-                {"matrix":[3, 12], "x":14.25, "y":3.25},
-                {"matrix":[3, 13], "x":15.25, "y":3.25, "w":1.75},
-                {"matrix":[3, 14], "x":17.25, "y":3.5},
+                {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25},
+                {"matrix": [3, 1], "x": 1.25, "y": 3.25},
+                {"matrix": [3, 2], "x": 2.25, "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": 8.5, "y": 3.25},
+                {"matrix": [3, 8], "x": 9.5, "y": 3.25},
+                {"matrix": [3, 9], "x": 10.5, "y": 3.25},
+                {"matrix": [3, 10], "x": 11.5, "y": 3.25},
+                {"matrix": [3, 11], "x": 12.5, "y": 3.25},
+                {"matrix": [3, 12], "x": 14.25, "y": 3.25},
+                {"matrix": [3, 13], "x": 15.25, "y": 3.25, "w": 1.75},
+                {"matrix": [3, 14], "x": 17.25, "y": 3.5},
 
-                {"matrix":[4, 0], "x":0, "y":4.25, "w":1.25},
-                {"matrix":[4, 1], "x":1.25, "y":4.25, "w":1.25},
-                {"matrix":[4, 2], "x":3.75, "y":4.25, "w":1.25},
-                {"matrix":[4, 3], "x":5, "y":4.25, "w":2.25},
-                {"matrix":[4, 6], "x":7.25, "y":4.25},
-                {"matrix":[4, 7], "x":8.75, "y":4.25},
-                {"matrix":[4, 8], "x":9.75, "y":4.25, "w":2.75},
-                {"matrix":[4, 9], "x":12.5, "y":4.25},
-                {"matrix":[4, 12], "x":16.25, "y":4.5},
-                {"matrix":[4, 13], "x":17.25, "y":4.5},
-                {"matrix":[4, 14], "x":18.25, "y":4.5}
+                {"matrix": [4, 0], "x": 0, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 1], "x": 1.25, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 2], "x": 3.75, "y": 4.25, "w": 1.25},
+                {"matrix": [4, 3], "x": 5, "y": 4.25, "w": 2.25},
+                {"matrix": [4, 6], "x": 7.25, "y": 4.25},
+                {"matrix": [4, 7], "x": 8.75, "y": 4.25},
+                {"matrix": [4, 8], "x": 9.75, "y": 4.25, "w": 2.75},
+                {"matrix": [4, 9], "x": 12.5, "y": 4.25},
+                {"matrix": [4, 12], "x": 16.25, "y": 4.5},
+                {"matrix": [4, 13], "x": 17.25, "y": 4.5},
+                {"matrix": [4, 14], "x": 18.25, "y": 4.5}
             ]
         }
     }
-- 
cgit v1.2.3