From 93857017c5437ec424b20a0b8f1361d7a454666c Mon Sep 17 00:00:00 2001
From: lalalademaxiya1 <2831039915@qq.com>
Date: Fri, 17 Mar 2023 14:08:23 +0800
Subject: [PATCH] Update Keychron Q65

---
 keyboards/keychron/q65/ansi_encoder/ansi_encoder.c | 10 +++++-----
 keyboards/keychron/q65/ansi_encoder/info.json      |  5 +++++
 keyboards/keychron/q65/config.h                    |  9 ---------
 keyboards/keychron/q65/halconf.h                   |  1 -
 keyboards/keychron/q65/readme.md                   |  4 +++-
 5 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
index a476f0f5a5..93f3319675 100644
--- a/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q65/ansi_encoder/ansi_encoder.c
@@ -19,12 +19,12 @@
 #ifdef RGB_MATRIX_ENABLE
 
 const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to CKLED manual for these locations
+/* Refer to CKLED2001 manual for these locations
  *   driver
  *   |  R location
- *   |  |       G location
- *   |  |       |       B location
- *   |  |       |       | */
+ *   |  |     G location
+ *   |  |     |     B location
+ *   |  |     |     | */
     {0, C_15, A_15, B_15}, // Esc
     {0, C_14, A_14, B_14}, // 1!
     {0, C_13, A_13, B_13}, // 2@
@@ -128,7 +128,7 @@ led_config_t g_led_config = {
         1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,
         1, 9, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1,    1,
         1, 1,    4, 4, 4, 4, 4, 4, 4, 4, 4, 4,    1, 1, 1,
-        1, 1, 1, 1,          4,          1, 1, 1, 1, 1, 1,
+        1, 1, 1, 1,          4,          1, 4, 4, 1, 1, 1,
     }
 };
 
diff --git a/keyboards/keychron/q65/ansi_encoder/info.json b/keyboards/keychron/q65/ansi_encoder/info.json
index 6e08bfceb0..be8bc13fbf 100644
--- a/keyboards/keychron/q65/ansi_encoder/info.json
+++ b/keyboards/keychron/q65/ansi_encoder/info.json
@@ -8,6 +8,11 @@
         "pid": "0x01B1",
         "device_version": "1.0.3"
     },
+    "matrix_pins": {
+        "cols": [null, null, null, null, null, null, null, null, "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1"],
+        "rows": ["B4", "B3", "A15", "A14", "A13"]
+    },
+    "diode_direction": "ROW2COL",
     "encoder": {
         "rotary": [
             {"pin_a": "A10", "pin_b": "A8"}
diff --git a/keyboards/keychron/q65/config.h b/keyboards/keychron/q65/config.h
index 35fc42bf5a..45575ae0fb 100644
--- a/keyboards/keychron/q65/config.h
+++ b/keyboards/keychron/q65/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 \
-    { NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, NO_PIN, A2, A3, A4, A5, A6, A7, B0, B1 }
-
 /* RGB Matrix Driver Configuration */
 #define DRIVER_COUNT 2
 #define DRIVER_ADDR_1 0b1110111
diff --git a/keyboards/keychron/q65/halconf.h b/keyboards/keychron/q65/halconf.h
index 74821ffac7..41bddcb279 100644
--- a/keyboards/keychron/q65/halconf.h
+++ b/keyboards/keychron/q65/halconf.h
@@ -17,6 +17,5 @@
 #pragma once
 
 #define HAL_USE_I2C TRUE
-#define PAL_USE_CALLBACKS FALSE
 
 #include_next <halconf.h>
diff --git a/keyboards/keychron/q65/readme.md b/keyboards/keychron/q65/readme.md
index 1a2a27dc75..6e1d0ae441 100644
--- a/keyboards/keychron/q65/readme.md
+++ b/keyboards/keychron/q65/readme.md
@@ -1,10 +1,12 @@
 # Keychron Q65
 
+![Keychron Q65](https://i.imgur.com/5Cbb1C5.jpg[/img])
+
 A customizable 65% keyboard.
 
 * Keyboard Maintainer: [Keychron](https://github.com/keychron)
 * Hardware Supported: Keychron Q65
-* Hardware Availability: [Keychron](https://www.keychron.com)
+* Hardware Availability: [KKeychron Q65 QMK Custom Mechanical Keyboardeychron](https://www.keychron.com/products/keychron-q65-qmk-custom-mechanical-keyboard)
 
 Make example for this keyboard (after setting up your build environment):