diff options
| author | fauxpark <fauxpark@gmail.com> | 2023-02-13 00:20:19 +1100 |
|---|---|---|
| committer | fauxpark <fauxpark@gmail.com> | 2023-02-13 00:20:19 +1100 |
| commit | b44e64a6bfc09f3e1bc277f84312d4bfe5a4c681 (patch) | |
| tree | 0377b76ce0ac8770650ec6204d61bd555f294680 | |
| parent | 584b7cf801f98d58aefe5a9bbc4a163aba4c1b74 (diff) | |
| parent | 0afe0e24411a4c658e12c1872a9d4cd95358f2d8 (diff) | |
Merge remote-tracking branch 'upstream/master' into develop
| -rw-r--r-- | keyboards/crbn/info.json | 2 | ||||
| -rw-r--r-- | keyboards/kepler_33/proto/info.json | 3 | ||||
| -rw-r--r-- | keyboards/synthlabs/060/config.h | 2 |
3 files changed, 4 insertions, 3 deletions
diff --git a/keyboards/crbn/info.json b/keyboards/crbn/info.json index e2860676cc..eae6ee7415 100644 --- a/keyboards/crbn/info.json +++ b/keyboards/crbn/info.json @@ -12,7 +12,7 @@ "bootloader": "caterina", "community_layouts": [ "ortho_4x12", "planck_mit" ], "layout_aliases": { - "LAYOUT_crbn_1x2u": "LAYOUT_1x2u", + "LAYOUT_crbn_1x2u": "LAYOUT_planck_mit", "LAYOUT_crbn_2x2u": "LAYOUT_2x2u" }, "layouts": { diff --git a/keyboards/kepler_33/proto/info.json b/keyboards/kepler_33/proto/info.json index c736b00970..807095dbbc 100644 --- a/keyboards/kepler_33/proto/info.json +++ b/keyboards/kepler_33/proto/info.json @@ -25,6 +25,9 @@ "rows": ["B12", "B13", "B14", "B15"], "cols": ["A0", "A1", "A2", "A3", "A4", "A5", "A6", "A7", "B0", "B1", "B6", "B10", "B9", "B8", "B7"] }, + "layout_aliases": { + "LAYOUT_proto": "LAYOUT" + }, "layouts": { "LAYOUT": { "layout": [ diff --git a/keyboards/synthlabs/060/config.h b/keyboards/synthlabs/060/config.h index 3c5ef7a99a..60dfb6ad51 100644 --- a/keyboards/synthlabs/060/config.h +++ b/keyboards/synthlabs/060/config.h @@ -3,11 +3,9 @@ #pragma once - /* Backlighting */ #define RGB_MATRIX_LED_COUNT 63 #define RGB_MATRIX_KEYPRESSES -#define RGB_MATRIX_FRAMEBUFFER_EFFECTS #define RGB_DISABLE_WHEN_USB_SUSPENDED #define RGB_DI_PIN E6 |