diff options
Diffstat (limited to 'keyboards/keychron/c1_pro/ansi')
-rw-r--r-- | keyboards/keychron/c1_pro/ansi/rgb/config.h | 14 | ||||
-rw-r--r-- | keyboards/keychron/c1_pro/ansi/rgb/info.json | 3 | ||||
-rw-r--r-- | keyboards/keychron/c1_pro/ansi/rgb/rgb.c | 178 | ||||
-rw-r--r-- | keyboards/keychron/c1_pro/ansi/white/config.h | 15 | ||||
-rw-r--r-- | keyboards/keychron/c1_pro/ansi/white/info.json | 6 | ||||
-rw-r--r-- | keyboards/keychron/c1_pro/ansi/white/white.c | 182 |
6 files changed, 185 insertions, 213 deletions
diff --git a/keyboards/keychron/c1_pro/ansi/rgb/config.h b/keyboards/keychron/c1_pro/ansi/rgb/config.h index a88319a63d..c5e293d1df 100644 --- a/keyboards/keychron/c1_pro/ansi/rgb/config.h +++ b/keyboards/keychron/c1_pro/ansi/rgb/config.h @@ -23,24 +23,10 @@ #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_VDDIO #define SNLED27351_I2C_ADDRESS_2 SNLED27351_I2C_ADDRESS_GND -/* RGB Matrix Configuration */ -#define DRIVER_1_LED_TOTAL 49 -#define DRIVER_2_LED_TOTAL 39 -#define RGB_MATRIX_LED_COUNT (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL) - #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL /* Set led driver current */ #define SNLED27351_CURRENT_TUNE \ { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 } -/* turn off effects when suspended */ -#define RGB_DISABLE_WHEN_USB_SUSPENDED - /* Enable caps_lock, win os and mac os indicator */ #define CAPS_MAC_WIN_LED_INDEX 63 - -// RGB Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_rgb_matrix?id=rgb-matrix-effects -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS -#define RGB_MATRIX_KEYPRESSES diff --git a/keyboards/keychron/c1_pro/ansi/rgb/info.json b/keyboards/keychron/c1_pro/ansi/rgb/info.json index fcd805706b..64d45e3595 100644 --- a/keyboards/keychron/c1_pro/ansi/rgb/info.json +++ b/keyboards/keychron/c1_pro/ansi/rgb/info.json @@ -224,6 +224,7 @@ {"matrix":[5, 14], "flags":1, "x":198, "y":64}, {"matrix":[5, 15], "flags":1, "x":211, "y":64}, {"matrix":[4, 14], "flags":1, "x":224, "y":64} - ] + ], + "sleep": true } } diff --git a/keyboards/keychron/c1_pro/ansi/rgb/rgb.c b/keyboards/keychron/c1_pro/ansi/rgb/rgb.c index c04e82a44e..e4c640d6bf 100644 --- a/keyboards/keychron/c1_pro/ansi/rgb/rgb.c +++ b/keyboards/keychron/c1_pro/ansi/rgb/rgb.c @@ -18,107 +18,107 @@ // clang-format off #ifdef RGB_MATRIX_ENABLE -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, 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, I_15, G_15, H_15}, + {0, CB9_CA1, CB7_CA1, CB8_CA1}, + {0, CB9_CA2, CB7_CA2, CB8_CA2}, + {0, CB9_CA3, CB7_CA3, CB8_CA3}, + {0, CB9_CA4, CB7_CA4, CB8_CA4}, + {0, CB9_CA5, CB7_CA5, CB8_CA5}, + {0, CB9_CA6, CB7_CA6, CB8_CA6}, + {0, CB9_CA7, CB7_CA7, CB8_CA7}, + {0, CB9_CA8, CB7_CA8, CB8_CA8}, + {0, CB9_CA9, CB7_CA9, CB8_CA9}, + {0, CB9_CA10, CB7_CA10, CB8_CA10}, + {0, CB9_CA11, CB7_CA11, CB8_CA11}, + {0, CB9_CA12, CB7_CA12, CB8_CA12}, + {0, CB9_CA13, CB7_CA13, CB8_CA13}, + {0, CB9_CA15, CB7_CA15, CB8_CA15}, + {0, CB9_CA16, CB7_CA16, CB8_CA16}, + {1, CB9_CA15, CB7_CA15, CB8_CA15}, - {0, C_1, A_1, B_1}, - {0, C_2, A_2, B_2}, - {0, C_3, A_3, B_3}, - {0, C_4, A_4, B_4}, - {0, C_5, A_5, B_5}, - {0, C_6, A_6, B_6}, - {0, C_7, A_7, B_7}, - {0, C_8, A_8, B_8}, - {0, C_9, A_9, B_9}, - {0, C_10, A_10, B_10}, - {0, C_11, A_11, B_11}, - {0, C_12, A_12, B_12}, - {0, C_13, A_13, B_13}, - {0, C_14, A_14, B_14}, - {0, C_15, A_15, B_15}, - {0, C_16, A_16, B_16}, - {1, I_16, G_16, H_16}, + {0, CB3_CA1, CB1_CA1, CB2_CA1}, + {0, CB3_CA2, CB1_CA2, CB2_CA2}, + {0, CB3_CA3, CB1_CA3, CB2_CA3}, + {0, CB3_CA4, CB1_CA4, CB2_CA4}, + {0, CB3_CA5, CB1_CA5, CB2_CA5}, + {0, CB3_CA6, CB1_CA6, CB2_CA6}, + {0, CB3_CA7, CB1_CA7, CB2_CA7}, + {0, CB3_CA8, CB1_CA8, CB2_CA8}, + {0, CB3_CA9, CB1_CA9, CB2_CA9}, + {0, CB3_CA10, CB1_CA10, CB2_CA10}, + {0, CB3_CA11, CB1_CA11, CB2_CA11}, + {0, CB3_CA12, CB1_CA12, CB2_CA12}, + {0, CB3_CA13, CB1_CA13, CB2_CA13}, + {0, CB3_CA14, CB1_CA14, CB2_CA14}, + {0, CB3_CA15, CB1_CA15, CB2_CA15}, + {0, CB3_CA16, CB1_CA16, CB2_CA16}, + {1, CB9_CA16, CB7_CA16, CB8_CA16}, - {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, I_13, G_13, H_13}, + {0, CB6_CA1, CB4_CA1, CB5_CA1}, + {0, CB6_CA2, CB4_CA2, CB5_CA2}, + {0, CB6_CA3, CB4_CA3, CB5_CA3}, + {0, CB6_CA4, CB4_CA4, CB5_CA4}, + {0, CB6_CA5, CB4_CA5, CB5_CA5}, + {0, CB6_CA6, CB4_CA6, CB5_CA6}, + {0, CB6_CA7, CB4_CA7, CB5_CA7}, + {0, CB6_CA8, CB4_CA8, CB5_CA8}, + {0, CB6_CA9, CB4_CA9, CB5_CA9}, + {0, CB6_CA10, CB4_CA10, CB5_CA10}, + {0, CB6_CA11, CB4_CA11, CB5_CA11}, + {0, CB6_CA12, CB4_CA12, CB5_CA12}, + {0, CB6_CA13, CB4_CA13, CB5_CA13}, + {0, CB6_CA14, CB4_CA14, CB5_CA14}, + {0, CB6_CA15, CB4_CA15, CB5_CA15}, + {0, CB6_CA16, CB4_CA16, CB5_CA16}, + {1, CB9_CA13, CB7_CA13, CB8_CA13}, - {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, CB9_CA1, CB7_CA1, CB8_CA1}, + {1, CB9_CA2, CB7_CA2, CB8_CA2}, + {1, CB9_CA3, CB7_CA3, CB8_CA3}, + {1, CB9_CA4, CB7_CA4, CB8_CA4}, + {1, CB9_CA5, CB7_CA5, CB8_CA5}, + {1, CB9_CA6, CB7_CA6, CB8_CA6}, + {1, CB9_CA7, CB7_CA7, CB8_CA7}, + {1, CB9_CA8, CB7_CA8, CB8_CA8}, + {1, CB9_CA9, CB7_CA9, CB8_CA9}, + {1, CB9_CA10, CB7_CA10, CB8_CA10}, + {1, CB9_CA11, CB7_CA11, CB8_CA11}, + {1, CB9_CA12, CB7_CA12, CB8_CA12}, + {1, CB9_CA14, CB7_CA14, CB8_CA14}, - {0, I_14, G_14, H_14}, // CAPS_MAC_WIN_LED_INDEX + {0, CB9_CA14, CB7_CA14, CB8_CA14}, // CAPS_MAC_WIN_LED_INDEX - {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, CB3_CA1, CB1_CA1, CB2_CA1}, + {1, CB3_CA3, CB1_CA3, CB2_CA3}, + {1, CB3_CA4, CB1_CA4, CB2_CA4}, + {1, CB3_CA5, CB1_CA5, CB2_CA5}, + {1, CB3_CA6, CB1_CA6, CB2_CA6}, + {1, CB3_CA7, CB1_CA7, CB2_CA7}, + {1, CB3_CA8, CB1_CA8, CB2_CA8}, + {1, CB3_CA9, CB1_CA9, CB2_CA9}, + {1, CB3_CA10, CB1_CA10, CB2_CA10}, + {1, CB3_CA11, CB1_CA11, CB2_CA11}, + {1, CB3_CA12, CB1_CA12, CB2_CA12}, + {1, CB3_CA14, CB1_CA14, CB2_CA14}, + {1, CB3_CA16, CB1_CA16, CB2_CA16}, - {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, CB6_CA1, CB4_CA1, CB5_CA1}, + {1, CB6_CA2, CB4_CA2, CB5_CA2}, + {1, CB6_CA3, CB4_CA3, CB5_CA3}, + {1, CB6_CA7, CB4_CA7, CB5_CA7}, + {1, CB6_CA11, CB4_CA11, CB5_CA11}, + {1, CB6_CA12, CB4_CA12, CB5_CA12}, + {1, CB6_CA13, CB4_CA13, CB5_CA13}, + {1, CB6_CA14, CB4_CA14, CB5_CA14}, + {1, CB6_CA15, CB4_CA15, CB5_CA15}, + {1, CB6_CA16, CB4_CA16, CB5_CA16}, + {1, CB3_CA15, CB1_CA15, CB2_CA15}, }; // clang-format on diff --git a/keyboards/keychron/c1_pro/ansi/white/config.h b/keyboards/keychron/c1_pro/ansi/white/config.h index a8a836c5dd..2db91f7053 100644 --- a/keyboards/keychron/c1_pro/ansi/white/config.h +++ b/keyboards/keychron/c1_pro/ansi/white/config.h @@ -21,26 +21,11 @@ /* LED Matrix Driver Configuration */ #define SNLED27351_I2C_ADDRESS_1 SNLED27351_I2C_ADDRESS_GND - -/* LED Matrix Configuration */ -#define LED_MATRIX_LED_COUNT 90 - #define SNLED27351_PHASE_CHANNEL SNLED27351_SCAN_PHASE_9_CHANNEL -/* Set led driver current */ #define SNLED27351_CURRENT_TUNE \ { 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44, 0x9D, 0x9D, 0x44 } -/* turn off effects when suspended */ -#define LED_DISABLE_WHEN_USB_SUSPENDED - /* Enbale caps_lcok, win os and mac os indicator */ #define CAPS_LOCK_LED_INDEX 63 #define MAC_LOCK_LED_INDEX 64 #define WIN_LOCK_LED_INDEX 65 - -// LED Matrix Animation modes. Explicitly enabled -// For full list of effects, see: -// https://docs.qmk.fm/#/feature_led_matrix?id=led-matrix-effects -// #if defined(LED_MATRIX_KEYPRESSES) || defined(LED_MATRIX_KEYRELEASES) -#define LED_MATRIX_KEYPRESSES -#define LED_MATRIX_KEYRELEASES diff --git a/keyboards/keychron/c1_pro/ansi/white/info.json b/keyboards/keychron/c1_pro/ansi/white/info.json index 4a6c6e2b8d..c64183a739 100644 --- a/keyboards/keychron/c1_pro/ansi/white/info.json +++ b/keyboards/keychron/c1_pro/ansi/white/info.json @@ -107,8 +107,6 @@ "led_matrix": { "driver": "snled27351", "animations": { - "none": true, - "solid": true, "breathing": true, "band_pinwheel": true, "band_spiral": true, @@ -221,6 +219,8 @@ {"matrix":[5, 14], "flags":1, "x":198, "y":64}, {"matrix":[5, 15], "flags":1, "x":211, "y":64}, {"matrix":[3, 15], "flags":1, "x":224, "y":64} - ] + ], + "sleep": true, + "react_on_keyup": true } } diff --git a/keyboards/keychron/c1_pro/ansi/white/white.c b/keyboards/keychron/c1_pro/ansi/white/white.c index 15f291e80c..2b41845c9b 100644 --- a/keyboards/keychron/c1_pro/ansi/white/white.c +++ b/keyboards/keychron/c1_pro/ansi/white/white.c @@ -18,107 +18,107 @@ // clang-format off #ifdef LED_MATRIX_ENABLE -const snled27351_led_t PROGMEM g_snled27351_leds[LED_MATRIX_LED_COUNT] = { +const snled27351_led_t PROGMEM g_snled27351_leds[SNLED27351_LED_COUNT] = { /* Refer to SNLED27351 manual for these locations * driver * | LED address * | | */ - {0, A_16}, // esc - {0, A_15}, // f1 - {0, A_14}, // f2 - {0, A_13}, // f3 - {0, A_12}, // f4 - {0, A_11}, // f5 - {0, A_10}, // f6 - {0, A_9}, // f7 - {0, A_8}, // f8 - {0, A_7}, // f9 - {0, A_6}, // f10 - {0, A_5}, // f11 - {0, A_4}, // f12 - {0, A_2}, // print - {0, A_1}, // siri - {0, G_1}, // light + {0, CB1_CA16}, // esc + {0, CB1_CA15}, // f1 + {0, CB1_CA14}, // f2 + {0, CB1_CA13}, // f3 + {0, CB1_CA12}, // f4 + {0, CB1_CA11}, // f5 + {0, CB1_CA10}, // f6 + {0, CB1_CA9}, // f7 + {0, CB1_CA8}, // f8 + {0, CB1_CA7}, // f9 + {0, CB1_CA6}, // f10 + {0, CB1_CA5}, // f11 + {0, CB1_CA4}, // f12 + {0, CB1_CA2}, // print + {0, CB1_CA1}, // siri + {0, CB7_CA1}, // light - {0, B_16}, // ~ - {0, B_15}, // 1! - {0, B_14}, // 2@ - {0, B_13}, // 3# - {0, B_12}, // 4$ - {0, B_11}, // 5% - {0, B_10}, // 6^ - {0, B_9}, // 7& - {0, B_8}, // 8* - {0, B_7}, // 9( - {0, B_6}, // 0) - {0, B_5}, // -_ - {0, B_4}, // =+ - {0, B_3}, // back space - {0, B_2}, // INS - {0, B_1}, // HOME - {0, H_1}, // PGUP + {0, CB2_CA16}, // ~ + {0, CB2_CA15}, // 1! + {0, CB2_CA14}, // 2@ + {0, CB2_CA13}, // 3# + {0, CB2_CA12}, // 4$ + {0, CB2_CA11}, // 5% + {0, CB2_CA10}, // 6^ + {0, CB2_CA9}, // 7& + {0, CB2_CA8}, // 8* + {0, CB2_CA7}, // 9( + {0, CB2_CA6}, // 0) + {0, CB2_CA5}, // -_ + {0, CB2_CA4}, // =+ + {0, CB2_CA3}, // back space + {0, CB2_CA2}, // INS + {0, CB2_CA1}, // HOME + {0, CB8_CA1}, // PGUP - {0, C_16}, // tab - {0, C_15}, // q - {0, C_14}, // w - {0, C_13}, // e - {0, C_12}, // r - {0, C_11}, // t - {0, C_10}, // y - {0, C_9}, // u - {0, C_8}, // i - {0, C_7}, // o - {0, C_6}, // p - {0, C_5}, // [{ - {0, C_4}, // ]} - {0, C_3}, // \| - {0, C_2}, // DEL - {0, C_1}, // END - {0, G_6}, // PGDN + {0, CB3_CA16}, // tab + {0, CB3_CA15}, // q + {0, CB3_CA14}, // w + {0, CB3_CA13}, // e + {0, CB3_CA12}, // r + {0, CB3_CA11}, // t + {0, CB3_CA10}, // y + {0, CB3_CA9}, // u + {0, CB3_CA8}, // i + {0, CB3_CA7}, // o + {0, CB3_CA6}, // p + {0, CB3_CA5}, // [{ + {0, CB3_CA4}, // ]} + {0, CB3_CA3}, // \| + {0, CB3_CA2}, // DEL + {0, CB3_CA1}, // END + {0, CB7_CA6}, // PGDN - {0, D_16}, // caps lock - {0, D_15}, // a - {0, D_14}, // s - {0, D_13}, // d - {0, D_12}, // f - {0, D_11}, // g - {0, D_10}, // h - {0, D_9}, // j - {0, D_8}, // k - {0, D_7}, // l - {0, D_6}, // ;: - {0, D_5}, // '" - {0, D_3}, // enter + {0, CB4_CA16}, // caps lock + {0, CB4_CA15}, // a + {0, CB4_CA14}, // s + {0, CB4_CA13}, // d + {0, CB4_CA12}, // f + {0, CB4_CA11}, // g + {0, CB4_CA10}, // h + {0, CB4_CA9}, // j + {0, CB4_CA8}, // k + {0, CB4_CA7}, // l + {0, CB4_CA6}, // ;: + {0, CB4_CA5}, // '" + {0, CB4_CA3}, // enter - {0, H_7}, // CPAS - {0, H_8}, // MAC - {0, H_9}, // WIN + {0, CB8_CA7}, // CPAS + {0, CB8_CA8}, // MAC + {0, CB8_CA9}, // WIN - {0, E_16}, // left shift - {0, E_14}, // z - {0, E_13}, // x - {0, E_12}, // c - {0, E_11}, // v - {0, E_10}, // b - {0, E_9}, // b - {0, E_8}, // n - {0, E_7}, // m - {0, E_6}, // ,< - {0, E_5}, // .> - {0, E_3}, // right shift - {0, E_1}, // up + {0, CB5_CA16}, // left shift + {0, CB5_CA14}, // z + {0, CB5_CA13}, // x + {0, CB5_CA12}, // c + {0, CB5_CA11}, // v + {0, CB5_CA10}, // b + {0, CB5_CA9}, // b + {0, CB5_CA8}, // n + {0, CB5_CA7}, // m + {0, CB5_CA6}, // ,< + {0, CB5_CA5}, // .> + {0, CB5_CA3}, // right shift + {0, CB5_CA1}, // up - {0, F_16}, // left ctrl - {0, F_15}, // left command - {0, F_14}, // left option - {0, F_10}, // space - {0, F_6}, // right command - {0, F_5}, // right option - {0, F_4}, // right ctrl - {0, F_3}, // Fn - {0, F_2}, // left - {0, F_1}, // down - {0, G_13}, // right + {0, CB6_CA16}, // left ctrl + {0, CB6_CA15}, // left command + {0, CB6_CA14}, // left option + {0, CB6_CA10}, // space + {0, CB6_CA6}, // right command + {0, CB6_CA5}, // right option + {0, CB6_CA4}, // right ctrl + {0, CB6_CA3}, // Fn + {0, CB6_CA2}, // left + {0, CB6_CA1}, // down + {0, CB7_CA13}, // right }; // clang-format on |