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

This commit is contained in:
QMK Bot 2024-08-03 23:38:27 +00:00
commit ddc60da839
6 changed files with 214 additions and 91 deletions

View file

@ -16,36 +16,6 @@
#include "quantum.h"
#ifdef RGB_MATRIX_ENABLE
led_config_t g_led_config = { {
// Key Matrix to LED Index
{ 12, 11, 10, 9, 8, 7, 6, 5, 4, NO_LED, 3, 2, 1, 0 }, // 13 keys
{ 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17, 16, 15, 14, 13 }, // 15 keys
{ 42, 41, 40, 39, 38, 37, 36, 35, 34, 33, 32, 31, 30, 29, 28 }, // 15 keys
{ 56, 55, 54, 53, 52, 51, 50, 49, 48, 47, 46, 45, 44, NO_LED, 43 }, // 14 keys
{ 70, 69, 68, 67, 66, 65, 64, 63, 62, 61, 60, 59, NO_LED, 58, 57 }, // 14 keys
{ 79, 78, 77, NO_LED, NO_LED, NO_LED, 76, NO_LED, NO_LED, NO_LED, 75, 74, 73, 72, 71 } // 9 keys
}, {
// LED Index to Physical Positon
{ 240, 0 }, { 224, 0 }, { 208, 0 }, { 192, 0 }, { 176, 0 }, { 160, 0 }, { 144, 0 }, { 128, 0 }, { 112, 0 }, { 96, 0 }, { 80, 0 }, { 64, 0 }, { 32, 0 },
{ 240, 13 }, { 224, 13 }, { 208, 13 }, { 192 , 13 }, { 176, 13 }, { 160, 13 }, { 144, 13 }, { 128, 13 }, { 112, 13 }, { 96, 13 }, { 80, 13 }, { 64, 13}, { 48, 13 }, { 32, 13 }, { 16, 13 },
{ 240, 26 }, { 224, 26 }, { 208, 26 }, { 192 , 26 }, { 176, 26 }, { 160, 26 }, { 144, 26 }, { 128, 26 }, { 112, 26 }, { 96, 26 }, { 80, 26 }, { 64, 26}, { 48, 26 }, { 32, 26 }, { 16, 26 },
{ 240, 39 }, { 216, 39 }, { 192 , 39 }, { 176, 39 }, { 160, 39 }, { 144, 39 }, { 128, 39 }, { 112, 39 }, { 96, 39 }, { 80, 39 }, { 64, 39}, { 48, 39 }, { 32, 39 }, { 16, 39 },
{ 240, 52 }, { 224, 52 }, { 208, 52 }, { 192 , 52 }, { 176, 52 }, { 160, 52 }, { 144, 52 }, { 128, 52 }, { 112, 52 }, { 96, 52 }, { 80, 52 }, { 64, 52}, { 48, 52 }, { 24, 52 },
{ 240, 64 }, { 224, 64 }, { 208, 64 }, { 192, 64 }, { 176, 64 }, { 112, 64 }, { 48, 64 }, { 32, 64 }, { 16, 64 },
{ 0, 26 }, { 0, 46 }, { 0, 64 }, { 48, 64 }, { 72, 64 }, { 104, 64 }, { 136, 64 }, { 168, 64 }, { 208, 64 }, { 232, 58 }, { 232, 45 }, { 232, 32 }, { 232, 20 }, { 232, 7 }, { 176, 0 }, { 112, 0 }
}, {
// LED Index to Flag
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, 8,
4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4,
4, 4, 4, 4, 4, 4, 4, 4, 4,
2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2
} };
#endif
#if defined(ENCODER_ENABLE) && !defined(ENCODER_MAP_ENABLE)
bool encoder_update_kb(uint8_t index, bool clockwise) {
if (!encoder_update_user(index, clockwise)) {

View file

@ -1,19 +0,0 @@
/* Copyright 2022 @fOmey
*
* This program is free software: you can redistribute it and/or modify
* it under the terms of the GNU General Public License as published by
* the Free Software Foundation, either version 2 of the License, or
* (at your option) any later version.
*
* This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details.
*
* You should have received a copy of the GNU General Public License
* along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#define RGB_MATRIX_LED_COUNT 96

View file

@ -58,7 +58,123 @@
},
"driver": "ws2812",
"max_brightness": 130,
"sleep": true
"sleep": true,
"layout": [
{"matrix": [0, 13], "x": 193, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 165, "y": 0, "flags": 4},
{"matrix": [0, 10], "x": 152, "y": 0, "flags": 4},
{"matrix": [0, 8], "x": 131, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 117, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 103, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 90, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 69, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 55, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 41, "y": 0, "flags": 4},
{"matrix": [0, 1], "x": 28, "y": 0, "flags": 4},
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [1, 14], "x": 224, "y": 12, "flags": 1},
{"matrix": [1, 13], "x": 186, "y": 12, "flags": 1},
{"matrix": [1, 12], "x": 165, "y": 12, "flags": 4},
{"matrix": [1, 11], "x": 152, "y": 12, "flags": 4},
{"matrix": [1, 10], "x": 138, "y": 12, "flags": 4},
{"matrix": [1, 9], "x": 124, "y": 12, "flags": 4},
{"matrix": [1, 8], "x": 110, "y": 12, "flags": 4},
{"matrix": [1, 7], "x": 96, "y": 12, "flags": 4},
{"matrix": [1, 6], "x": 83, "y": 12, "flags": 4},
{"matrix": [1, 5], "x": 69, "y": 12, "flags": 4},
{"matrix": [1, 4], "x": 55, "y": 12, "flags": 4},
{"matrix": [1, 3], "x": 41, "y": 12, "flags": 4},
{"matrix": [1, 2], "x": 28, "y": 12, "flags": 4},
{"matrix": [1, 1], "x": 14, "y": 12, "flags": 4},
{"matrix": [1, 0], "x": 0, "y": 12, "flags": 4},
{"matrix": [2, 14], "x": 224, "y": 24, "flags": 1},
{"matrix": [2, 13], "x": 190, "y": 24, "flags": 1},
{"matrix": [2, 12], "x": 172, "y": 24, "flags": 4},
{"matrix": [2, 11], "x": 159, "y": 24, "flags": 4},
{"matrix": [2, 10], "x": 145, "y": 24, "flags": 4},
{"matrix": [2, 9], "x": 131, "y": 24, "flags": 4},
{"matrix": [2, 8], "x": 117, "y": 24, "flags": 4},
{"matrix": [2, 7], "x": 103, "y": 24, "flags": 4},
{"matrix": [2, 6], "x": 90, "y": 24, "flags": 4},
{"matrix": [2, 5], "x": 76, "y": 24, "flags": 4},
{"matrix": [2, 4], "x": 62, "y": 24, "flags": 4},
{"matrix": [2, 3], "x": 48, "y": 24, "flags": 4},
{"matrix": [2, 2], "x": 34, "y": 24, "flags": 4},
{"matrix": [2, 1], "x": 21, "y": 24, "flags": 4},
{"matrix": [2, 0], "x": 3, "y": 24, "flags": 1},
{"matrix": [3, 14], "x": 224, "y": 37, "flags": 1},
{"matrix": [3, 12], "x": 184, "y": 37, "flags": 1},
{"matrix": [3, 11], "x": 162, "y": 37, "flags": 4},
{"matrix": [3, 10], "x": 148, "y": 37, "flags": 4},
{"matrix": [3, 9], "x": 134, "y": 37, "flags": 4},
{"matrix": [3, 8], "x": 121, "y": 37, "flags": 4},
{"matrix": [3, 7], "x": 107, "y": 37, "flags": 4},
{"matrix": [3, 6], "x": 93, "y": 37, "flags": 4},
{"matrix": [3, 5], "x": 79, "y": 37, "flags": 4},
{"matrix": [3, 4], "x": 65, "y": 37, "flags": 4},
{"matrix": [3, 3], "x": 52, "y": 37, "flags": 4},
{"matrix": [3, 2], "x": 38, "y": 37, "flags": 4},
{"matrix": [3, 1], "x": 24, "y": 37, "flags": 4},
{"matrix": [3, 0], "x": 5, "y": 37, "flags": 1},
{"matrix": [4, 14], "x": 224, "y": 49, "flags": 1},
{"matrix": [4, 13], "x": 196, "y": 52, "flags": 4},
{"matrix": [4, 11], "x": 174, "y": 49, "flags": 1},
{"matrix": [4, 10], "x": 155, "y": 49, "flags": 4},
{"matrix": [4, 9], "x": 141, "y": 49, "flags": 4},
{"matrix": [4, 8], "x": 128, "y": 49, "flags": 4},
{"matrix": [4, 7], "x": 114, "y": 49, "flags": 4},
{"matrix": [4, 6], "x": 100, "y": 49, "flags": 4},
{"matrix": [4, 5], "x": 86, "y": 49, "flags": 4},
{"matrix": [4, 4], "x": 72, "y": 49, "flags": 4},
{"matrix": [4, 3], "x": 59, "y": 49, "flags": 4},
{"matrix": [4, 2], "x": 45, "y": 49, "flags": 4},
{"matrix": [4, 1], "x": 31, "y": 49, "flags": 4},
{"matrix": [4, 0], "x": 9, "y": 49, "flags": 1},
{"matrix": [5, 14], "x": 210, "y": 64, "flags": 4},
{"matrix": [5, 13], "x": 196, "y": 64, "flags": 4},
{"matrix": [5, 12], "x": 183, "y": 64, "flags": 4},
{"matrix": [5, 11], "x": 157, "y": 61, "flags": 1},
{"matrix": [5, 10], "x": 140, "y": 61, "flags": 1},
{"matrix": [5, 6], "x": 88, "y": 61, "flags": 4},
{"matrix": [5, 2], "x": 36, "y": 61, "flags": 1},
{"matrix": [5, 1], "x": 19, "y": 61, "flags": 1},
{"matrix": [5, 0], "x": 2, "y": 61, "flags": 1},
{"x": 28, "y": 61, "flags": 2},
{"x": 56, "y": 61, "flags": 2},
{"x": 79, "y": 61, "flags": 2},
{"x": 107, "y": 61, "flags": 2},
{"x": 128, "y": 61, "flags": 2},
{"x": 170, "y": 61, "flags": 2},
{"x": 220, "y": 55, "flags": 2},
{"x": 220, "y": 43, "flags": 2},
{"x": 220, "y": 30, "flags": 2},
{"x": 220, "y": 18, "flags": 2},
{"x": 220, "y": 6, "flags": 2},
{"x": 141, "y": 0, "flags": 2},
{"x": 79, "y": 0, "flags": 2},
{"x": 0, "y": 24, "flags": 2},
{"x": 0, "y": 43, "flags": 2},
{"x": 0, "y": 61, "flags": 2}
]
},
"build": {
"lto": true

View file

@ -1,20 +0,0 @@
/*
Copyright 2019 marhalloweenvt
This program is free software: you can redistribute it and/or modify
it under the terms of the GNU General Public License as published by
the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU General Public License for more details.
You should have received a copy of the GNU General Public License
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
#pragma once
#define RGB_MATRIX_LED_COUNT 83

View file

@ -57,6 +57,100 @@
"solid_splash": true,
"solid_multisplash": true
},
"layout": [
{"matrix": [0, 0], "x": 0, "y": 0, "flags": 1},
{"matrix": [0, 1], "x": 15, "y": 0, "flags": 4},
{"matrix": [0, 2], "x": 30, "y": 0, "flags": 4},
{"matrix": [0, 3], "x": 45, "y": 0, "flags": 4},
{"matrix": [0, 4], "x": 60, "y": 0, "flags": 4},
{"matrix": [0, 5], "x": 75, "y": 0, "flags": 4},
{"matrix": [0, 6], "x": 90, "y": 0, "flags": 4},
{"matrix": [0, 7], "x": 105, "y": 0, "flags": 4},
{"matrix": [0, 8], "x": 119, "y": 0, "flags": 4},
{"matrix": [0, 9], "x": 134, "y": 0, "flags": 4},
{"matrix": [0, 10], "x": 149, "y": 0, "flags": 4},
{"matrix": [0, 11], "x": 164, "y": 0, "flags": 4},
{"matrix": [0, 12], "x": 179, "y": 0, "flags": 4},
{"matrix": [0, 13], "x": 194, "y": 0, "flags": 1},
{"x": 202, "y": 0, "flags": 1},
{"matrix": [0, 14], "x": 209, "y": 0, "flags": 1},
{"matrix": [0, 15], "x": 224, "y": 0, "flags": 4},
{"x": 224, "y": 8, "flags": 2},
{"matrix": [1, 15], "x": 224, "y": 16, "flags": 4},
{"matrix": [1, 14], "x": 205, "y": 16, "flags": 1},
{"matrix": [1, 12], "x": 187, "y": 16, "flags": 4},
{"matrix": [1, 11], "x": 172, "y": 16, "flags": 4},
{"matrix": [1, 10], "x": 157, "y": 16, "flags": 4},
{"matrix": [1, 9], "x": 142, "y": 16, "flags": 4},
{"matrix": [1, 8], "x": 127, "y": 16, "flags": 4},
{"matrix": [1, 7], "x": 112, "y": 16, "flags": 4},
{"matrix": [1, 6], "x": 97, "y": 16, "flags": 4},
{"matrix": [1, 5], "x": 82, "y": 16, "flags": 4},
{"matrix": [1, 4], "x": 67, "y": 16, "flags": 4},
{"matrix": [1, 3], "x": 52, "y": 16, "flags": 4},
{"matrix": [1, 2], "x": 37, "y": 16, "flags": 4},
{"matrix": [1, 1], "x": 22, "y": 16, "flags": 4},
{"matrix": [1, 0], "x": 4, "y": 16, "flags": 1},
{"x": 0, "y": 8, "flags": 2},
{"x": 0, "y": 24, "flags": 2},
{"matrix": [2, 0], "x": 6, "y": 32, "flags": 1},
{"matrix": [2, 1], "x": 26, "y": 32, "flags": 4},
{"matrix": [2, 2], "x": 41, "y": 32, "flags": 4},
{"matrix": [2, 3], "x": 56, "y": 32, "flags": 4},
{"matrix": [2, 4], "x": 71, "y": 32, "flags": 4},
{"matrix": [2, 5], "x": 86, "y": 32, "flags": 4},
{"matrix": [2, 6], "x": 101, "y": 32, "flags": 4},
{"matrix": [2, 7], "x": 116, "y": 32, "flags": 4},
{"matrix": [2, 8], "x": 131, "y": 32, "flags": 4},
{"matrix": [2, 9], "x": 146, "y": 32, "flags": 4},
{"matrix": [2, 10], "x": 161, "y": 32, "flags": 4},
{"matrix": [2, 11], "x": 175, "y": 32, "flags": 4},
{"matrix": [2, 12], "x": 190, "y": 32, "flags": 4},
{"x": 200, "y": 32, "flags": 1},
{"matrix": [2, 14], "x": 207, "y": 32, "flags": 1},
{"matrix": [2, 15], "x": 224, "y": 32, "flags": 4},
{"x": 224, "y": 24, "flags": 2},
{"x": 224, "y": 40, "flags": 2},
{"matrix": [3, 15], "x": 224, "y": 48, "flags": 4},
{"matrix": [3, 14], "x": 209, "y": 48, "flags": 4},
{"matrix": [3, 12], "x": 189, "y": 48, "flags": 1},
{"matrix": [3, 10], "x": 168, "y": 48, "flags": 4},
{"matrix": [3, 9], "x": 153, "y": 48, "flags": 4},
{"matrix": [3, 8], "x": 138, "y": 48, "flags": 4},
{"matrix": [3, 7], "x": 123, "y": 48, "flags": 4},
{"matrix": [3, 6], "x": 108, "y": 48, "flags": 4},
{"matrix": [3, 5], "x": 93, "y": 48, "flags": 4},
{"matrix": [3, 4], "x": 78, "y": 48, "flags": 4},
{"matrix": [3, 3], "x": 63, "y": 48, "flags": 4},
{"matrix": [3, 2], "x": 49, "y": 48, "flags": 4},
{"matrix": [3, 1], "x": 34, "y": 48, "flags": 4},
{"matrix": [3, 0], "x": 9, "y": 48, "flags": 1},
{"x": 0, "y": 40, "flags": 2},
{"x": 0, "y": 56, "flags": 2},
{"matrix": [4, 0], "x": 2, "y": 64, "flags": 1},
{"x": 4, "y": 64, "flags": 1},
{"matrix": [4, 1], "x": 21, "y": 64, "flags": 1},
{"x": 26, "y": 64, "flags": 1},
{"matrix": [4, 2], "x": 39, "y": 64, "flags": 1},
{"matrix": [4, 5], "x": 95, "y": 64, "flags": 4},
{"x": 105, "y": 64, "flags": 4},
{"matrix": [4, 9], "x": 151, "y": 64, "flags": 1},
{"matrix": [4, 10], "x": 170, "y": 64, "flags": 1},
{"x": 172, "y": 64, "flags": 1},
{"matrix": [4, 12], "x": 194, "y": 64, "flags": 4},
{"matrix": [4, 14], "x": 209, "y": 64, "flags": 4},
{"matrix": [4, 15], "x": 224, "y": 64, "flags": 4},
{"x": 224, "y": 56, "flags": 2}
],
"driver": "ws2812",
"led_flush_limit": 26,
"led_process_limit": 4,
@ -84,7 +178,7 @@
}
},
"matrix_pins": {
"cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3", "D7"],
"cols": ["E6", "F0", "F1", "F4", "F5", "F6", "F7", "B0", "B1", "B2", "B3", "B7", "D0", "D1", "D2", "D3"],
"rows": ["C7", "C6", "B6", "B5", "D5"]
},
"diode_direction": "COL2ROW",

View file

@ -16,26 +16,7 @@
#include "quantum.h"
led_config_t g_led_config = { {
{ 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16 },
{ 33, 32, 31, 30, 29, 28, 27, 26, 25, 24, 23, 22, 21, 20, 19, 18, 17 },
{ 34, 35, 36, 37, 38, 39, 40, 41, 42, 43, 44, 45, 46, 47, 48, 49, 50 },
{ 67, 66, 65, 64, 63, 62, 61, 60, 59, 58, 57, 56, 55, 54, 53, 52, 51 },
{ 68, 69, 70, 71, 72, 73, 74, 75, 76, 77, 78, 79, 80, 81, 82 }
}, {
{ 0, 0 }, { 15, 0 }, { 30, 0 }, { 45, 0 }, { 60, 0 }, { 75, 0 }, { 90, 0 }, {105, 0 }, {120, 0 }, {135, 0 }, {150, 0 }, {165, 0 }, {180, 0 }, {195, 0 }, {205, 0 }, {210, 0 }, {224, 0 },
{ 224,16 }, {224, 16 }, {210, 16 }, {180, 16 }, {165, 16 }, {150, 16 }, {135, 16 }, {120, 16 }, {105, 16 }, { 90, 16 }, { 75, 16 }, { 60, 16 }, { 45, 16 }, { 30, 16 }, { 15, 16 }, { 0, 16 }, { 0, 16 },
{ 0, 32 }, { 0, 32 }, { 15, 32 }, { 30, 32 }, { 45, 32 }, { 60, 32 }, { 75, 32 }, { 90, 32 }, {105, 32 }, {120, 32 }, {135, 32 }, {150, 32 }, {165, 32 }, {190, 32 }, {205, 32 }, {210, 32 }, {224, 32 },
{ 224, 8 }, {224, 48 }, {210, 48 }, {195, 48 }, {180, 48 }, {150, 48 }, {135, 48 }, {120, 48 }, {105, 48 }, { 90, 48 }, { 75, 48 }, { 60, 48 }, { 45, 48 }, { 30, 48 }, { 15, 48 }, { 0, 48 }, { 0, 48 },
{ 0, 64 }, { 0, 64 }, { 0, 64 }, { 15, 64 }, { 15, 64 }, { 40, 64 }, { 90, 64 }, {105, 64 }, {150, 64 }, {180, 64 }, {180, 64 }, {195, 64 }, {210, 64 }, {220, 64 }, {224, 64 }
}, {
1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1,
2, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2,
2, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1,
2, 2, 1, 1, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 4, 1, 2,
2, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 1, 2
} };
#ifdef RGB_MATRIX_ENABLE
void suspend_power_down_kb(void)
{
rgb_matrix_set_suspend_state(true);
@ -47,3 +28,4 @@ void suspend_wakeup_init_kb(void)
rgb_matrix_set_suspend_state(false);
suspend_wakeup_init_user();
}
#endif