Update Keychron K Pro series keyboards

4 files changed, 95 insertions, 109 deletions

diff --git a/keyboards/keychron/k13_pro/ansi/rgb/config.h b/keyboards/keychron/k13_pro/ansi/rgb/config.h
index d1a7fec5a7..eca9f2550a 100755
--- a/keyboards/keychron/k13_pro/ansi/rgb/config.h
+++ b/keyboards/keychron/k13_pro/ansi/rgb/config.h
@@ -25,13 +25,6 @@
 #    define DRIVER_2_LED_TOTAL 43
 #    define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
 
-/* Increase I2C speed to 1000 KHz */
-#    define I2C1_TIMINGR_PRESC 0U
-#    define I2C1_TIMINGR_SCLDEL 3U
-#    define I2C1_TIMINGR_SDADEL 0U
-#    define I2C1_TIMINGR_SCLH 15U
-#    define I2C1_TIMINGR_SCLL 30U
-
 /* Set to infinit, which is use in USB mode by default */
 #    define RGB_MATRIX_TIMEOUT RGB_MATRIX_TIMEOUT_INFINITE
 
@@ -41,7 +34,7 @@
 /* Turn off backllit if brightness value is low */
 #    define RGB_MATRIX_BRIGHTNESS_TURN_OFF_VAL 48
 
-#    define LOW_BAT_IND_INDEX 79
+#    define LOW_BAT_IND_INDEX 82
 
 // RGB Matrix Animation modes. Explicitly enabled
 // For full list of effects, see:
diff --git a/keyboards/keychron/k13_pro/ansi/rgb/rgb.c b/keyboards/keychron/k13_pro/ansi/rgb/rgb.c
index 13a25e5026..05e3707aa6 100755
--- a/keyboards/keychron/k13_pro/ansi/rgb/rgb.c
+++ b/keyboards/keychron/k13_pro/ansi/rgb/rgb.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
+/* Copyright 2023 @ 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
@@ -19,107 +19,107 @@
 // clang-format off
 #ifdef RGB_MATRIX_ENABLE
 const ckled2001_led g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
-/* Refer to IS31 manual for these locations
+/* Refer to CKLED2001 manual for these locations
  *   driver
  *   |  R location
  *   |  |       G location
  *   |  |       |       B location
  *   |  |       |       | */
-    {0, I_1,     G_1,    H_1},
-    {0, I_2,     G_2,    H_2},
-    {0, I_3,     G_3,    H_3},
-    {0, I_4,     G_4,    H_4},
-    {0, I_5,     G_5,    H_5},
-    {0, I_6,     G_6,    H_6},
-    {0, I_7,     G_7,    H_7},
-    {0, I_8,     G_8,    H_8},
-    {0, I_9,     G_9,    H_9},
-    {0, I_10,    G_10,   H_10},
-    {0, I_11,    G_11,   H_11},
-    {0, I_12,    G_12,   H_12},
-    {0, I_13,    G_13,   H_13},
-    {0, I_15,    G_15,   H_15},
-    {0, I_16,    G_16,   H_16},
-    {1, F_8,     D_8,    E_8},
+    {0, I_1,    G_1,    H_1},
+    {0, I_2,    G_2,    H_2},
+    {0, I_3,    G_3,    H_3},
+    {0, I_4,    G_4,    H_4},
+    {0, I_5,    G_5,    H_5},
+    {0, I_6,    G_6,    H_6},
+    {0, I_7,    G_7,    H_7},
+    {0, I_8,    G_8,    H_8},
+    {0, I_9,    G_9,    H_9},
+    {0, I_10,   G_10,   H_10},
+    {0, I_11,   G_11,   H_11},
+    {0, I_12,   G_12,   H_12},
+    {0, I_13,   G_13,   H_13},
+    {0, I_15,   G_15,   H_15},
+    {0, I_16,   G_16,   H_16},
+    {1, F_8,    D_8,    E_8},
 
