diff options
author | Nick Brassel <[email protected]> | 2024-02-28 21:47:37 +1100 |
---|---|---|
committer | Nick Brassel <[email protected]> | 2024-02-28 21:47:37 +1100 |
commit | 4e369d405af6bba1adce6337b2e1b1ea1788566c (patch) | |
tree | b0f020feff1809e37c9e7795d344929ff0bb290a /keyboards/keychron/q9/ansi | |
parent | 4e04da397ef643f8fcf4afbe1d19f63aee1fc561 (diff) | |
parent | dd1706e468bb18dd7f7ae143de735a5d3be1bfb8 (diff) | |
download | qmk_firmware-0.24.0.tar.gz qmk_firmware-0.24.0.zip |
Merge branch 'develop'0.24.0
Diffstat (limited to 'keyboards/keychron/q9/ansi')
-rw-r--r-- | keyboards/keychron/q9/ansi/ansi.c | 132 | ||||
-rw-r--r-- | keyboards/keychron/q9/ansi/config.h | 4 | ||||
-rw-r--r-- | keyboards/keychron/q9/ansi/info.json | 79 | ||||
-rw-r--r-- | keyboards/keychron/q9/ansi/rules.mk | 15 |
4 files changed, 115 insertions, 115 deletions
diff --git a/keyboards/keychron/q9/ansi/ansi.c b/keyboards/keychron/q9/ansi/ansi.c index 9178c8dcc7..e00c7f7e9d 100644 --- a/keyboards/keychron/q9/ansi/ansi.c +++ b/keyboards/keychron/q9/ansi/ansi.c @@ -20,94 +20,68 @@ // clang-format off -const snled27351_led_t PROGMEM g_snled27351_leds[RGB_MATRIX_LED_COUNT] = { +const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { /* Refer to SNLED27351 manual for these locations * driver * | R location * | | G location * | | | B location * | | | | */ - {0, L_16, J_16, K_16}, - {0, L_15, J_15, K_15}, - {0, L_14, J_14, K_14}, - {0, L_13, J_13, K_13}, - {0, L_12, J_12, K_12}, - {0, L_11, J_11, K_11}, - {0, L_10, J_10, K_10}, - {0, L_9, J_9, K_9}, - {0, L_8, J_8, K_8}, - {0, L_7, J_7, K_7}, - {0, L_6, J_6, K_6}, - {0, L_5, J_5, K_5}, - {0, L_4, J_4, K_4}, - {0, L_3, J_3, K_3}, - {0, L_2, J_2, K_2}, + {0, CB12_CA16, CB10_CA16, CB11_CA16}, + {0, CB12_CA15, CB10_CA15, CB11_CA15}, + {0, CB12_CA14, CB10_CA14, CB11_CA14}, + {0, CB12_CA13, CB10_CA13, CB11_CA13}, + {0, CB12_CA12, CB10_CA12, CB11_CA12}, + {0, CB12_CA11, CB10_CA11, CB11_CA11}, + {0, CB12_CA10, CB10_CA10, CB11_CA10}, + {0, CB12_CA9, CB10_CA9, CB11_CA9}, + {0, CB12_CA8, CB10_CA8, CB11_CA8}, + {0, CB12_CA7, CB10_CA7, CB11_CA7}, + {0, CB12_CA6, CB10_CA6, CB11_CA6}, + {0, CB12_CA5, CB10_CA5, CB11_CA5}, + {0, CB12_CA4, CB10_CA4, CB11_CA4}, + {0, CB12_CA3, CB10_CA3, CB11_CA3}, + {0, CB12_CA2, CB10_CA2, CB11_CA2}, - {0, C_16, A_16, B_16}, - {0, C_15, A_15, B_15}, - {0, C_14, A_14, B_14}, - {0, C_13, A_13, B_13}, - {0, C_12, A_12, B_12}, - {0, C_11, A_11, B_11}, - {0, C_10, A_10, B_10}, - {0, C_9, A_9, B_9}, - {0, C_8, A_8, B_8}, - {0, C_7, A_7, B_7}, - {0, C_6, A_6, B_6}, - {0, C_5, A_5, B_5}, - {0, C_3, A_3, B_3}, - {0, C_2, A_2, B_2}, + {0, CB3_CA16, CB1_CA16, CB2_CA16}, + {0, CB3_CA15, CB1_CA15, CB2_CA15}, + {0, CB3_CA14, CB1_CA14, CB2_CA14}, + {0, CB3_CA13, CB1_CA13, CB2_CA13}, + {0, CB3_CA12, CB1_CA12, CB2_CA12}, + {0, CB3_CA11, CB1_CA11, CB2_CA11}, + {0, CB3_CA10, CB1_CA10, CB2_CA10}, + {0, CB3_CA9, CB1_CA9, CB2_CA9}, + {0, CB3_CA8, CB1_CA8, CB2_CA8}, + {0, CB3_CA7, CB1_CA7, CB2_CA7}, + {0, CB3_CA6, CB1_CA6, CB2_CA6}, + {0, CB3_CA5, CB1_CA5, CB2_CA5}, + {0, CB3_CA3, CB1_CA3, CB2_CA3}, + {0, CB3_CA2, CB1_CA2, CB2_CA2}, - {0, I_16, G_16, H_16}, - {0, I_14, G_14, H_14}, - {0, I_13, G_13, H_13}, - {0, I_12, G_12, H_12}, - {0, I_11, G_11, H_11}, - {0, I_10, G_10, H_10}, - {0, I_9, G_9, H_9}, - {0, I_8, G_8, H_8}, - {0, I_7, G_7, H_7}, - {0, I_6, G_6, H_6}, - {0, I_5, G_5, H_5}, - {0, I_3, G_3, H_3}, - {0, I_2, G_2, H_2}, + {0, CB9_CA16, CB7_CA16, CB8_CA16}, + {0, CB9_CA14, CB7_CA14, CB8_CA14}, + {0, CB9_CA13, CB7_CA13, CB8_CA13}, + {0, CB9_CA12, CB7_CA12, CB8_CA12}, + {0, CB9_CA11, CB7_CA11, CB8_CA11}, + {0, CB9_CA10, CB7_CA10, CB8_CA10}, + {0, CB9_CA9, CB7_CA9, CB8_CA9}, + {0, CB9_CA8, CB7_CA8, CB8_CA8}, + {0, CB9_CA7, CB7_CA7, CB8_CA7}, + {0, CB9_CA6, CB7_CA6, CB8_CA6}, + {0, CB9_CA5, CB7_CA5, CB8_CA5}, + {0, CB9_CA3, CB7_CA3, CB8_CA3}, + {0, CB9_CA2, CB7_CA2, CB8_CA2}, - {0, F_16, D_16, E_16}, - {0, F_15, D_15, E_15}, - {0, F_14, D_14, E_14}, - {0, F_10, D_10, E_10}, - {0, F_6, D_6, E_6}, - {0, F_5, D_5, E_5}, - {0, F_4, D_4, E_4}, - {0, F_3, D_3, E_3}, - {0, F_2, D_2, E_2}, - {0, C_4, A_4, B_4} -}; - -#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, 51, 27, 28 }, - { 29, __, 30, 31, 32, 33, 34, 35, 36, 37, 38, 39, __, 40, 41 }, - { 42, 43, 44, __, __, __, 45, __, __, __, 46, 47, 48, 49, 50 }, - }, - { - // LED Index to Physical Position - {2,0}, {20,0}, {35,0}, {50,0}, {65,0}, {80,0}, {94,0}, {109,0}, {124,0}, {139,0}, {154,0}, {168,0}, {183,0}, {202,0}, {224,0}, - {4,21}, {24,21}, {39,21}, {54,21}, {68,21}, {83,21}, {98,21}, {113,21}, {128,21}, {142,21}, {157,21}, {172,21}, {196,21}, {224,27}, - {7,43}, {31,43}, {46,43}, {61,43}, {76,43}, {91,43}, {105,43}, {120,43}, {135,43}, {150,43}, {165,43}, {185,43}, {205,43}, - {0,64}, {18,64}, {37,64}, {92,64}, {146,64}, {161,64}, {176,64}, {190,64}, {205,64}, {220,64}, - }, - { - // RGB LED Index to Flag - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, - 8, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1, - 1, 1, 1, 4, 1, 1, 1, 1, 1, 1, - } + {0, CB6_CA16, CB4_CA16, CB5_CA16}, + {0, CB6_CA15, CB4_CA15, CB5_CA15}, + {0, CB6_CA14, CB4_CA14, CB5_CA14}, + {0, CB6_CA10, CB4_CA10, CB5_CA10}, + {0, CB6_CA6, CB4_CA6, CB5_CA6}, + {0, CB6_CA5, CB4_CA5, CB5_CA5}, + {0, CB6_CA4, CB4_CA4, CB5_CA4}, + {0, CB6_CA3, CB4_CA3, CB5_CA3}, + {0, CB6_CA2, CB4_CA2, CB5_CA2}, + {0, CB3_CA4, CB1_CA4, CB2_CA4} }; #endif // RGB_MATRIX_ENABLE diff --git a/keyboards/keychron/q9/ansi/config.h b/keyboards/keychron/q9/ansi/config.h index f9565bd6f0..40cc325d43 100644 --- a/keyboards/keychron/q9/ansi/config.h +++ b/keyboards/keychron/q9/ansi/config.h @@ -16,9 +16,5 @@ #pragma once -/* RGB Matrix Configuration */ -#define DRIVER_1_LED_TOTAL 52 -#define RGB_MATRIX_LED_COUNT DRIVER_1_LED_TOTAL - /* Enable caps-lock LED */ #define CAPS_LOCK_LED_INDEX 15 diff --git a/keyboards/keychron/q9/ansi/info.json b/keyboards/keychron/q9/ansi/info.json index ccb29a749b..ec5f367ed1 100644 --- a/keyboards/keychron/q9/ansi/info.json +++ b/keyboards/keychron/q9/ansi/info.json @@ -1,23 +1,67 @@ { - "keyboard_name": "Keychron Q9", - "manufacturer": "Keychron", - "url": "https://github.com/Keychron", - "maintainer": "lalalademaxiya1", - "usb": { - "vid": "0x3434", - "pid": "0x0190", - "device_version": "1.0.0" - }, "rgb_matrix": { - "driver": "snled27351" + "layout": [ + {"matrix": [0, 0], "x": 2, "y": 0, "flags": 1}, + {"matrix": [0, 1], "x": 20, "y": 0, "flags": 4}, + {"matrix": [0, 2], "x": 35, "y": 0, "flags": 4}, + {"matrix": [0, 3], "x": 50, "y": 0, "flags": 4}, + {"matrix": [0, 4], "x": 65, "y": 0, "flags": 4}, + {"matrix": [0, 5], "x": 80, "y": 0, "flags": 4}, + {"matrix": [0, 6], "x": 94, "y": 0, "flags": 4}, + {"matrix": [0, 7], "x": 109, "y": 0, "flags": 4}, + {"matrix": [0, 8], "x": 124, "y": 0, "flags": 4}, + {"matrix": [0, 9], "x": 139, "y": 0, "flags": 4}, + {"matrix": [0, 10], "x": 154, "y": 0, "flags": 4}, + {"matrix": [0, 11], "x": 168, "y": 0, "flags": 4}, + {"matrix": [0, 12], "x": 183, "y": 0, "flags": 4}, + {"matrix": [0, 13], "x": 202, "y": 0, "flags": 4}, + {"matrix": [0, 14], "x": 224, "y": 0, "flags": 1}, + + {"matrix": [1, 0], "x": 4, "y": 21, "flags": 8}, + {"matrix": [1, 1], "x": 24, "y": 21, "flags": 4}, + {"matrix": [1, 2], "x": 39, "y": 21, "flags": 4}, + {"matrix": [1, 3], "x": 54, "y": 21, "flags": 4}, + {"matrix": [1, 4], "x": 68, "y": 21, "flags": 4}, + {"matrix": [1, 5], "x": 83, "y": 21, "flags": 4}, + {"matrix": [1, 6], "x": 98, "y": 21, "flags": 4}, + {"matrix": [1, 7], "x": 113, "y": 21, "flags": 4}, + {"matrix": [1, 8], "x": 128, "y": 21, "flags": 4}, + {"matrix": [1, 9], "x": 142, "y": 21, "flags": 4}, + {"matrix": [1, 10], "x": 157, "y": 21, "flags": 4}, + {"matrix": [1, 11], "x": 172, "y": 21, "flags": 4}, + {"matrix": [1, 13], "x": 196, "y": 21, "flags": 1}, + {"matrix": [1, 14], "x": 224, "y": 27, "flags": 1}, + + {"matrix": [2, 0], "x": 7, "y": 43, "flags": 1}, + {"matrix": [2, 2], "x": 31, "y": 43, "flags": 4}, + {"matrix": [2, 3], "x": 46, "y": 43, "flags": 4}, + {"matrix": [2, 4], "x": 61, "y": 43, "flags": 4}, + {"matrix": [2, 5], "x": 76, "y": 43, "flags": 4}, + {"matrix": [2, 6], "x": 91, "y": 43, "flags": 4}, + {"matrix": [2, 7], "x": 105, "y": 43, "flags": 4}, + {"matrix": [2, 8], "x": 120, "y": 43, "flags": 4}, + {"matrix": [2, 9], "x": 135, "y": 43, "flags": 4}, + {"matrix": [2, 10], "x": 150, "y": 43, "flags": 4}, + {"matrix": [2, 11], "x": 165, "y": 43, "flags": 4}, + {"matrix": [2, 13], "x": 185, "y": 43, "flags": 1}, + {"matrix": [2, 14], "x": 205, "y": 43, "flags": 1}, + + {"matrix": [3, 0], "x": 0, "y": 64, "flags": 1}, + {"matrix": [3, 1], "x": 18, "y": 64, "flags": 1}, + {"matrix": [3, 2], "x": 37, "y": 64, "flags": 1}, + {"matrix": [3, 6], "x": 92, "y": 64, "flags": 4}, + {"matrix": [3, 10], "x": 146, "y": 64, "flags": 1}, + {"matrix": [3, 11], "x": 161, "y": 64, "flags": 1}, + {"matrix": [3, 12], "x": 176, "y": 64, "flags": 1}, + {"matrix": [3, 13], "x": 190, "y": 64, "flags": 1}, + {"matrix": [3, 14], "x": 205, "y": 64, "flags": 1}, + {"matrix": [1, 12], "x": 220, "y": 64, "flags": 1} + ] }, - "matrix_pins": { - "cols": ["A10", "A9", "A8", "B1", "B0", "A7", "A6", "A5", "A4", "A3", "A2", "A1", "A0", "C15", "C14"], - "rows": ["B3", "A15", "A14", "A13"] + "usb": { + "device_version": "1.0.0", + "pid": "0x0190" }, - "diode_direction": "ROW2COL", - "processor": "STM32L432", - "bootloader": "stm32-dfu", "layouts": { "LAYOUT_ansi_52": { "layout": [ @@ -65,7 +109,6 @@ {"matrix": [2, 11], "x": 11.25, "y": 2.25}, {"matrix": [2, 13], "x": 12.25, "y": 2.25, "w": 1.75}, {"matrix": [2, 14], "x": 14.25, "y": 2.5}, - {"matrix": [3, 0], "x": 0, "y": 3.25, "w": 1.25}, {"matrix": [3, 1], "x": 1.25, "y": 3.25, "w": 1.25}, {"matrix": [3, 2], "x": 2.5, "y": 3.25, "w": 1.25}, @@ -79,4 +122,4 @@ ] } } -} +}
\ No newline at end of file diff --git a/keyboards/keychron/q9/ansi/rules.mk b/keyboards/keychron/q9/ansi/rules.mk index cf31e094cb..6e7633bfe0 100644 --- a/keyboards/keychron/q9/ansi/rules.mk +++ b/keyboards/keychron/q9/ansi/rules.mk @@ -1,14 +1 @@ -# Build Options -# change yes to no to disable -# -BOOTMAGIC_ENABLE = yes # Enable Bootmagic Lite -MOUSEKEY_ENABLE = yes # Mouse keys -EXTRAKEY_ENABLE = yes # Audio control and System control -CONSOLE_ENABLE = no # Console for debug -COMMAND_ENABLE = no # Commands for debug and configuration -NKRO_ENABLE = yes # Enable USB N-key Rollover -BACKLIGHT_ENABLE = no # Enable keyboard backlight functionality -RGBLIGHT_ENABLE = no # Enable keyboard RGB underglow -AUDIO_ENABLE = no # Audio output -DIP_SWITCH_ENABLE = yes -RGB_MATRIX_ENABLE = yes +# This file intentionally left blank |