Merge remote-tracking branch 'upstream/master' into develop

7 files changed, 110 insertions, 291 deletions

diff --git a/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c b/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
index 0d4fd2cd98..0585ae9c96 100755
--- a/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
+++ b/keyboards/keychron/q11/ansi_encoder/ansi_encoder.c
@@ -17,9 +17,6 @@
 #include "quantum.h"
 
 #ifdef RGB_MATRIX_ENABLE
-
-// clang-format off
-
 const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
 /* Refer to IS31 manual for these locations
  *   driver
@@ -128,117 +125,4 @@ const ckled2001_led PROGMEM g_ckled2001_leds[RGB_MATRIX_LED_COUNT] = {
     {0, G_1,  I_1,  H_1},  // Down
     {0, G_7,  I_7,  H_7},  // Right
 };
-
-#define __ NO_LED
-
-led_config_t g_led_config = {
-    {
-        // Key Matrix to LED Index
-        { __,  0,  1,  2,  3,  4,  5,  6, __ },
-        {  7,  8,  9, 10, 11, 12, 13, 14, __ },
-        { 15, 16, 17, 18, 19, __, 20, 21, __ },
-        { 22, 23, 24, 25, 26, 27, 28, __, __ },
-        { 29, __, 30, 31, 32, 33, 34, 35, __ },
-        { 36, 37, 38, 39, 40, __, 41, __, __ },
-        { 42, 43, 44, 45, 46, 47, 48, 49, __ },
-        { 50, 51, 52, 53, 54, 55, 56, __, 57 },
-        { 58, 59, 60, 61, 62, 63, 64, 65, 66 },
-        { 67, 68, 69, 70, 71, 72, __, 73, 74 },
-        { 75, 76, 77, 78, 79, 80, __, 81, __ },
-        { __, 82, 83, 84, 85, __, 86, 87, 88 },
-    },
-    {
-        // LED Index to Physical Position
-                {17,0},  {31,0},  {45,0},  {59,0},  {72,0},  {86,0},  {100,0},
-        {0,15}, {17,15}, {31,15}, {45,15}, {59,15}, {72,15}, {86,15}, {100,15},
-        {0,27}, {21,27}, {38,27}, {52,27}, {66,27}, {79,27}, {93,27},
-        {0,40}, {22,40}, {41,40}, {55,40}, {69,40}, {83,40}, {97,40},
-        {0,52}, {26,52},          {48,52}, {61,52}, {76,52}, {90,52}, {102,52},
-        {0,64}, {19,64}, {36,64}, {53,64}, {70,64},          {94,64},
-                  {110,0},  {124,0},  {138,0},  {152,0},  {165,0},  {179,0},  {193,0},  {207,0},
-                  {110,15}, {124,15}, {138,15}, {152,15}, {165,15}, {179,15}, {200,15},           {224,15},
-        {104,27}, {117,27}, {131,27}, {145,27}, {158,27}, {172,27}, {186,27}, {203,27},           {224,27},
-        {107,40}, {121,40}, {134,40}, {148,40}, {162,40}, {176,40},           {198,40},           {224,40},
-                  {114,52}, {127,52}, {141,52}, {155,52}, {169,52},           {188,52}, {210,52},
-                            {126,64},           {152,64}, {166,64}, {180,64}, {196,64}, {210,64}, {224,64},
-    },
-    {
-        // RGB LED Index to Flag
-        1, 1, 1, 1, 1, 1, 1,
-        1, 1, 4, 4, 4, 4, 4, 4,
-        1, 1, 4, 4, 4, 4, 4,
-        1, 8, 4, 4, 4, 4, 4,
-        1, 1,    4, 4, 4, 4, 4,
-        1, 1, 1, 1, 1,    4,
-           1, 1, 1, 1, 1, 1, 1, 1,
-           4, 4, 4, 4, 4, 4, 1,    1,
-        4, 4, 4, 4, 4, 4, 4, 4,    1,
-        4, 4, 4, 4, 4, 4,    1,    1,
-           4, 4, 4, 4, 4,    1, 1,
-              4,    1, 1, 1, 1, 1, 1,
-    }
-};
-
-// clang-format on
-
 #endif
-
-#define ADC_BUFFER_DEPTH 1
-#define ADC_NUM_CHANNELS 1
-#define ADC_SAMPLING_RATE ADC_SMPR_SMP_12P5
-#define ADC_RESOLUTION ADC_CFGR_RES_10BITS
-
-static int16_t analogReadPin_my(pin_t pin) {
-    ADCConfig adcCfg = {};
-    adcsample_t sampleBuffer[ADC_NUM_CHANNELS*ADC_BUFFER_DEPTH];
-    ADCDriver* targetDriver = &ADCD1;
-    ADCConversionGroup adcConversionGroup = {
-        .circular = FALSE,
-        .num_channels = (uint16_t)(ADC_NUM_CHANNELS),
-        .cfgr = ADC_RESOLUTION,
-    };
-
-    palSetLineMode(pin, PAL_MODE_INPUT_ANALOG);
-    switch (pin) {
-        case B0:
-            adcConversionGroup.smpr[2] = ADC_SMPR2_SMP_AN15(ADC_SAMPLING_RATE);
-            adcConversionGroup.sqr[0] = ADC_SQR1_SQ1_N(ADC_CHANNEL_IN15);
-            sampleBuffer[0] = 0;
-            break;
-        case B1:
-            adcConversionGroup.smpr[2] = ADC_SMPR2_SMP_AN16(ADC_SAMPLING_RATE);
-            adcConversionGroup.sqr[0] = ADC_SQR1_SQ1_N(ADC_CHANNEL_IN16);
-            sampleBuffer[0] = 0;
-            break;
-        default:
-             return 0;
-    }
-    adcStart(targetDriver, &adcCfg);
-    if (adcConvert(targetDriver, &adcConversionGroup, &sampleBuffer[0], ADC_BUFFER_DEPTH) != MSG_OK) {
-        return 0;
-    }
-
-    return *sampleBuffer;
-}
-
-void keyboard_post_init_kb(void) {
-    // 1. The pin A5/B5 of the USB C interface in the left hand is connected to the pin A0 of MCU,
-    // A0 will be set to output and write high when keyboard initial.
-    // 2. The same pin in the right hand is connected to the pin B0 and B1 of MCU respectively,
-    // and the ADC function of B0 and B1 will be enabled when keyboard initial.
-    // 3. because the serial usart RXD and TXD is multiplexed on USB's D+ and D- in the right hand.
-    // So detect the voltage on the pin A5/B5 of the USB C interface by ADC,
-    // and disable USB connectivity when the ADC value exceeds 1000,
-    // to avoid affecting the serial usart communication between the left hand and the right hand.
-    if (is_keyboard_left()) {
-        setPinOutput(A0);
-        writePinHigh(A0);
-    } else {
-        if ((analogReadPin_my(B0) > 1000) || (analogReadPin_my(B1) > 1000)) {
-            setPinInput(A11);
-            setPinInput(A12);
-        }
-    }
-
-    keyboard_post_init_user();
-}
diff --git a/keyboards/keychron/q11/ansi_encoder/config.h b/keyboards/keychron/q11/ansi_encoder/config.h
index 08632f0ce7..60bdc493de 100755
--- a/keyboards/keychron/q11/ansi_encoder/config.h
+++ b/keyboards/keychron/q11/ansi_encoder/config.h
@@ -16,5 +16,8 @@
 
 #pragma once
 
+/* RGB Matrix Configuration */
+#define RGB_MATRIX_LED_COUNT 89
+
 /* Enable caps-lock LED */
 #define CAPS_LOCK_LED_INDEX 23
