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

2021-11-11 16:58:19 +00:00 · 2021-11-11 16:58:19 +00:00 · 40a2f1510b
commit 40a2f1510b
parent a542aebc46 7d1c33afe6
3 changed files with 22 additions and 22 deletions
--- a/keyboards/playkbtw/pk64rgb/config.h
+++ b/keyboards/playkbtw/pk64rgb/config.h
@ -78,7 +78,7 @@
 #    define RGBLIGHT_EFFECT_KNIGHT
 #    define RGBLIGHT_EFFECT_CHRISTMAS
 #    define RGBLIGHT_EFFECT_STATIC_GRADIENT
-#    define RGBLIGHT_EFFECT_ALTERNATING
+// #    define RGBLIGHT_EFFECT_ALTERNATING
 #    define RGBLIGHT_EFFECT_TWINKLE
 #    define RGBLED_NUM 18
 #    define RGBLIGHT_HUE_STEP 5
--- a/keyboards/playkbtw/pk64rgb/info.json
+++ b/keyboards/playkbtw/pk64rgb/info.json
@ -3,8 +3,8 @@
    "url": "",
    "maintainer": "yj7272098",
    "layouts": {
-  "LAYOUT_64_ansi":
-            [
+        "LAYOUT_64_ansi": {
+            "layout": [
                {"x":0, "y":0},
                {"x":1, "y":0},
                {"x":2, "y":0},
@ -76,8 +76,8 @@
                {"x":11, "y":4},
                {"x":12, "y":4},
                {"x":13, "y":4},
-                {"x":14, "y":4},
-                
-]
-}
+                {"x":14, "y":4}
+            ]
+        }
+    }
 }
--- a/keyboards/playkbtw/pk64rgb/keymaps/via/rules.mk
+++ b/keyboards/playkbtw/pk64rgb/keymaps/via/rules.mk
@ -1,2 +1,2 @@
-LTO_ENABLE = yes
 VIA_ENABLE = yes
+SPACE_CADET_ENABLE = no