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

master
QMK Bot 2021-11-11 16:58:19 +00:00
commit 40a2f1510b
3 changed files with 22 additions and 22 deletions

View File

@ -55,12 +55,12 @@
#define DRIVER_ADDR_1 0b1010000 #define DRIVER_ADDR_1 0b1010000
#define DRIVER_COUNT 1 #define DRIVER_COUNT 1
#define DRIVER_LED_TOTAL 64 #define DRIVER_LED_TOTAL 64
#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTIWIDE
#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_CROSS
#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS #define DISABLE_RGB_MATRIX_SOLID_REACTIVE_MULTICROSS
#define DISABLE_RGB_MATRIX_SOLID_REACTIVE_NEXUS
#define DISABLE_RGB_MATRIX_BAND_SAT #define DISABLE_RGB_MATRIX_BAND_SAT
#define DISABLE_RGB_MATRIX_BAND_VAL #define DISABLE_RGB_MATRIX_BAND_VAL
#define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT #define DISABLE_RGB_MATRIX_BAND_PINWHEEL_SAT
@ -78,7 +78,7 @@
# define RGBLIGHT_EFFECT_KNIGHT # define RGBLIGHT_EFFECT_KNIGHT
# define RGBLIGHT_EFFECT_CHRISTMAS # define RGBLIGHT_EFFECT_CHRISTMAS
# define RGBLIGHT_EFFECT_STATIC_GRADIENT # define RGBLIGHT_EFFECT_STATIC_GRADIENT
# define RGBLIGHT_EFFECT_ALTERNATING // # define RGBLIGHT_EFFECT_ALTERNATING
# define RGBLIGHT_EFFECT_TWINKLE # define RGBLIGHT_EFFECT_TWINKLE
# define RGBLED_NUM 18 # define RGBLED_NUM 18
# define RGBLIGHT_HUE_STEP 5 # define RGBLIGHT_HUE_STEP 5

View File

@ -1,10 +1,10 @@
{ {
"keyboard_name": "PK64RGB", "keyboard_name": "PK64RGB",
"url": "", "url": "",
"maintainer": "yj7272098", "maintainer": "yj7272098",
"layouts": { "layouts": {
"LAYOUT_64_ansi": "LAYOUT_64_ansi": {
[ "layout": [
{"x":0, "y":0}, {"x":0, "y":0},
{"x":1, "y":0}, {"x":1, "y":0},
{"x":2, "y":0}, {"x":2, "y":0},
@ -19,7 +19,7 @@
{"x":11, "y":0}, {"x":11, "y":0},
{"x":12, "y":0}, {"x":12, "y":0},
{"x":13, "y":0, "w":2}, {"x":13, "y":0, "w":2},
{"x":0, "y":1, "w":1.5}, {"x":0, "y":1, "w":1.5},
{"x":1.5, "y":1}, {"x":1.5, "y":1},
@ -35,7 +35,7 @@
{"x":11.5, "y":1}, {"x":11.5, "y":1},
{"x":12.5, "y":1}, {"x":12.5, "y":1},
{"x":13.5, "y":1, "w":1.5}, {"x":13.5, "y":1, "w":1.5},
{"x":0, "y":2, "w":1.75}, {"x":0, "y":2, "w":1.75},
{"x":1.75, "y":2}, {"x":1.75, "y":2},
@ -50,7 +50,7 @@
{"x":10.75, "y":2}, {"x":10.75, "y":2},
{"x":11.75, "y":2}, {"x":11.75, "y":2},
{"x":12.75, "y":2, "w":2.25}, {"x":12.75, "y":2, "w":2.25},
{"x":0, "y":3, "w":2}, {"x":0, "y":3, "w":2},
{"x":2, "y":3}, {"x":2, "y":3},
@ -66,7 +66,7 @@
{"x":12, "y":3}, {"x":12, "y":3},
{"x":13, "y":3}, {"x":13, "y":3},
{"x":14, "y":3}, {"x":14, "y":3},
{"x":0, "y":4, "w":1.25}, {"x":0, "y":4, "w":1.25},
{"x":1.25, "y":4, "w":1.25}, {"x":1.25, "y":4, "w":1.25},
@ -76,8 +76,8 @@
{"x":11, "y":4}, {"x":11, "y":4},
{"x":12, "y":4}, {"x":12, "y":4},
{"x":13, "y":4}, {"x":13, "y":4},
{"x":14, "y":4}, {"x":14, "y":4}
]
] }
}
} }
}

View File

@ -1,2 +1,2 @@
LTO_ENABLE = yes VIA_ENABLE = yes
VIA_ENABLE = yes SPACE_CADET_ENABLE = no