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

93 files changed, 2727 insertions, 633 deletions

diff --git a/keyboards/bm60rgb/bm60rgb.h b/keyboards/bm60rgb/bm60rgb.h
index 705539fc95..4a3dc2e83d 100644
--- a/keyboards/bm60rgb/bm60rgb.h
+++ b/keyboards/bm60rgb/bm60rgb.h
@@ -17,7 +17,7 @@
 
 #include "quantum.h"
 
-#define LAYOUT( \
+#define LAYOUT_60_ansi_arrow( \
     K00, K01, K02, K03, K04, K05, K06, K07, K08, K09, K0A, K0B, K0C, K0D,        \
     K10,   K11, K12, K13, K14, K15, K16, K17, K18, K19, K1A, K1B, K1C, K1D,      \
     K20,    K22, K23, K24, K25, K26, K27, K28, K29, K2A, K2B, K2C, K2D,          \
diff --git a/keyboards/bm60rgb/info.json b/keyboards/bm60rgb/info.json
index 5871bd5bca..d467a0405d 100644
--- a/keyboards/bm60rgb/info.json
+++ b/keyboards/bm60rgb/info.json
@@ -4,9 +4,11 @@
     "maintainer": "qmk",
     "width": 15,
     "height": 5,
+    "layout_aliases": {
+      "LAYOUT": "LAYOUT_60_ansi_arrow"
+    },
     "layouts": {
-        "LAYOUT_60_iso_arrow": {
-            "key_count": 63,
+        "LAYOUT_60_ansi_arrow": {
             "layout": [
                 {"label":"K00 (B0,D0)", "x":0, "y":0},
                 {"label":"K01 (B0,D1)", "x":1, "y":0},
diff --git a/keyboards/bm60rgb/keymaps/default/keymap.c b/keyboards/bm60rgb/keymaps/default/keymap.c
index 9099a04073..e8be1cccf6 100644
--- a/keyboards/bm60rgb/keymaps/default/keymap.c
+++ b/keyboards/bm60rgb/keymaps/default/keymap.c
@@ -16,14 +16,14 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_60_ansi_arrow(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,        KC_UP,   KC_SLSH,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_60_ansi_arrow(
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
         _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/bm60rgb/keymaps/via/keymap.c b/keyboards/bm60rgb/keymaps/via/keymap.c
index d84aaf5256..da2f6e8ced 100644
--- a/keyboards/bm60rgb/keymaps/via/keymap.c
+++ b/keyboards/bm60rgb/keymaps/via/keymap.c
@@ -16,28 +16,28 @@
 #include QMK_KEYBOARD_H
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
-    [0] = LAYOUT(
+    [0] = LAYOUT_60_ansi_arrow(
         KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,    KC_5,    KC_6,    KC_7,    KC_8,    KC_9,    KC_0,    KC_MINS, KC_EQL,  KC_BSPC,
         KC_TAB,      KC_Q,    KC_W,    KC_E,    KC_R,    KC_T,    KC_Y,    KC_U,    KC_I,    KC_O,    KC_P,    KC_LBRC, KC_RBRC, KC_BSLS,
         KC_CAPS,       KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT, KC_ENT,
         KC_LSFT,            KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_RSFT,        KC_UP,   KC_SLSH,
         KC_LCTL,   KC_LGUI,   KC_LALT,                       KC_SPC,                              KC_RALT, MO(1),   KC_LEFT, KC_DOWN, KC_RGHT
     ),
-    [1] = LAYOUT(
+    [1] = LAYOUT_60_ansi_arrow(
         RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  _______,
         _______,     RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, _______, _______, _______,
         _______,       _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,            _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
         _______,   _______,   _______,                      _______,                              _______, _______, _______, _______, _______
     ),
-    [2] = LAYOUT(
+    [2] = LAYOUT_60_ansi_arrow(
         _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
         _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,        _______, _______,
         _______,   _______,   _______,                      _______,                              _______, _______, _______, _______, _______
     ),
-    [3] = LAYOUT(
+    [3] = LAYOUT_60_ansi_arrow(
         _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,   _______,  _______,  _______,  _______,
         _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
         _______,  _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______, _______,
diff --git a/keyboards/bm60rgb/rules.mk b/keyboards/bm60rgb/rules.mk
index bf1b1ffa4d..49f18fcbff 100644
--- a/keyboards/bm60rgb/rules.mk
+++ b/keyboards/bm60rgb/rules.mk
@@ -33,5 +33,7 @@ RGB_MATRIX_ENABLE = yes
 RGB_MATRIX_DRIVER = WS2812
 LTO_ENABLE = yes
 
+LAYOUTS = 60_ansi_arrow
+
 # partially generated by KBFirmware JSON to QMK Parser
 # https://noroadsleft.github.io/kbf_qmk_converter/
diff --git a/keyboards/dztech/dz65rgb/config.h b/keyboards/dztech/dz65rgb/config.h
index b8c5759db6..71487efbd9 100644
--- a/keyboards/dztech/dz65rgb/config.h
+++ b/keyboards/dztech/dz65rgb/config.h
@@ -1,3 +1,18 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
 #pragma once
-
 #include "config_common.h"
diff --git a/keyboards/dztech/dz65rgb/dz65rgb.c b/keyboards/dztech/dz65rgb/dz65rgb.c
index aa5bf6601c..8340d8fcee 100644
--- a/keyboards/dztech/dz65rgb/dz65rgb.c
+++ b/keyboards/dztech/dz65rgb/dz65rgb.c
@@ -1,117 +1,17 @@
+/* Copyright 2021 DZTECH <moyi4681@live.cn>
+ *
+ * This program is free software: you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation, either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ */
+ 
 #include "dz65rgb.h"
-
-#ifdef RGB_MATRIX_ENABLE
-const is31_led g_is31_leds[DRIVER_LED_TOTAL] = {
-    { 0, C8_8,  C7_8,  C6_8 },
-    { 0, C9_8,  C7_7,  C6_7 },
-    { 0, C9_7,  C8_7,  C6_6 },
-    { 0, C9_6,  C8_6,  C7_6 },
-    { 0, C9_5,  C8_5,  C7_5 },
-    { 0, C9_4,  C8_4,  C7_4 },
-    { 0, C9_3,  C8_3,  C7_3 },
-    { 0, C9_2,  C8_2,  C7_2 },
-    { 0, C9_1,  C8_1,  C7_1 },
-    { 0, C2_9,  C3_9,  C4_9 },
-    { 0, C1_9,  C3_10, C4_10 },
-    { 0, C1_10, C2_10, C4_11 },
-    { 0, C1_11, C2_11, C3_11 },
-    { 0, C1_13, C2_13, C3_13 },
-    { 0, C1_14, C2_14, C3_14 },
-
-    { 0, C1_7,  C2_7,  C3_7 },
-    { 0, C1_6,  C2_6,  C3_6 },
-    { 0, C1_5,  C2_5,  C3_5 },
-    { 0, C1_4,  C2_4,  C3_4 },
-    { 0, C1_3,  C2_3,  C3_3 },
-    { 0, C1_2,  C2_2,  C4_3 },
-    { 0, C1_1,  C3_2,  C4_2 },
-    { 0, C2_1,  C3_1,  C4_1 },
-    { 0, C9_9,  C8_9,  C7_9 },
-    { 0, C9_10, C8_10, C7_10 },
-    { 0, C9_11, C8_11, C7_11 },
-    { 0, C9_12, C8_12, C7_12 },
-    { 0, C9_13, C8_13, C7_13 },
-    { 0, C9_14, C8_14, C7_14 },
-    { 0, C1_15, C2_15, C3_15 },
-
-    { 0, C1_8,  C2_8,  C3_8 },
-    { 1, C9_6,  C8_6,  C7_6 },
-    { 1, C9_5,  C8_5,  C7_5 },
-    { 1, C9_4,  C8_4,  C7_4 },
-    { 1, C9_3,  C8_3,  C7_3 },
-    { 1, C9_2,  C8_2,  C7_2 },
-    { 1, C9_1,  C8_1,  C7_1 },
-    { 1, C2_9,  C3_9,  C4_9 },
-    { 1, C1_9,  C3_10, C4_10 },
-    { 1, C1_10, C2_10, C4_11 },
-    { 1, C1_11, C2_11, C3_11 },
-    { 1, C1_12, C2_12, C3_12 },
-    { 1, C1_13, C2_13, C3_13 },
-    { 0, C1_16, C2_16, C3_16 },
-
-    { 1, C9_8,  C7_7,  C6_7 },
-    { 1, C1_5,  C2_5,  C3_5 },
-    { 1, C1_4,  C2_4,  C3_4 },
-    { 1, C1_3,  C2_3,  C3_3 },
-    { 1, C1_2,  C2_2,  C4_3 },
-    { 1, C1_1,  C3_2,  C4_2 },
-    { 1, C9_9,  C8_9,  C7_9 },
-    { 1, C9_10, C8_10, C7_10 },
-    { 1, C9_11, C8_11, C7_11 },
-    { 1, C9_12, C8_12, C7_12 },
-    { 1, C1_14, C2_14, C3_14 },
-    { 1, C1_15, C2_15, C3_15 },
-    { 1, C1_16, C2_16, C3_16 },
-    { 0, C9_15, C8_15, C6_14 },
-
-    { 1, C8_8,  C7_8,  C6_8 },
-    { 1, C1_8,  C2_8,  C3_8 },
-    { 1, C1_7,  C2_7,  C3_7 },
-    { 1, C2_1,  C3_1,  C4_1 },
-    { 1, C9_14, C8_14, C7_14 },
-    { 1, C9_15, C8_15, C6_14 },
-    { 1, C9_16, C7_15, C6_15 },
-    { 1, C8_16, C7_16, C6_16 },
-    { 0, C8_16, C7_16, C6_16 },
-    { 0, C9_16, C7_15, C6_15 }
-};
-
-led_config_t g_led_config = {
-    {
-        {  0,  1,  2,      3,      4,  5,      6,      7,  8,  9, 10, 11,     12, 13, 14 },
-        { 15, 16, 17,     18,     19, 20,     21,     22, 23, 24, 25, 26,     27, 28, 29 },
-        { 30, 31, 32,     33,     34, 35,     36,     37, 38, 39, 40, 41, NO_LED, 42, 43 },
-        { 44, 45, 46,     47,     48, 49,     50,     51, 52, 53, 54, 55, NO_LED, 56, 57 },
-        { 58, 59, 60, NO_LED, NO_LED, 61, NO_LED, NO_LED, 62, 63, 64, 65, NO_LED, 66, 67 }
-    }, {
-        {   0,   0 }, {  15,   0 }, {  30,   0 }, {  45,   0 }, {  60,   0 }, {  75,   0 }, {  90,   0 }, { 105,   0 }, { 120,   0 }, { 135,   0 }, { 150,   0 }, { 165,   0 }, { 180,   0 }, { 203,   0 }, { 224,   0 },
-        {   4,  16 }, {  23,  16 }, {  38,  16 }, {  53,  16 }, {  68,  16 }, {  83,  16 }, {  98,  16 }, { 113,