Browse Source

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

fauxpark 3 years ago
parent
commit
b44e64a6bf

+ 1 - 1
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": {

+ 3 - 0
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": [

+ 0 - 2
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