Merge branch 'master' into meteor

4 files changed, 102 insertions, 4 deletions

diff --git a/keyboards/dztech/dz65rgb/keymaps/chocol8/rules.mk b/keyboards/dztech/dz65rgb/keymaps/chocol8/rules.mk
index 626329f811..1778a5e141 100644
--- a/keyboards/dztech/dz65rgb/keymaps/chocol8/rules.mk
+++ b/keyboards/dztech/dz65rgb/keymaps/chocol8/rules.mk
@@ -2,5 +2,4 @@ NKRO_ENABLE = yes            # USB Nkey Rollover
 VELOCIKEY_ENABLE = yes
 # AUTO_SHIFT_ENABLE = yes      # Auto Shift
 
-LINK_TIME_OPTIMIZATION_ENABLE = yes
-
+LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/rules.mk b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/rules.mk
index 9a75bb29dc..29afe8cd03 100644
--- a/keyboards/dztech/dz65rgb/keymaps/matthewrobo/rules.mk
+++ b/keyboards/dztech/dz65rgb/keymaps/matthewrobo/rules.mk
@@ -2,5 +2,4 @@ NKRO_ENABLE = yes                 # USB Nkey Rollover
 AUTO_SHIFT_ENABLE = yes      # Auto Shift
 # VELOCIKEY_ENABLE = yes
 
-LINK_TIME_OPTIMIZATION_ENABLE = yes
-
+LTO_ENABLE = yes
diff --git a/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c b/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
new file mode 100644
index 0000000000..277323987c
--- /dev/null
+++ b/keyboards/dztech/dz65rgb/keymaps/pagondel/keymap.c
@@ -0,0 +1,65 @@
+/* Copyright 2020 pagondel
+ *
+ * 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 QMK_KEYBOARD_H
+
+enum layers {
+    _BL,
+    _FL,
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+        /* Keymap _BL: (Base Layer) Default Layer
+     * ,-----------------------------------------------------------------------------.
+     * |Esc |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |Backsp |~ ` |
+     * |-----------------------------------------------------------------------------|
+     * |Tab    |  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P |  [ |  ] | \  |Del |
+     * |-----------------------------------------------------------------------------|
+     * |FN      |  A |  S |  D |  F |  G |  H |  J |  K |  L |  ; |  ' |Return  |PgUp|
+     * |-----------------------------------------------------------------------------|
+     * |Shift    |  Z |  X |  C |  V |  B |  N |  M |  , |  . |  / |Shift  | Up |PgDn|
+     * |-----------------------------------------------------------------------------|
+     * |Ctrl |Win  |Alt  |           Space            |Alt | FN |Ctrl |Lef |Dow |Rig |
+     * `-----------------------------------------------------------------------------'
+     */
+    [_BL] = LAYOUT_65_ansi(
+        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_GRV,
+        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_DEL,
+        MO(1),          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_PGUP,
+        KC_LSFT,                 KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  KC_SLSH, KC_RSFT, KC_UP,   KC_PGDN,
+        KC_LCTL,        KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_RCTL, KC_LEFT, KC_DOWN, KC_RGHT
+    ),
+        /* Keymap _FL: Function Layer
+     * ,-----------------------------------------------------------------------------.
+     * |Esc  | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 |F10 |F11 |F12 |DEL   |PNTS|
+     * |-----------------------------------------------------------------------------|
+     * |       |RgbT|RgbM|Hue+|Hue-|Sat+|Sat-|BR+ |BR- |    |    |SLCK|Paus|RST |    |
+     * |-----------------------------------------------------------------------------|
+     * |        |Eff+|Eff-|    |    |    |    |    |    |    |    |    |EEP RST |    |
+     * |-----------------------------------------------------------------------------|
+     * |Shift    |    |    |    |    |    |NK T|Mute|Vol-|Vol+|    |       |PgUp|    |
+     * |-----------------------------------------------------------------------------|
+     * |     |     |     |           Play             |    |    |     |Home|PgDn|End |
+     * `-----------------------------------------------------------------------------'
+     */
+    [_FL] = LAYOUT_65_ansi(
+        KC_ESC,         KC_F1,   KC_F2,   KC_F3,   KC_F4,   KC_F5,   KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  KC_DEL,  KC_PSCR,
+        _______,        RGB_TOG, RGB_MOD, RGB_HUI, RGB_HUD, RGB_SAI, RGB_SAD, RGB_VAI, RGB_VAD, _______, _______, KC_SLCK, KC_PAUS, RESET,   _______,
+        _______,        RGB_SPI, RGB_SPD, _______, _______, _______, _______, _______, _______, _______, _______, _______,          EEP_RST, _______,
+        KC_LSFT,                 _______, _______, _______, _______, _______, NK_TOGG, KC_MUTE, KC_VOLD, KC_VOLU, _______, _______, KC_PGUP, _______,
+        _______,        _______, _______,                            KC_MPLY,                   _______, _______, _______, KC_HOME, KC_VOLD, KC_END
+    )
+};
diff --git a/keyboards/dztech/dz65rgb/keymaps/pagondel/readme.md b/keyboards/dztech/dz65rgb/keymaps/pagondel/readme.md
new file mode 100644
index 0000000000..8f55ce428a
--- /dev/null
+++ b/keyboards/dztech/dz65rgb/keymaps/pagondel/readme.md
@@ -0,0 +1,35 @@
+# pagondel's DZ65RGB v2 layout
+
+```
+    Keymap Default Layer
+       ,-----------------------------------------------------------------------------.
+       |Esc |  1 |  2 |  3 |  4 |  5 |  6 |  7 |  8 |  9 |  0 |  - |  = |Backsp |~ ` |
+       |-----------------------------------------------------------------------------|
+       |Tab    |  Q |  W |  E |  R |  T |  Y |  U |  I |  O |  P |  [ |  ] | \  |Del |
+       |-----------------------------------------------------------------------------|
+       |FN      |  A |  S |  D |  F |  G |  H |  J |  K |  L |  ; |  ' |Return  |PgUp|
+       |-----------------------------------------------------------------------------|
+       |Shift    |  Z |  X |  C |  V |  B |  N |  M |  , |  . |  / |Shift  | Up |PgDn|
+       |-----------------------------------------------------------------------------|
+       |Ctrl |Win  |Alt  |           Space            |Alt | FN |Ctrl |Lef |Dow |Rig |
+       `-----------------------------------------------------------------------------'
+```
+
+```
+    Keymap Function Layer
+       ,-----------------------------------------------------------------------------.
+       |Esc  | F1 | F2 | F3 | F4 | F5 | F6 | F7 | F8 | F9 |F10 |F11 |F12 |DEL   |PNTS|
+       |-----------------------------------------------------------------------------|
+       |       |RgbT|RgbM|Hue+|Hue-|Sat+|Sat-|BR+ |BR- |    |    |SLCK|Paus|RST |    |
+       |-----------------------------------------------------------------------------|
+       |        |Eff+|Eff-|    |    |    |    |    |    |    |    |    |EEP RST |    |
+       |-----------------------------------------------------------------------------|
+       |Shift    |    |    |    |    |    |NK T|Mute|Vol-|Vol+|    |       |PgUp|    |
+       |-----------------------------------------------------------------------------|
+       |     |     |     |           Play             |    |    |     |Home|PgDn|End |
+       `-----------------------------------------------------------------------------'
+```
+
+### Build layout
+
+```qmk compile -kb dztech/dz65rgb/v2 -km pagondel```