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

This commit is contained in:
QMK Bot 2022-05-07 00:01:50 +00:00
commit 785444199e

View file

@ -113,16 +113,18 @@ void matrix_slave_scan_kb() {
#ifdef RGB_MATRIX_ENABLE #ifdef RGB_MATRIX_ENABLE
// clang-format off // clang-format off
led_config_t g_led_config = { { led_config_t g_led_config = { {
{ 41, 42, 43, 44, 45, 46, 47 }, { 41, 42, 43, 44, 45, 46, 47, NO_LED },
{ 54, 53, 52, 51, 50, 49, 48 }, { 54, 53, 52, 51, 50, 49, 48, NO_LED },
{ 55, 56, 57, 58, 59, 60, 61 }, { 55, 56, 57, 58, 59, 60, 61, NO_LED },
{ 68, 67, 66, 65, 64, 63, 62 }, { 68, 67, 66, 65, 64, 63, 62, NO_LED },
{ 69, 70, 71, 72, 73, 74, 75, 76 }, { 69, 70, 71, 72, 73, 74, 75, 76 },
{ 119, 120, 121, 122, 123, 124, 125 }, { NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
{ 132, 131, 130, 129, 128, 127, 126 }, { 119, 120, 121, 122, 123, 124, 125, NO_LED },
{ 133, 134, 135, 136, 137, 138, 139 }, { 132, 131, 130, 129, 128, 127, 126, NO_LED },
{ 146, 145, 144, 143, 142, 141, 140 }, { 133, 134, 135, 136, 137, 138, 139, NO_LED },
{ 147, 148, 149, 150, 151, 152, 153 } { 146, 145, 144, 143, 142, 141, 140, NO_LED },
{ 147, 148, 149, 150, 151, 152, 153, 154 },
{ NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
}, { // ALL XY VALUES DIVIDE BY 2, THEN ADD 5 }, { // ALL XY VALUES DIVIDE BY 2, THEN ADD 5
{ 1, 6 }, { 1, 13 }, { 1, 19 }, { 1, 25 }, { 1, 31 }, { 1, 37 }, { 1, 43 }, { 1, 49 }, { 4, 52 }, { 11, 52 }, { 1, 6 }, { 1, 13 }, { 1, 19 }, { 1, 25 }, { 1, 31 }, { 1, 37 }, { 1, 43 }, { 1, 49 }, { 4, 52 }, { 11, 52 },
{ 17, 52 }, { 23, 52 }, { 29, 52 }, { 35, 52 }, { 41, 54 }, { 46, 57 }, { 52, 60 }, { 57, 63 }, { 62, 66 }, { 68, 69 }, { 17, 52 }, { 23, 52 }, { 29, 52 }, { 35, 52 }, { 41, 54 }, { 46, 57 }, { 52, 60 }, { 57, 63 }, { 62, 66 }, { 68, 69 },
@ -284,4 +286,4 @@ bool process_record_kb(uint16_t keycode, keyrecord_t *record) {
#endif #endif
} }
return true; return true;
}; };