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

2021-01-15 18:34:12 +11:00
parent ab375d3d07 8cf5f72aad
commit ca7da3866d
162 changed files with 980 additions and 180 deletions
--- a/keyboards/dztech/dz60rgb_wkl/v1/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v1/config.h
@@ -6,7 +6,6 @@
 #define DEVICE_VER      0x0001
 #define MANUFACTURER    DZTECH
 #define PRODUCT         DZ60RGB_WKL
-#define DESCRIPTION     DZ60 ARM RGB keyboard

 /* key matrix size */
 #define MATRIX_ROWS 5
--- a/keyboards/dztech/dz60rgb_wkl/v2/config.h
+++ b/keyboards/dztech/dz60rgb_wkl/v2/config.h
@@ -6,7 +6,6 @@
 #define DEVICE_VER      0x0002
 #define MANUFACTURER    DZTECH
 #define PRODUCT         DZ60RGB_WKL
-#define DESCRIPTION     DZ60 AVR RGB keyboard

 /* key matrix size */
 #define MATRIX_ROWS 5