diff --git a/keyboards/keychron/q11/ansi_encoder/info.json b/keyboards/keychron/q11/ansi_encoder/info.json
index da10fe5166..01a81619ba 100755
--- a/keyboards/keychron/q11/ansi_encoder/info.json
+++ b/keyboards/keychron/q11/ansi_encoder/info.json
@@ -1,166 +1,105 @@
 {
-    "keyboard_name": "Keychron Q11",
-    "manufacturer": "Keychron",
-    "url": "https://github.com/Keychron",
-    "maintainer": "lalalademaxiya1",
-    "bootloader": "stm32-dfu",
-    "bootmagic": {
-        "matrix": [0, 1]
-    },
-    "features": {
-        "audio": false,
-        "backlight": false,
-        "bootmagic": true,
-        "command": false,
-        "console": false,
-        "dip_switch": true,
-        "encoder": true,
-        "extrakey": true,
-        "mousekey": true,
-        "nkro": true,
-        "rgb_matrix": true,
-        "rgblight": false
-    },
-    "diode_direction": "ROW2COL",
-    "encoder": {
-        "rotary": [
-            {"pin_a": "B0", "pin_b": "B1"}
-        ]
-    },
-    "matrix_pins": {
-        "cols": ["A7", "A6", "A5", "A4", "A3", "A2", "A1", "C15", null],
-        "rows": ["A13", "A14", "A15", "B3", "B4", "B5"]
-    },
-    "processor": "STM32L432",
-    "rgb_matrix": {
-        "driver": "CKLED2001",
-        "split_count": [42, 47]
-    },
-    "split": {
-        "enabled": true,
-        "encoder": {
-            "right": {
-                "rotary": [
-                    {"pin_a": "C14", "pin_b": "C15"}
-                ]
-            }
-        },
-        "matrix_pins": {
-            "right": {
-                "cols": ["A8", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0"],
-                "rows": ["B5", "B4", "B3", "A15", "A14", "A13"]
-            }
-        },
-        "transport": {
-            "protocol": "serial_usart",
-            "sync_matrix_state": false
-        }
-    },
     "usb": {
-        "vid": "0x3434",
         "pid": "0x01E0",
         "device_version": "1.0.0"
     },
-    "layouts": {
-        "LAYOUT_ansi_91": {
-            "layout": [
-                {"matrix": [0, 0], "x": 0, "y": 0},
-                {"matrix": [0, 1], "x": 1.25, "y": 0},
-                {"matrix": [0, 2], "x": 2.25, "y": 0},
-                {"matrix": [0, 3], "x": 3.25, "y": 0},
-                {"matrix": [0, 4], "x": 4.25, "y": 0},
-                {"matrix": [0, 5], "x": 5.25, "y": 0},
-                {"matrix": [0, 6], "x": 6.25, "y": 0},
-                {"matrix": [0, 7], "x": 7.25, "y": 0},
-                {"matrix": [6, 0], "x": 8.25, "y": 0},
-                {"matrix": [6, 1], "x": 9.25, "y": 0},
-                {"matrix": [6, 2], "x": 10.25, "y": 0},
-                {"matrix": [6, 3], "x": 11.25, "y": 0},
-                {"matrix": [6, 4], "x": 12.25, "y": 0},
-                {"matrix": [6, 5], "x": 13.25, "y": 0},
-                {"matrix": [6, 6], "x": 14.25, "y": 0},
-                {"matrix": [6, 7], "x": 15.25, "y": 0},
-                {"matrix": [6, 8], "x": 16.5, "y": 0},
+    "rgb_matrix": {
+        "split_count": [42, 47],
+        "layout": [
+            {"matrix":[0, 1], "flags":1, "x":17,  "y":0},
+            {"matrix":[0, 2], "flags":1, "x":31,  "y":0},
+            {"matrix":[0, 3], "flags":1, "x":45,  "y":0},
+            {"matrix":[0, 4], "flags":1, "x":59,  "y":0},
+            {"matrix":[0, 5], "flags":1, "x":72,  "y":0},
+            {"matrix":[0, 6], "flags":1, "x":86,  "y":0},
+            {"matrix":[0, 7], "flags":1, "x":100, "y":0},
+            {"matrix":[1, 0], "flags":1, "x":0,   "y":15},
+            {"matrix":[1, 1], "flags":1, "x":17,  "y":15},
+            {"matrix":[1, 2], "flags":4, "x":31,  "y":15},
+            {"matrix":[1, 3], "flags":4, "x":45,  "y":15},
+            {"matrix":[1, 4], "flags":4, "x":59,  "y":15},
+            {"matrix":[1, 5], "flags":4, "x":72,  "y":15},
+            {"matrix":[1, 6], "flags":4, "x":86,  "y":15},
+            {"matrix":[1, 7], "flags":4, "x":100, "y":15},
 
-                {"matrix": [1, 0], "x": 0, "y": 1.25},
-                {"matrix": [1, 1], "x": 1.25, "y": 1.25},
-                {"matrix": [1, 2], "x": 2.25, "y": 1.25},
-                {"matrix": [1, 3], "x": 3.25, "y": 1.25},
-                {"matrix": [1, 4], "x": 4.25, "y": 1.25},
-                {"matrix": [1, 5], "x": 5.25, "y": 1.25},
-                {"matrix": [1, 6], "x": 6.25, "y": 1.25},
-                {"matrix": [1, 7], "x": 7.25, "y": 1.25},
-                {"matrix": [7, 0], "x": 8.25, "y": 1.25},
-                {"matrix": [7, 1], "x": 9.25, "y": 1.25},
-                {"matrix": [7, 2], "x": 10.25, "y": 1.25},
-                {"matrix": [7, 3], "x": 11.25, "y": 1.25},
-                {"matrix": [7, 4], "x": 12.25, "y": 1.25},
-                {"matrix": [7, 5], "x": 13.25, "y": 1.25},
-                {"matrix": [7, 6], "x": 14.25, "y": 1.25, "w": 2},
-                {"matrix": [7, 8], "x": 16.5, "y": 1.25},
+            {"matrix":[2, 0], "flags":1, "x":0,   "y":27},
+            {"matrix":[2, 1], "flags":1, "x":21,  "y":27},
+            {"matrix":[2, 2], "flags":4, "x":38,  "y":27},
+            {"matrix":[2, 3], "flags":4, "x":52,  "y":27},
+            {"matrix":[2, 4], "flags":4, "x":66,  "y":27},
+            {"matrix":[2, 6], "flags":4, "x":79,  "y":27},
+            {"matrix":[2, 7], "flags":4, "x":93,  "y":27},
+            {"matrix":[3, 0], "flags":1, "x":0,   "y":40},
+            {"matrix":[3, 1], "flags":8, "x":22,  "y":40},
+            {"matrix":[3, 2], "flags":4, "x":41,  "y":40},
+            {"matrix":[3, 3], "flags":4, "x":55,  "y":40},
+            {"matrix":[3, 4], "flags":4, "x":69,  "y":40},
+            {"matrix":[3, 5], "flags":4, "x":83,  "y":40},
+            {"matrix":[3, 6], "flags":4, "x":97,  "y":40},
 
-                {"matrix": [2, 0], "x": 0, "y": 2.25},
-                {"matrix": [2, 1], "x": 1.25, "y": 2.25, "w": 1.5},
-                {"matrix": [2, 2], "x": 2.75, "y": 2.25},
-                {"matrix": [2, 3], "x": 3.75, "y": 2.25},
-                {"matrix": [2, 4], "x": 4.75, "y": 2.25},
-                {"matrix": [2, 6], "x": 5.75, "y": 2.25},
-                {"matrix": [2, 7], "x": 6.75, "y": 2.25},
-                {"matrix": [8, 0], "x": 7.75, "y": 2.25},
-                {"matrix": [8, 1], "x": 8.75, "y": 2.25},
-                {"matrix": [8, 2], "x": 9.75, "y": 2.25},
-                {"matrix": [8, 3], "x": 10.75, "y": 2.25},
-                {"matrix": [8, 4], "x": 11.75, "y": 2.25},
-                {"matrix": [8, 5], "x": 12.75, "y": 2.25},
-                {"matrix": [8, 6], "x": 13.75, "y": 2.25},
-                {"matrix": [8, 7], "x": 14.75, "y": 2.25, "w": 1.5},
-                {"matrix": [8, 8], "x": 16.5, "y": 2.25},
+            {"matrix":[4, 0],  "flags":1, "x":0,   "y":52},
+            {"matrix":[4, 2],  "flags":1, "x":34,  "y":52},
+            {"matrix":[4, 3],  "flags":4, "x":48,  "y":52},
+            {"matrix":[4, 4],  "flags":4, "x":61,  "y":52},
+            {"matrix":[4, 5],  "flags":4, "x":76,  "y":52},
+            {"matrix":[4, 6],  "flags":4, "x":90,  "y":52},
+            {"matrix":[4, 7],  "flags":4, "x":102, "y":52},
+            {"matrix":[5, 0],  "flags":1, "x":0,   "y":64},
+            {"matrix":[5, 1],  "flags":1, "x":19,  "y":64},
+            {"matrix":[5, 2],  "flags":1, "x":36,  "y":64},
+            {"matrix":[5, 3],  "flags":1, "x":53,  "y":64},
+            {"matrix":[5, 4],  "flags":1, "x":70,  "y":64},
+            {"matrix":[5, 6],  "flags":4, "x":94,  "y":64},
 
-                {"matrix": [3, 0], "x": 0, "y": 3.25},
-                {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.75},
-                {"matrix": [3, 2], "x": 3, "y": 3.25},
-                {"matrix": [3, 3], "x": 4, "y": 3.25},
-                {"matrix": [3, 4], "x": 5, "y": 3.25},
-                {"matrix": [3, 5], "x": 6, "y": 3.25},
-                {"matrix": [3, 6], "x": 7, "y": 3.25},
-                {"matrix": [9, 0], "x": 8, "y": 3.25},
-                {"matrix": [9, 1], "x": 9, "y": 3.25},
-                {"matrix": [9, 2], "x": 10, "y": 3.25},
-                {"matrix": [9, 3], "x": 11, "y": 3.25},
-                {"matrix": [9, 4], "x": 12, "y": 3.25},
-                {"matrix": [9, 5], "x": 13, "y": 3.25},
-                {"matrix": [9, 7], "x": 14, "y": 3.25, "w": 2.25},
-                {"matrix": [9, 8], "x": 16.5, "y": 3.25},
+            {"matrix":[6, 0], "flags":1, "x":110, "y":0},
+            {"matrix":[6, 1], "flags":1, "x":124, "y":0},
+            {"matrix":[6, 2], "flags":1, "x":138, "y":0},
+            {"matrix":[6, 3], "flags":1, "x":152, "y":0},
+            {"matrix":[6, 4], "flags":1, "x":165, "y":0},
+            {"matrix":[6, 5], "flags":1, "x":179, "y":0},
+            {"matrix":[6, 6], "flags":1, "x":193, "y":0},
+            {"matrix":[6, 7], "flags":1, "x":207, "y":0},
+            {"matrix":[7, 0], "flags":4, "x":110, "y":15},
+            {"matrix":[7, 1], "flags":4, "x":124, "y":15},
+            {"matrix":[7, 2], "flags":4, "x":138, "y":15},
+            {"matrix":[7, 3], "flags":4, "x":152, "y":15},
+            {"matrix":[7, 4], "flags":4, "x":165, "y":15},
+            {"matrix":[7, 5], "flags":4, "x":179, "y":15},
+            {"matrix":[7, 6], "flags":1, "x":200, "y":15},
+            {"matrix":[7, 8], "flags":1, "x":224, "y":15},
 
-                {"matrix": [4, 0], "x": 0, "y": 4.25},
-                {"matrix": [4, 2], "x": 1.25, "y": 4.25, "w": 2.25},
-                {"matrix": [4, 3], "x": 3.5, "y": 4.25},
-                {"matrix": [4, 4], "x": 4.5, "y": 4.25},
-                {"matrix": [4, 5], "x": 5.5, "y": 4.25},
-                {"matrix": [4, 6], "x": 6.5, "y": 4.25},
-                {"matrix": [4, 7], "x": 7.5, "y": 4.25},
-                {"matrix": [10, 0], "x": 8.5, "y": 4.25},
-                {"matrix": [10, 1], "x": 9.5, "y": 4.25},
-                {"matrix": [10, 2], "x": 10.5, "y": 4.25},
-                {"matrix": [10, 3], "x": 11.5, "y": 4.25},
-                {"matrix": [10, 4], "x": 12.5, "y": 4.25},
-                {"matrix": [10, 5], "x": 13.5, "y": 4.25, "w": 1.75},
-                {"matrix": [10, 7], "x": 15.5, "y": 4.25},
+            {"matrix":[8, 0], "flags":4, "x":104, "y":27},
+            {"matrix":[8, 1], "flags":4, "x":117, "y":27},
+            {"matrix":[8, 2], "flags":4, "x":131, "y":27},
+            {"matrix":[8, 3], "flags":4, "x":145, "y":27},
+            {"matrix":[8, 4], "flags":4, "x":158, "y":27},
+            {"matrix":[8, 5], "flags":4, "x":172, "y":27},
+            {"matrix":[8, 6], "flags":4, "x":186, "y":27},
+            {"matrix":[8, 7], "flags":4, "x":203, "y":27},
+            {"matrix":[8, 8], "flags":1, "x":224, "y":27},
+            {"matrix":[9, 0], "flags":4, "x":107, "y":40},
+            {"matrix":[9, 1], "flags":4, "x":121, "y":40},
+            {"matrix":[9, 2], "flags":4, "x":134, "y":40},
+            {"matrix":[9, 3], "flags":4, "x":148, "y":40},
+            {"matrix":[9, 4], "flags":4, "x":162, "y":40},
+            {"matrix":[9, 5], "flags":4, "x":176, "y":40},
+            {"matrix":[9, 7], "flags":1, "x":198, "y":40},
+            {"matrix":[9, 8], "flags":1, "x":224, "y":40},
 
-                {"matrix": [5, 0], "x": 0, "y": 5.25},
-                {"matrix": [5, 1], "x": 1.25, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 2], "x": 2.5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 3], "x": 3.75, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 4], "x": 5, "y": 5.25, "w": 1.25},
-                {"matrix": [5, 6], "x": 6.25, "y": 5.25, "w": 2.25},
-                {"matrix": [11, 1], "x": 8.5, "y": 5.25, "w": 2.75},
-                {"matrix": [11, 2], "x": 11.25, "y": 5.25},
-                {"matrix": [11, 3], "x": 12.25, "y": 5.25},
-                {"matrix": [11, 4], "x": 13.25, "y": 5.25},
-                {"matrix": [11, 6], "x": 14.5, "y": 5.25},
-                {"matrix": [11, 7], "x": 15.5, "y": 5.25},
-                {"matrix": [11, 8], "x": 16.5, "y": 5.25}
-            ]
-        }
+            {"matrix":[10, 0], "flags":4, "x":114, "y":52},
+            {"matrix":[10, 1], "flags":4, "x":127, "y":52},
+            {"matrix":[10, 2], "flags":4, "x":141, "y":52},
+            {"matrix":[10, 3], "flags":4, "x":155, "y":52},
+            {"matrix":[10, 4], "flags":4, "x":169, "y":52},
+            {"matrix":[10, 5], "flags":1, "x":188, "y":52},
+            {"matrix":[10, 7], "flags":1, "x":210, "y":52},
+            {"matrix":[11, 1], "flags":4, "x":126, "y":64},
+            {"matrix":[11, 2], "flags":1, "x":152, "y":64},
+            {"matrix":[11, 3], "flags":1, "x":166, "y":64},
+            {"matrix":[11, 4], "flags":1, "x":180, "y":64},
+            {"matrix":[11, 6], "flags":1, "x":196, "y":64},
+            {"matrix":[11, 7], "flags":1, "x":210, "y":64},
+            {"matrix":[11, 8], "flags":1, "x":224, "y":64}
+        ]
     }
 }
