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

pull/24020/head
QMK Bot 2024-06-29 10:57:00 +00:00
commit bd5da148ec
2 changed files with 27 additions and 24 deletions

View File

@ -19,29 +19,6 @@
// OLED animation
#include "lib/logo.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
{ NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
{ NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
{ NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
{ NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
{ NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED },
{ NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED, NO_LED }
}, {
{152, 0}, {165, 0}, {190, 0}, {205, 0},
{224, 21}, {224, 43}, {224, 54},
{188, 64}, {172, 64}, {156, 64}, {140, 64}, {115, 64}, {99 , 64}, {75 , 64}, {59 , 64}, {43 , 64}, {26 , 64},
{0 , 15}, {0 , 50}, {0 , 39},
{18 , 0}, {36 , 0}, {57 , 0}, {67 , 0}
}, {
2, 2, 2, 2, 2, 2, 2, 2,
2, 2,
2, 2,
2, 2,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2,
} };
#endif
#ifdef OLED_ENABLE
uint16_t startup_timer;

View File

@ -34,7 +34,33 @@
"pixel_rain": true
},
"driver": "ws2812",
"max_brightness": 200
"max_brightness": 200,
"layout": [
{"x": 152, "y": 0, "flags": 2},
{"x": 165, "y": 0, "flags": 2},
{"x": 190, "y": 0, "flags": 2},
{"x": 205, "y": 0, "flags": 2},
{"x": 224, "y": 21, "flags": 2},
{"x": 224, "y": 43, "flags": 2},
{"x": 224, "y": 54, "flags": 2},
{"x": 188, "y": 64, "flags": 2},
{"x": 172, "y": 64, "flags": 2},
{"x": 156, "y": 64, "flags": 2},
{"x": 140, "y": 64, "flags": 2},
{"x": 115, "y": 64, "flags": 2},
{"x": 99, "y": 64, "flags": 2},
{"x": 75, "y": 64, "flags": 2},
{"x": 59, "y": 64, "flags": 2},
{"x": 43, "y": 64, "flags": 2},
{"x": 26, "y": 64, "flags": 2},
{"x": 0, "y": 50, "flags": 2},
{"x": 0, "y": 39, "flags": 2},
{"x": 0, "y": 15, "flags": 2},
{"x": 18, "y": 0, "flags": 2},
{"x": 36, "y": 0, "flags": 2},
{"x": 57, "y": 0, "flags": 2},
{"x": 67, "y": 0, "flags": 2}
]
},
"matrix_pins": {
"cols": ["B15", "C6", "C7", "A3", "A1", "C3", "C1", "B14", "B13", "A9", "B3", "B4", "A0", "C11", "C4", "C0", "C2"],