mirrors/keychron_qmk_firmware
mirrors/keychron_qmk_firmware
0
0
Fork 0
mirror of https://github.com/Keychron/qmk_firmware.git synced 2024-11-27 11:06:37 +06:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8 from keychron-contrib/vr-revert-pr6

Browse Source 
revert some of pr #6
This commit is contained in:
lalalademaxiya1 2022-01-25 09:23:27 +08:00 committed by GitHub
commit ca65b2c896
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
6 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
keyboards/keychron/q1/q1_ansi_atmega32u4_ec11/config.h
View File

@ -37,7 +37,7 @@
#define DRIVER_ADDR_2 0b1011111
/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 58 // -1, disable LED under EC11
#define DRIVER_1_LED_TOTAL 59
#define DRIVER_2_LED_TOTAL 23
#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)

8
keyboards/keychron/q1/q1_ansi_atmega32u4_ec11/q1_ansi_atmega32u4_ec11.c
View File

@ -48,7 +48,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
{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},
{0, C_16, A_16, B_16},
{0, F_1, D_1, E_1},
{0, F_2, D_2, E_2},
@ -128,7 +128,7 @@ const is31_led PROGMEM g_is31_leds[DRIVER_LED_TOTAL] = {
led_config_t g_led_config = {
{
// Key Matrix to LED Index
{ 0, __, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, __ },
{ 0, __, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 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, 71, 57, 58 },
@ -137,7 +137,7 @@ led_config_t g_led_config = {
},
{
// LED Index to Physical Position
{0,0}, {18,0}, {33,0}, {48,0}, {62,0}, {81,0}, {95,0}, {110,0}, {125,0}, {143,0}, {158,0}, {173,0}, {187,0}, {206,0},
{0,0}, {18,0}, {33,0}, {48,0}, {62,0}, {81,0}, {95,0}, {110,0}, {125,0}, {143,0}, {158,0}, {173,0}, {187,0}, {206,0}, {224,0},
{0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15}, {224,15},
{4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {202,26}, {224,26},
{6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {196,38}, {224,38},
@ -146,7 +146,7 @@ led_config_t g_led_config = {
},
{
// RGB LED Index to Flag
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 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,

2
keyboards/keychron/q1/q1_ansi_stm32l432/config.h
View File

@ -45,7 +45,7 @@
#define PHASE_CHANNEL MSKPHASE_9CHANNEL
/* Set the maxium brightness as 192 in order to limit the current to 450mA */
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS (24 * 8) // 0 = RGB_MATRIX_VAL_STEP
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS (24 * 8) // 8 = RGB_MATRIX_VAL_STEP
/* Set USB polling rate as 1 milliseconds */
#define USB_POLLING_INTERVAL_MS 1

14
keyboards/keychron/q1/q1_ansi_stm32l432/q1_ansi_stm32l432.c
View File

@ -128,12 +128,12 @@ const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
led_config_t g_led_config = {
{
// Key Matrix to LED Index
{ 0, __, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 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, 71, 57, 58 },
{ 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 80, 70, 13 },
{ 72, 73, 74, __, __, __, 75, __, __, __, 76, 77, 78, 79, 81 }
{ 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 }
},
{
// LED Index to Physical Position
@ -151,7 +151,7 @@ led_config_t g_led_config = {
1, 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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1
}
};

6
keyboards/keychron/q1/q1_ansi_stm32l432_ec11/config.h
View File

@ -37,7 +37,7 @@
#define DRIVER_ADDR_2 0b1110100
/* RGB Matrix Configuration */
#define DRIVER_1_LED_TOTAL 44 // -1, no LED under EC11
#define DRIVER_1_LED_TOTAL 45
#define DRIVER_2_LED_TOTAL 37
#define DRIVER_LED_TOTAL (DRIVER_1_LED_TOTAL + DRIVER_2_LED_TOTAL)
@ -45,7 +45,7 @@
#define PHASE_CHANNEL MSKPHASE_9CHANNEL
/* Set the maxium brightness as 192 in order to limit the current to 450mA */
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS (24 * 8) // 9 = RGB_MATRIX_VAL_STEP
#define RGB_MATRIX_MAXIMUM_BRIGHTNESS (24 * 8) // 8 = RGB_MATRIX_VAL_STEP
/* Set USB polling rate as 1 milliseconds */
#define USB_POLLING_INTERVAL_MS 1
@ -61,4 +61,4 @@
#define ENCODER_RESOLUTION 4
/* Enable caps-lock LED */
#define CAPS_LOCK_LED_INDEX 44
#define CAPS_LOCK_LED_INDEX 45

20
keyboards/keychron/q1/q1_ansi_stm32l432_ec11/q1_ansi_stm32l432_ec11.c
View File

@ -48,7 +48,7 @@ const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
{0, C_12, A_12, B_12},
{0, C_13, A_13, B_13},
{0, C_14, A_14, B_14},
// {0, C_16, A_16, B_16},
{0, C_16, A_16, B_16},
{0, I_1, G_1, H_1},
{0, I_2, G_2, H_2},
@ -128,16 +128,16 @@ const ckled2001_led PROGMEM g_ckled2001_leds[DRIVER_LED_TOTAL] = {
led_config_t g_led_config = {
{
// Key Matrix to LED Index
{ 0, __, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, __ },
{ 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, 71, 57, 58 },
{ 59, __, 60, 61, 62, 63, 64, 65, 66, 67, 68, 69, 80, 70, 13 },
{ 72, 73, 74, __, __, __, 75, __, __, __, 76, 77, 78, 79, 81 }
{ 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 }
},
{
// LED Index to Physical Position
{0,0}, {18,0}, {33,0}, {48,0}, {62,0}, {81,0}, {95,0}, {110,0}, {125,0}, {143,0}, {158,0}, {173,0}, {187,0}, {206,0},
{0,0}, {18,0}, {33,0}, {48,0}, {62,0}, {81,0}, {95,0}, {110,0}, {125,0}, {143,0}, {158,0}, {173,0}, {187,0}, {206,0}, {224,0},
{0,15}, {15,15}, {29,15}, {44,15}, {59,15}, {73,15}, {88,15}, {103,15}, {118,15}, {132,15}, {147,15}, {162,15}, {176,15}, {198,15}, {224,15},
{4,26}, {22,26}, {37,26}, {51,26}, {66,26}, {81,26}, {95,26}, {110,26}, {125,26}, {140,26}, {154,26}, {169,26}, {184,26}, {202,26}, {224,26},
{6,38}, {26,38}, {40,38}, {55,38}, {70,38}, {84,38}, {99,38}, {114,38}, {129,38}, {143,38}, {158,38}, {173,38}, {196,38}, {224,38},
@ -146,12 +146,12 @@ led_config_t g_led_config = {
},
{
// RGB LED Index to Flag
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 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, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1,
1, 1, 1, 4, 1, 1, 1, 1, 1, 1
}
};