diff --git a/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c b/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c
index 3378ce7df9..7334ad8520 100755
--- a/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c
+++ b/keyboards/keychron/q11/ansi_encoder/keymaps/default/keymap.c
@@ -15,20 +15,18 @@
  */
 #include QMK_KEYBOARD_H
 
-// clang-format off
-
 enum layers{
     MAC_BASE,
     MAC_FN,
     WIN_BASE,
-    WIN_FN
+    WIN_FN,
 };
 
 #define KC_TASK LGUI(KC_TAB)
 #define KC_FLXP LGUI(KC_E)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_91(
+    [MAC_BASE] = LAYOUT_91_ansi(
         KC_MUTE,  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,   RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_INS,   KC_DEL,   KC_MUTE,
         _______,  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
         _______,  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
@@ -36,7 +34,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
         _______,  KC_LCTL,  KC_LOPT,  KC_LCMD,  MO(MAC_FN),         KC_SPC,                        KC_SPC,             KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_ansi_91(
+    [MAC_FN] = LAYOUT_91_ansi(
         RGB_TOG,  _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
         _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
@@ -44,7 +42,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,            _______,  _______,  _______,  _______,   _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
         _______,  _______,  _______,  _______,  _______,            _______,                       _______,            _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_ansi_91(
+    [WIN_BASE] = LAYOUT_91_ansi(
         KC_MUTE,  KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_INS,   KC_DEL,   KC_MUTE,
         _______,  KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
         _______,  KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
@@ -52,7 +50,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
         _______,  KC_LCTL,  KC_LWIN,  KC_LALT,  MO(WIN_FN),         KC_SPC,                        KC_SPC,             KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_ansi_91(
+    [WIN_FN] = LAYOUT_91_ansi(
         RGB_TOG,  _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,   RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
         _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
diff --git a/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c b/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c
index 852f34def9..d5f87b7a39 100755
--- a/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c
+++ b/keyboards/keychron/q11/ansi_encoder/keymaps/keychron/keymap.c
@@ -17,17 +17,15 @@
 #include QMK_KEYBOARD_H
 #include "keychron_common.h"
 
-// clang-format off
-
 enum layers{
     MAC_BASE,
     MAC_FN,
     WIN_BASE,
-    WIN_FN
+    WIN_FN,
 };
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_91(
+    [MAC_BASE] = LAYOUT_91_ansi(
         KC_MUTE,  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,   RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_INS,   KC_DEL,   KC_MUTE,
         MC_1,     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
         MC_2,     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
@@ -35,7 +33,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         MC_4,     KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
         MC_5,     KC_LCTL,  KC_LOPTN, KC_LCMMD, MO(MAC_FN),         KC_SPC,                        KC_SPC,             KC_RCMMD, MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_ansi_91(
+    [MAC_FN] = LAYOUT_91_ansi(
         RGB_TOG,  _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
         _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
@@ -43,7 +41,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,            _______,  _______,  _______,  _______,   _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
         _______,  _______,  _______,  _______,  _______,            _______,                       _______,            _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_ansi_91(
+    [WIN_BASE] = LAYOUT_91_ansi(
         KC_MUTE,  KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_INS,   KC_DEL,   KC_MUTE,
         MC_1,     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
         MC_2,     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
@@ -51,7 +49,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         MC_4,     KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
         MC_5,     KC_LCTL,  KC_LWIN,  KC_LALT,  MO(WIN_FN),         KC_SPC,                        KC_SPC,             KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_ansi_91(
+    [WIN_FN] = LAYOUT_91_ansi(
         RGB_TOG,  _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,   RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
         _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
diff --git a/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c b/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c
index 0452eccec2..29fe3d488d 100755
--- a/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c
+++ b/keyboards/keychron/q11/ansi_encoder/keymaps/via/keymap.c
@@ -16,8 +16,6 @@
 
 #include QMK_KEYBOARD_H
 
-// clang-format off
-
 enum layers{
     MAC_BASE,
     MAC_FN,
@@ -29,7 +27,7 @@ enum layers{
 #define KC_FLXP LGUI(KC_E)
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [MAC_BASE] = LAYOUT_ansi_91(
+    [MAC_BASE] = LAYOUT_91_ansi(
         KC_MUTE,  KC_ESC,   KC_BRID,  KC_BRIU,  KC_MCTL,  KC_LPAD,  RGB_VAD,   RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  KC_INS,   KC_DEL,   KC_MUTE,
         MC_1,     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
         MC_2,     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
@@ -37,7 +35,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         MC_4,     KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
         MC_5,     KC_LCTL,  KC_LOPT,  KC_LCMD,  MO(MAC_FN),         KC_SPC,                        KC_SPC,             KC_RCMD,  MO(MAC_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [MAC_FN] = LAYOUT_ansi_91(
+    [MAC_FN] = LAYOUT_91_ansi(
         RGB_TOG,  _______,  KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
         _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
@@ -45,7 +43,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         _______,  _______,            _______,  _______,  _______,  _______,   _______,  NK_TOGG,  _______,  _______,  _______,  _______,              _______,  _______,
         _______,  _______,  _______,  _______,  _______,            _______,                       _______,            _______,  _______,    _______,  _______,  _______,  _______),
 
-    [WIN_BASE] = LAYOUT_ansi_91(
+    [WIN_BASE] = LAYOUT_91_ansi(
         KC_MUTE,  KC_ESC,   KC_F1,    KC_F2,    KC_F3,    KC_F4,    KC_F5,     KC_F6,    KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,     KC_F12,   KC_INS,   KC_DEL,   KC_MUTE,
         MC_1,     KC_GRV,   KC_1,     KC_2,     KC_3,     KC_4,     KC_5,      KC_6,     KC_7,     KC_8,     KC_9,     KC_0,     KC_MINS,    KC_EQL,   KC_BSPC,            KC_PGUP,
         MC_2,     KC_TAB,   KC_Q,     KC_W,     KC_E,     KC_R,     KC_T,      KC_Y,     KC_U,     KC_I,     KC_O,     KC_P,     KC_LBRC,    KC_RBRC,  KC_BSLS,            KC_PGDN,
@@ -53,7 +51,7 @@ const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
         MC_4,     KC_LSFT,            KC_Z,     KC_X,     KC_C,     KC_V,      KC_B,     KC_N,     KC_M,     KC_COMM,  KC_DOT,   KC_SLSH,              KC_RSFT,  KC_UP,
         MC_5,     KC_LCTL,  KC_LWIN,  KC_LALT,  MO(WIN_FN),         KC_SPC,                        KC_SPC,             KC_RALT,  MO(WIN_FN), KC_RCTL,  KC_LEFT,  KC_DOWN,  KC_RGHT),
 
-    [WIN_FN] = LAYOUT_ansi_91(
+    [WIN_FN] = LAYOUT_91_ansi(
         RGB_TOG,  _______,  KC_BRID,  KC_BRIU,  KC_TASK,  KC_FLXP,  RGB_VAD,   RGB_VAI,  KC_MPRV,  KC_MPLY,  KC_MNXT,  KC_MUTE,  KC_VOLD,    KC_VOLU,  _______,  _______,  RGB_TOG,
         _______,  _______,  _______,  _______,  _______,  _______,  _______,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
         _______,  RGB_TOG,  RGB_MOD,  RGB_VAI,  RGB_HUI,  RGB_SAI,  RGB_SPI,   _______,  _______,  _______,  _______,  _______,  _______,    _______,  _______,            _______,
diff --git a/keyboards/keychron/q11/ansi_encoder/rules.mk b/keyboards/keychron/q11/ansi_encoder/rules.mk
index 5c9d4e8cf8..60d5c6bea2 100644
--- a/keyboards/keychron/q11/ansi_encoder/rules.mk
+++ b/keyboards/keychron/q11/ansi_encoder/rules.mk
@@ -4,4 +4,3 @@
 EEPROM_DRIVER = wear_leveling
 WEAR_LEVELING_DRIVER = embedded_flash
 SERIAL_DRIVER = usart
-