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

This commit is contained in:
QMK Bot 2021-04-20 16:32:55 +00:00
commit 6620b6c515
2 changed files with 5 additions and 4 deletions

View file

@ -47,7 +47,7 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define LED_CAPS_LOCK_PIN E6 #define LED_CAPS_LOCK_PIN E6
/* COL2ROW, ROW2COL*/ /* COL2ROW, ROW2COL*/
#define DIODE_DIRECTION COL2ROW #define DIODE_DIRECTION ROW2COL
/* /*
* Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN. * Split Keyboard specific options, make sure you have 'SPLIT_KEYBOARD = yes' in your rules.mk, and define SOFT_SERIAL_PIN.
@ -60,7 +60,8 @@ along with this program. If not, see <http://www.gnu.org/licenses/>.
#define RGB_DI_PIN B6 #define RGB_DI_PIN B6
#ifdef RGB_DI_PIN #ifdef RGB_DI_PIN
#define RGBLED_NUM 16 #define RGBLED_NUM 18
#define RGBLIGHT_HUE_STEP 8 #define RGBLIGHT_HUE_STEP 8
#define RGBLIGHT_SAT_STEP 8 #define RGBLIGHT_SAT_STEP 8
#define RGBLIGHT_VAL_STEP 8 #define RGBLIGHT_VAL_STEP 8

View file

@ -37,7 +37,7 @@
{"label":"k1C","x":12.5,"y":1}, {"label":"k1C","x":12.5,"y":1},
{"label":"k1D","x":13.5,"y":1}, {"label":"k1D","x":13.5,"y":1},
{"label":"k1E","x":14.5,"y":1,"w":1.5}, {"label":"k1E","x":14.5,"y":1,"w":1.5},
{"label":"k20","x":0,"y":2}, {"label":"k20","x":0,"y":2,"w":1.5},
{"label":"k21","x":1.5,"y":2}, {"label":"k21","x":1.5,"y":2},
{"label":"k22","x":2.5,"y":2}, {"label":"k22","x":2.5,"y":2},
{"label":"k23","x":3.5,"y":2}, {"label":"k23","x":3.5,"y":2},
@ -51,7 +51,7 @@
{"label":"k2B","x":11.5,"y":2}, {"label":"k2B","x":11.5,"y":2},
{"label":"k2C","x":12.5,"y":2}, {"label":"k2C","x":12.5,"y":2},
{"label":"k2D","x":13.5,"y":2}, {"label":"k2D","x":13.5,"y":2},
{"label":"k2E","x":14.5,"y":2}, {"label":"k2E","x":14.5,"y":2,"w":1.5},
{"label":"k30","x":0,"y":3,"w":1.5}, {"label":"k30","x":0,"y":3,"w":1.5},
{"label":"k31","x":1.5,"y":3}, {"label":"k31","x":1.5,"y":3},
{"label":"k32","x":2.5,"y":3}, {"label":"k32","x":2.5,"y":3},