mirror of
https://github.com/qmk/qmk_firmware.git
synced 2024-12-12 21:00:58 +00:00
Merge remote-tracking branch 'origin/develop' into xap
This commit is contained in:
commit
9a7d45daa4
@ -50,7 +50,7 @@
|
|||||||
"splash": true,
|
"splash": true,
|
||||||
"typing_heatmap": true
|
"typing_heatmap": true
|
||||||
},
|
},
|
||||||
"driver": "WS2812",
|
"driver": "ws2812",
|
||||||
"layout": [
|
"layout": [
|
||||||
{"matrix": [0, 5], "x": 80, "y": 17, "flags": 4},
|
{"matrix": [0, 5], "x": 80, "y": 17, "flags": 4},
|
||||||
{"matrix": [0, 4], "x": 66, "y": 11, "flags": 4},
|
{"matrix": [0, 4], "x": 66, "y": 11, "flags": 4},
|
||||||
|
@ -104,7 +104,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rgb_matrix": {
|
"rgb_matrix": {
|
||||||
"driver": "IS31FL3733",
|
"driver": "is31fl3733",
|
||||||
"animations": {
|
"animations": {
|
||||||
"alphas_mods": true,
|
"alphas_mods": true,
|
||||||
"gradient_up_down": true,
|
"gradient_up_down": true,
|
||||||
|
@ -124,7 +124,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rgb_matrix": {
|
"rgb_matrix": {
|
||||||
"driver": "IS31FL3733",
|
"driver": "is31fl3733",
|
||||||
"animations": {
|
"animations": {
|
||||||
"alphas_mods": true,
|
"alphas_mods": true,
|
||||||
"gradient_up_down": true,
|
"gradient_up_down": true,
|
||||||
|
@ -132,7 +132,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rgb_matrix": {
|
"rgb_matrix": {
|
||||||
"driver": "IS31FL3733",
|
"driver": "is31fl3733",
|
||||||
"animations": {
|
"animations": {
|
||||||
"alphas_mods": true,
|
"alphas_mods": true,
|
||||||
"gradient_up_down": true,
|
"gradient_up_down": true,
|
||||||
|
@ -26,7 +26,7 @@
|
|||||||
"rows": ["C6", "C7", "C8", "C9"]
|
"rows": ["C6", "C7", "C8", "C9"]
|
||||||
},
|
},
|
||||||
"rgb_matrix": {
|
"rgb_matrix": {
|
||||||
"driver": "IS31FL3733",
|
"driver": "is31fl3733",
|
||||||
"max_brightness": 200,
|
"max_brightness": 200,
|
||||||
"animations": {
|
"animations": {
|
||||||
"breathing": true,
|
"breathing": true,
|
||||||
|
@ -69,7 +69,7 @@
|
|||||||
}
|
}
|
||||||
},
|
},
|
||||||
"rgb_matrix": {
|
"rgb_matrix": {
|
||||||
"driver": "WS2812",
|
"driver": "ws2812",
|
||||||
"animations": {
|
"animations": {
|
||||||
"alphas_mods": true,
|
"alphas_mods": true,
|
||||||
"gradient_up_down": true,
|
"gradient_up_down": true,
|
||||||
|
@ -20,7 +20,7 @@
|
|||||||
"pin": "A10"
|
"pin": "A10"
|
||||||
},
|
},
|
||||||
"rgb_matrix": {
|
"rgb_matrix": {
|
||||||
"driver": "WS2812",
|
"driver": "ws2812",
|
||||||
"layout": [
|
"layout": [
|
||||||
{ "flags": 4, "matrix": [4, 13], "x": 208, "y": 64 },
|
{ "flags": 4, "matrix": [4, 13], "x": 208, "y": 64 },
|
||||||
{ "flags": 4, "matrix": [4, 12], "x": 192, "y": 64 },
|
{ "flags": 4, "matrix": [4, 12], "x": 192, "y": 64 },
|
||||||
|
@ -58,7 +58,7 @@
|
|||||||
"solid_splash": true,
|
"solid_splash": true,
|
||||||
"solid_multisplash": true
|
"solid_multisplash": true
|
||||||
},
|
},
|
||||||
"driver": "WS2812",
|
"driver": "ws2812",
|
||||||
"layout": [
|
"layout": [
|
||||||
{ "flags": 1, "matrix": [5, 2], "x": 149, "y": 59 },
|
{ "flags": 1, "matrix": [5, 2], "x": 149, "y": 59 },
|
||||||
{ "flags": 1, "matrix": [5, 0], "x": 0, "y": 59 },
|
{ "flags": 1, "matrix": [5, 0], "x": 0, "y": 59 },
|
||||||
|
@ -32,7 +32,7 @@
|
|||||||
]
|
]
|
||||||
},
|
},
|
||||||
"rgb_matrix": {
|
"rgb_matrix": {
|
||||||
"driver": "IS31FL3733",
|
"driver": "is31fl3733",
|
||||||
"max_brightness": 200,
|
"max_brightness": 200,
|
||||||
"val_steps": 20,
|
"val_steps": 20,
|
||||||
"animations": {
|
"animations": {
|
||||||
|
@ -27,7 +27,7 @@
|
|||||||
"pin": "B15"
|
"pin": "B15"
|
||||||
},
|
},
|
||||||
"rgb_matrix": {
|
"rgb_matrix": {
|
||||||
"driver": "WS2812",
|
"driver": "ws2812",
|
||||||
"max_brightness": 200,
|
"max_brightness": 200,
|
||||||
"animations": {
|
"animations": {
|
||||||
"alphas_mods": true,
|
"alphas_mods": true,
|
||||||
|
@ -74,7 +74,7 @@
|
|||||||
"solid_multisplash": true
|
"solid_multisplash": true
|
||||||
},
|
},
|
||||||
"center_point": [76, 25],
|
"center_point": [76, 25],
|
||||||
"driver": "AW20216",
|
"driver": "aw20216",
|
||||||
"layout": [
|
"layout": [
|
||||||
{ "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
|
{ "flags": 4, "matrix": [1, 3], "x": 0, "y": 0 },
|
||||||
{ "flags": 4, "matrix": [1, 7], "x": 10, "y": 0 },
|
{ "flags": 4, "matrix": [1, 7], "x": 10, "y": 0 },
|
||||||
|
Loading…
Reference in New Issue
Block a user