-    {0, F_1,     D_1,    E_1},
-    {0, F_2,     D_2,    E_2},
-    {0, F_3,     D_3,    E_3},
-    {0, F_4,     D_4,    E_4},
-    {0, F_5,     D_5,    E_5},
-    {0, F_6,     D_6,    E_6},
-    {0, F_7,     D_7,    E_7},
-    {0, F_8,     D_8,    E_8},
-    {0, F_9,     D_9,    E_9},
-    {0, F_10,    D_10,   E_10},
-    {0, F_11,    D_11,   E_11},
-    {0, F_12,    D_12,   E_12},
-    {0, F_13,    D_13,   E_13},
-    {0, F_14,    D_14,   E_14},
-    {0, F_15,    D_15,   E_15},
-    {0, F_16,    D_16,   E_16},
-    {1, F_9,     D_9,    E_9},
+    {0, F_1,    D_1,    E_1},
+    {0, F_2,    D_2,    E_2},
+    {0, F_3,    D_3,    E_3},
+    {0, F_4,    D_4,    E_4},
+    {0, F_5,    D_5,    E_5},
+    {0, F_6,    D_6,    E_6},
+    {0, F_7,    D_7,    E_7},
+    {0, F_8,    D_8,    E_8},
+    {0, F_9,    D_9,    E_9},
+    {0, F_10,   D_10,   E_10},
+    {0, F_11,   D_11,   E_11},
+    {0, F_12,   D_12,   E_12},
+    {0, F_13,   D_13,   E_13},
+    {0, F_14,   D_14,   E_14},
+    {0, F_15,   D_15,   E_15},
+    {0, F_16,   D_16,   E_16},
+    {1, F_9,    D_9,    E_9},
 
-    {0, A_1,     C_1,    B_1},
-    {0, A_2,     C_2,    B_2},
-    {0, A_3,     C_3,    B_3},
-    {0, A_4,     C_4,    B_4},
-    {0, A_5,     C_5,    B_5},
-    {0, A_6,     C_6,    B_6},
-    {0, A_7,     C_7,    B_7},
-    {0, A_8,     C_8,    B_8},
-    {0, A_9,     C_9,    B_9},
-    {0, A_10,    C_10,   B_10},
-    {0, A_11,    C_11,   B_11},
-    {0, A_12,    C_12,   B_12},
-    {0, A_13,    C_13,   B_13},
-    {0, A_14,    C_14,   B_14},
-    {0, A_15,    C_15,   B_15},
-    {0, A_16,    C_16,   B_16},
-    {1, F_6,     D_6,    E_6},
+    {0, A_1,    C_1,    B_1},
+    {0, A_2,    C_2,    B_2},
+    {0, A_3,    C_3,    B_3},
+    {0, A_4,    C_4,    B_4},
+    {0, A_5,    C_5,    B_5},
+    {0, A_6,    C_6,    B_6},
+    {0, A_7,    C_7,    B_7},
+    {0, A_8,    C_8,    B_8},
+    {0, A_9,    C_9,    B_9},
+    {0, A_10,   C_10,   B_10},
+    {0, A_11,   C_11,   B_11},
+    {0, A_12,   C_12,   B_12},
+    {0, A_13,   C_13,   B_13},
+    {0, A_14,   C_14,   B_14},
+    {0, A_15,   C_15,   B_15},
+    {0, A_16,   C_16,   B_16},
+    {1, F_6,    D_6,    E_6},
 
-    {1, I_1,     G_1,    H_1},
-    {1, I_2,     G_2,    H_2},
-    {1, I_3,     G_3,    H_3},
-    {1, I_4,     G_4,    H_4},
-    {1, I_5,     G_5,    H_5},
-    {1, I_6,     G_6,    H_6},
-    {1, I_7,     G_7,    H_7},
-    {1, I_8,     G_8,    H_8},
-    {1, I_9,     G_9,    H_9},
-    {1, I_10,    G_10,   H_10},
-    {1, I_11,    G_11,   H_11},
-    {1, I_12,    G_12,   H_12},
-    {1, I_14,    G_14,   H_14},
-    {1, I_15,    G_15,   H_15},
-    {1, I_16,    G_16,   H_16},
-    {1, I_13,    G_13,   H_13},
+    {1, I_1,    G_1,    H_1},
+    {1, I_2,    G_2,    H_2},
+    {1, I_3,    G_3,    H_3},
+    {1, I_4,    G_4,    H_4},
+    {1, I_5,    G_5,    H_5},
+    {1, I_6,    G_6,    H_6},
+    {1, I_7,    G_7,    H_7},
+    {1, I_8,    G_8,    H_8},
+    {1, I_9,    G_9,    H_9},
+    {1, I_10,   G_10,   H_10},
+    {1, I_11,   G_11,   H_11},
+    {1, I_12,   G_12,   H_12},
+    {1, I_14,   G_14,   H_14},
+    {1, I_15,   G_15,   H_15},
+    {1, I_16,   G_16,   H_16},
+    {1, I_13,   G_13,   H_13},
 
