mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-11 12:20:55 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
QMK Bot
commit
8389b73bb0
@ -25,6 +25,3 @@
|
||||
* switch and a diode towards the row. The row is then connected to the AVR as an input. This means
|
||||
* the diode direction is COL(umn) to ROW */
|
||||
#define DIODE_DIRECTION COL2ROW
|
||||
|
||||
/* The number of RGB LEDs connected */
|
||||
#define RGB_MATRIX_LED_COUNT 105
|
||||
|
||||
@ -28,6 +28,131 @@
|
||||
"animations": {
|
||||
"cycle_left_right": true
|
||||
},
|
||||
"layout": [
|
||||
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
|
||||
|
||||
{"matrix": [0, 1], "x": 21, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 2], "x": 31, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 3], "x": 42, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 4], "x": 52, "y": 0, "flags": 4},
|
||||
|
||||
{"matrix": [0, 5], "x": 68, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 6], "x": 78, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 7], "x": 89, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 8], "x": 99, "y": 0, "flags": 4},
|
||||
|
||||
{"matrix": [0, 9], "x": 115, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 10], "x": 125, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 11], "x": 135, "y": 0, "flags": 4},
|
||||
{"matrix": [0, 12], "x": 146, "y": 0, "flags": 4},
|
||||
|
||||
{"matrix": [0, 14], "x": 159, "y": 0, "flags": 1},
|
||||
{"matrix": [0, 15], "x": 169, "y": 0, "flags": 1},
|
||||
{"matrix": [0, 16], "x": 180, "y": 0, "flags": 1},
|
||||
|
||||
{"matrix": [1, 20], "x": 224, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 19], "x": 214, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 18], "x": 203, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 17], "x": 193, "y": 15, "flags": 4},
|
||||
|
||||
{"matrix": [1, 16], "x": 180, "y": 15, "flags": 1},
|
||||
{"matrix": [1, 15], "x": 169, "y": 15, "flags": 1},
|
||||
{"matrix": [1, 14], "x": 159, "y": 15, "flags": 1},
|
||||
|
||||
{"matrix": [1, 13], "x": 141, "y": 15, "flags": 1},
|
||||
{"matrix": [1, 12], "x": 125, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 11], "x": 115, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 10], "x": 104, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 9], "x": 94, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 8], "x": 83, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 7], "x": 73, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 6], "x": 63, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 5], "x": 52, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 4], "x": 42, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 3], "x": 31, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 2], "x": 21, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 1], "x": 10, "y": 15, "flags": 4},
|
||||
{"matrix": [1, 0], "x": 0, "y": 15, "flags": 4},
|
||||
|
||||
{"matrix": [2, 0], "x": 3, "y": 27, "flags": 1},
|
||||
{"matrix": [2, 1], "x": 16, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 2], "x": 26, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 3], "x": 36, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 4], "x": 47, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 5], "x": 57, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 6], "x": 68, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 7], "x": 78, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 8], "x": 89, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 9], "x": 99, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 10], "x": 109, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 11], "x": 120, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 12], "x": 130, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 13], "x": 145, "y": 34, "flags": 1},
|
||||
|
||||
{"matrix": [2, 14], "x": 159, "y": 27, "flags": 1},
|
||||
{"matrix": [2, 15], "x": 169, "y": 27, "flags": 1},
|
||||
{"matrix": [2, 16], "x": 180, "y": 27, "flags": 1},
|
||||
|
||||
{"matrix": [2, 17], "x": 193, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 18], "x": 203, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 19], "x": 214, "y": 27, "flags": 4},
|
||||
{"matrix": [2, 20], "x": 224, "y": 34, "flags": 4},
|
||||
|
||||
{"matrix": [3, 19], "x": 214, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 18], "x": 203, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 17], "x": 193, "y": 40, "flags": 4},
|
||||
|
||||
{"matrix": [3, 12], "x": 133, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 11], "x": 122, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 10], "x": 112, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 9], "x": 102, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 8], "x": 91, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 7], "x": 81, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 6], "x": 70, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 5], "x": 60, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 4], "x": 49, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 3], "x": 39, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 2], "x": 29, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 1], "x": 18, "y": 40, "flags": 4},
|
||||
{"matrix": [3, 0], "x": 4, "y": 40, "flags": 1},
|
||||
|
||||
{"matrix": [4, 0], "x": 1, "y": 52, "flags": 1},
|
||||
{"matrix": [4, 1], "x": 13, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 2], "x": 23, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 3], "x": 34, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 4], "x": 44, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 5], "x": 55, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 6], "x": 65, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 7], "x": 76, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 8], "x": 86, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 9], "x": 96, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 10], "x": 107, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 11], "x": 117, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 13], "x": 137, "y": 52, "flags": 1},
|
||||
|
||||
{"matrix": [4, 15], "x": 169, "y": 52, "flags": 4},
|
||||
|
||||
{"matrix": [4, 17], "x": 193, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 18], "x": 203, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 19], "x": 214, "y": 52, "flags": 4},
|
||||
{"matrix": [4, 20], "x": 224, "y": 58, "flags": 1},
|
||||
|
||||
{"matrix": [5, 19], "x": 214, "y": 64, "flags": 4},
|
||||
{"matrix": [5, 17], "x": 198, "y": 64, "flags": 4},
|
||||
|
||||
{"matrix": [5, 16], "x": 180, "y": 64, "flags": 4},
|
||||
{"matrix": [5, 15], "x": 169, "y": 64, "flags": 4},
|
||||
{"matrix": [5, 14], "x": 159, "y": 64, "flags": 4},
|
||||
|
||||
{"matrix": [5, 13], "x": 145, "y": 64, "flags": 1},
|
||||
{"matrix": [5, 12], "x": 132, "y": 64, "flags": 1},
|
||||
{"matrix": [5, 11], "x": 119, "y": 64, "flags": 1},
|
||||
{"matrix": [5, 10], "x": 105, "y": 64, "flags": 1},
|
||||
{"matrix": [5, 6], "x": 66, "y": 64, "flags": 4},
|
||||
{"matrix": [5, 3], "x": 27, "y": 64, "flags": 1},
|
||||
{"matrix": [5, 2], "x": 14, "y": 64, "flags": 1},
|
||||
{"matrix": [5, 0], "x": 1, "y": 64, "flags": 1}
|
||||
],
|
||||
"driver": "ws2812",
|
||||
"max_brightness": 110
|
||||
},
|
||||
|
||||
@ -1,31 +0,0 @@
|
||||
// Copyright 2021 Ryan Skidmore (@ryanskidmore, rskeys@ryanskidmore.co.uk)
|
||||
// SPDX-License-Identifier: GPL-2.0-or-later
|
||||
|
||||
#include "quantum.h"
|
||||
|
||||
#ifdef RGB_MATRIX_ENABLE
|
||||
led_config_t g_led_config = {
|
||||
{
|
||||
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, NO_LED, 13, 14, 15, NO_LED, NO_LED, NO_LED, NO_LED },
|
||||
{ 36, 35, 34, 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16 },
|
||||
{ 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50, 51, 52, 53, 54, 55, 56, 57 },
|
||||
{ 73, 72, 71, 70, 69, 68, 67, 66, 65, 64, 63, 62, 61, NO_LED, NO_LED, NO_LED, NO_LED, 60, 59, 58, NO_LED },
|
||||
{ 74, 75, 76, 77, 78, 79, 80, 81, 82, 83, 84, 85, 86, NO_LED, NO_LED, 87, NO_LED, 88, 89, 90, 91 },
|
||||
{ 104, NO_LED, 103, 102, NO_LED, NO_LED, 101, NO_LED, NO_LED, NO_LED, 100, 99, 98, 97, 96, 95, 94, 93, NO_LED, 92, NO_LED }
|
||||
}, {
|
||||
{ 0, 0 }, { 21, 0 }, { 32, 0 }, { 43, 0 }, { 53, 0 }, { 64, 0 }, { 75, 0 }, { 85, 0 }, { 96, 0 }, { 117, 0 }, { 128, 0 }, { 139, 0 }, { 149, 0 }, { 160, 0 }, { 171, 0 }, { 181, 0 },
|
||||
{ 0, 13 }, { 11, 13 }, { 21, 13 }, { 32, 13 }, { 42, 13 }, { 53, 13 }, { 64, 13 }, { 75, 13 }, { 85, 13 }, { 96, 13 }, { 107, 13 }, { 117, 13 }, { 128, 13 }, { 139, 13 }, { 160, 13 }, { 171, 13 }, { 181, 13 }, { 192, 13 }, { 203, 13 }, { 213, 13 }, { 224, 13 },
|
||||
{ 0, 26 }, { 11, 26 }, { 21, 26 }, { 32, 26 }, { 42, 26 }, { 53, 26 }, { 64, 26 }, { 75, 26 }, { 85, 26 }, { 96, 26 }, { 107, 26 }, { 117, 26 }, { 128, 26 }, { 149, 26 }, { 160, 26 }, { 171, 26 }, { 181, 26 }, { 192, 26 }, { 203, 26 }, { 213, 26 }, { 224, 26 },
|
||||
{ 0, 38 }, { 11, 38 }, { 21, 38 }, { 32, 38 }, { 42, 38 }, { 53, 38 }, { 64, 38 }, { 75, 38 }, { 85, 38 }, { 96, 38 }, { 117, 38 }, { 128, 38 }, { 149, 38 }, { 192, 38 }, { 203, 38 }, { 213, 38 },
|
||||
{ 0, 51 }, { 11, 51 }, { 21, 51 }, { 32, 51 }, { 42, 51 }, { 53, 51 }, { 64, 51 }, { 75, 51 }, { 85, 51 }, { 96, 51 }, { 107, 51 }, { 117, 51 }, { 139, 51 }, { 171, 51 }, { 192, 51 }, { 203, 51 }, { 213, 51 }, { 224, 51 },
|
||||
{ 0, 64 }, { 11, 64 }, { 21, 64 }, { 64, 64 }, { 107, 64 }, { 117, 64 }, { 128, 64 }, { 149, 64 }, { 160, 64 }, { 171, 64 }, { 181, 64 }, { 192, 64 }, { 213, 64 }
|
||||
}, {
|
||||
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
||||
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
||||
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
||||
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
||||
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
|
||||
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4
|
||||
}
|
||||
};
|
||||
#endif
|
||||
Loading…
Reference in New Issue
Block a user