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

2 files changed, 106 insertions, 0 deletions

diff --git a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c
new file mode 100644
index 0000000000..fb1bcd8dca
--- /dev/null
+++ b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/keymap.c
@@ -0,0 +1,96 @@
+/* Copyright 2021 Tobias Minn (@0x544D) 
+  * 
+  * 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_idx{
+  _BL = 0, // base layer
+  _FN1,    // function layer 1
+  _FN2     // function layer 2
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+   /* ISO 60 layout by 0x544D (ISO German keyboard layout shown)
+   *
+   * Keyboard uses a HW layout with dedicated arrow keys. To accomplish that, the key on the
+   * left of the "UP arrow" key serves a dual purpose as "-_" when pressed short and as "RShift" key
+   * when you hold the key. To trigger the "underscore" you need to hold LShift and press "-_".
+   *
+   * ,-----------------------------------------------------------------------------------------.
+   * | Esc | 1 ! | 2 " | 3 § | 4 $ | 5 % | 6 & | 7 / | 8 ( | 9 ) | 0 = | ß ? | ´ ` | Backspace |
+   * |-----------------------------------------------------------------------------------------|
+   * | Tab    |  Q  |  W  |  E  |  R  |  T  |  Z  |  U  |  I  |  O  |  P  |  Ü  | + * | Enter  |
+   * |----------------------------------------------------------------------------------       |
+   * | MO(2)   |  A  |  S  |  D  |  F  |  G  |  H  |  J  |  K  |  L  |  Ö  |  Ä  | # ' |       |
+   * |-----------------------------------------------------------------------------------------|
+   * | Shift | < > |  Y  |  X  |  C  |  V  |  B  |  N  |  M  | , ; | .: |-_ /Shift |  Up | Del |
+   * |-----------------------------------------------------------------------------------------|
+   * | LCtl  | LGUI  | LAlt  |            Space                  |RAlt| MO(1)| Lft | Dwn | Rgh |
+   * `-----------------------------------------------------------------------------------------'
+   */
+    [_BL] = LAYOUT_60_iso_arrow_one_bksp(
+        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,
+        MO(2),   KC_A,    KC_S,    KC_D,    KC_F,    KC_G,    KC_H,    KC_J,    KC_K,    KC_L,    KC_SCLN, KC_QUOT,         KC_BSLS, KC_ENT,
+        KC_LSFT, KC_NUBS, KC_Z,    KC_X,    KC_C,    KC_V,    KC_B,    KC_N,    KC_M,    KC_COMM, KC_DOT,  RSFT_T(KC_SLSH), KC_UP,   KC_DEL,
+        KC_LCTL, KC_LGUI, KC_LALT,                            KC_SPC,                    KC_RALT, MO(1),   KC_LEFT,         KC_DOWN, KC_RGHT
+    ),
+
+   /* Funtion Layer 1: Media Controls with arrow keys / RShift (Play Pause), F keys,
+   *                   RGB backlight control
+   * ,-----------------------------------------------------------------------------------------.
+   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |
+   * |-----------------------------------------------------------------------------------------|
+   * |        |     |     |     |     |     |     |     |     |     |     |     |     |        |
+   * |----------------------------------------------------------------------------------       |
+   * |         |     |     |     |     |     |     |     |     |     |     |     |     |       |
+   * |-----------------------------------------------------------------------------------------|
+   * |       |     |     |     |     | RGB-|RGB_T| RGB+|     |     |     |  MPlay  |Vol_U|     |
+   * |-----------------------------------------------------------------------------------------|
+   * |       |       |       |                                   |     |Trans| MPrv|Vol_D| MNxt|
+   * `-----------------------------------------------------------------------------------------'
+   */
+    [_FN1] = LAYOUT_60_iso_arrow_one_bksp(
+        KC_GRV,  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_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_NO,   KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RGB_RMOD,RGB_TOG, RGB_MOD, KC_NO,   KC_NO,   KC_NO,   KC_MPLY,         KC_VOLU, KC_NO,
+        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_TRNS, KC_MPRV,         KC_VOLD, KC_MNXT
+    ),
+    
+
+   /* Funtion Layer 2: Media Controls left hand, F keys, Page up/down, Home/end, Program/RESET
+   * ,-----------------------------------------------------------------------------------------.
+   * | °^  | F1  | F2  | F3  | F4  | F5  | F6  | F7  | F8  | F9  | F10 | F11 | F12 |   Delete  |
+   * |-----------------------------------------------------------------------------------------|
+   * |        |     |Vol_D|Vol_U|     |     |     |     |     |     |RESET|     |     |        |
+   * |----------------------------------------------------------------------------------       |
+   * |  Trans  |MPrv |MPlay| MNxt|     |     |     |     |     |     |     |     |     |       |
+   * |-----------------------------------------------------------------------------------------|
+   * |       |     |     |     |     |     |     |     |     |     |     |         |PGUP |     |
+   * |-----------------------------------------------------------------------------------------|
+   * |       |       |       |                                   |     |     | Home|PGDN | End |
+   * `-----------------------------------------------------------------------------------------'
+   */
+    [_FN2] = LAYOUT_60_iso_arrow_one_bksp(
+        KC_GRV,  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_NO,   KC_NO,   KC_VOLD, KC_VOLU, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   RESET,   KC_NO,           KC_NO,
+        KC_TRNS, KC_MRWD, KC_MPLY, KC_MNXT, KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_NO,   KC_NO,
+        KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,   KC_NO,           KC_PGUP, KC_NO,
+        KC_NO,   KC_NO,   KC_NO,                              KC_NO,                     KC_NO,   KC_NO,   KC_HOME,         KC_PGDN, KC_END
+    )
+};
\ No newline at end of file
diff --git a/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md
new file mode 100644
index 0000000000..a3d58c159f
--- /dev/null
+++ b/keyboards/dz60/keymaps/iso_de_arrow_0x544d/readme.md
@@ -0,0 +1,10 @@
+# DZ60 - ISO DE Arrow Layout
+
+![DZ60 ISO DE Arrow Layout Image](https://i.imgur.com/rfQRr7n.png)
+
+This is a modified version of the ISO DE layout for the DZ60 board. It has dedicated
+arrow keys and standard spacebar and backspace keys.
+
+The keyboard uses a hardware layout with dedicated arrow keys. To accomplish that, the key on the
+left of the "UP arrow" key serves a dual purpose as "-\_" when pressed short and as "RShift" key
+when you hold the key. To trigger the "underscore" you need to hold LShift and press "-\_".