-    {1, C_1,     A_1,    B_1},
-    {1, C_3,     A_3,    B_3},
-    {1, C_4,     A_4,    B_4},
-    {1, C_5,     A_5,    B_5},
-    {1, C_6,     A_6,    B_6},
-    {1, C_7,     A_7,    B_7},
-    {1, C_8,     A_8,    B_8},
-    {1, C_9,     A_9,    B_9},
-    {1, C_10,    A_10,   B_10},
-    {1, C_11,    A_11,   B_11},
-    {1, C_12,    A_12,   B_12},
-    {1, C_14,    A_14,   B_14},
-    {1, C_16,    A_16,   B_16},
+    {1, C_1,    A_1,    B_1},
+    {1, C_3,    A_3,    B_3},
+    {1, C_4,    A_4,    B_4},
+    {1, C_5,    A_5,    B_5},
+    {1, C_6,    A_6,    B_6},
+    {1, C_7,    A_7,    B_7},
+    {1, C_8,    A_8,    B_8},
+    {1, C_9,    A_9,    B_9},
+    {1, C_10,   A_10,   B_10},
+    {1, C_11,   A_11,   B_11},
+    {1, C_12,   A_12,   B_12},
+    {1, C_14,   A_14,   B_14},
+    {1, C_16,   A_16,   B_16},
 
-    {1, F_1,     D_1,    E_1},
-    {1, F_2,     D_2,    E_2},
-    {1, F_3,     D_3,    E_3},
-    {1, F_7,     D_7,    E_7},
-    {1, F_11,    D_11,   E_11},
-    {1, F_12,    D_12,   E_12},
-    {1, F_13,    D_13,   E_13},
-    {1, F_14,    D_14,   E_14},
-    {1, F_15,    D_15,   E_15},
-    {1, F_16,    D_16,   E_16},
-    {1, C_15,    A_15,   B_15}
+    {1, F_1,    D_1,    E_1},
+    {1, F_2,    D_2,    E_2},
+    {1, F_3,    D_3,    E_3},
+    {1, F_7,    D_7,    E_7},
+    {1, F_11,   D_11,   E_11},
+    {1, F_12,   D_12,   E_12},
+    {1, F_13,   D_13,   E_13},
+    {1, F_14,   D_14,   E_14},
+    {1, F_15,   D_15,   E_15},
+    {1, F_16,   D_16,   E_16},
+    {1, C_15,   A_15,   B_15}
 };
 
 #define __ NO_LED
diff --git a/keyboards/keychron/k13_pro/ansi/white/config.h b/keyboards/keychron/k13_pro/ansi/white/config.h
index c71da66dde..e746986802 100755
--- a/keyboards/keychron/k13_pro/ansi/white/config.h
+++ b/keyboards/keychron/k13_pro/ansi/white/config.h
@@ -23,13 +23,6 @@
 #    define DRIVER_1_LED_TOTAL 90
 #    define LED_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL
 
-/* Increase I2C speed to 1000 KHz */
-#    define I2C1_TIMINGR_PRESC 0U
-#    define I2C1_TIMINGR_SCLDEL 3U
-#    define I2C1_TIMINGR_SDADEL 0U
-#    define I2C1_TIMINGR_SCLH 15U
-#    define I2C1_TIMINGR_SCLL 30U
-
 /* Set to infinit, which is use in USB mode by default */
 #    define LED_MATRIX_TIMEOUT LED_MATRIX_TIMEOUT_INFINITE
 
diff --git a/keyboards/keychron/k13_pro/ansi/white/white.c b/keyboards/keychron/k13_pro/ansi/white/white.c
index 2db95f5eac..22d108609e 100755
--- a/keyboards/keychron/k13_pro/ansi/white/white.c
+++ b/keyboards/keychron/k13_pro/ansi/white/white.c
@@ -1,4 +1,4 @@
-/* Copyright 2021 @ Keychron (https://www.keychron.com)
+/* Copyright 2023 @ 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
@@ -19,7 +19,7 @@
 // clang-format off
 #ifdef LED_MATRIX_ENABLE
 const ckled2001_led g_ckled2001_leds[LED_MATRIX_LED_COUNT] = {
-/* Refer to IS31 manual for these locations
+/* Refer to CKLED2001 manual for these locations
  *   driver
  *   |  LED address
  *   |  | */