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

This commit is contained in:
fauxpark 2023-02-13 00:20:19 +11:00
commit b44e64a6bf
3 changed files with 4 additions and 3 deletions

View file

@ -12,7 +12,7 @@
"bootloader": "caterina", "bootloader": "caterina",
"community_layouts": [ "ortho_4x12", "planck_mit" ], "community_layouts": [ "ortho_4x12", "planck_mit" ],
"layout_aliases": { "layout_aliases": {
"LAYOUT_crbn_1x2u": "LAYOUT_1x2u", "LAYOUT_crbn_1x2u": "LAYOUT_planck_mit",
"LAYOUT_crbn_2x2u": "LAYOUT_2x2u" "LAYOUT_crbn_2x2u": "LAYOUT_2x2u"
}, },
"layouts": { "layouts": {

View file

@ -25,6 +25,9 @@
"rows": ["B12", "B13", "B14", "B15"], "rows": ["B12", "B13", "B14", "B15"],
"cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B6", "B10", "B9", "B8", "B7"] "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B6", "B10", "B9", "B8", "B7"]
}, },
"layout_aliases": {
"LAYOUT_proto": "LAYOUT"
},
"layouts": { "layouts": {
"LAYOUT": { "LAYOUT": {
"layout": [ "layout": [

View file

@ -3,11 +3,9 @@
#pragma once #pragma once
/* Backlighting */ /* Backlighting */
#define RGB_MATRIX_LED_COUNT 63 #define RGB_MATRIX_LED_COUNT 63
#define RGB_MATRIX_KEYPRESSES #define RGB_MATRIX_KEYPRESSES
#define RGB_MATRIX_FRAMEBUFFER_EFFECTS
#define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_DISABLE_WHEN_USB_SUSPENDED
#define RGB_DI_PIN E6 #define RGB_DI_PIN E6