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

6 files changed, 77 insertions, 31 deletions

diff --git a/keyboards/xiudi/xd75/keymaps/scheiklb/config.h b/keyboards/xiudi/xd75/keymaps/scheiklb/config.h
new file mode 100644
index 0000000000..ea9ca7a950
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/scheiklb/config.h
@@ -0,0 +1,8 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#define DE_PASTE LCTL(KC_V) // CTRL+V
+#define DE_COPY LCTL(KC_C) // CTRL+C
+#define DE_CUT LCTL(KC_X) // CTRL+X
+#define DE_UNDO LCTL(DE_Z) // CTRL+Z
+
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c b/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c
new file mode 100644
index 0000000000..3dc011a2cb
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/scheiklb/keymap.c
@@ -0,0 +1,41 @@
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+#include "keymap_german.h"
+
+// Layer shorthand
+#define _QWZ 0
+#define _FNC 1
+#define _AGR 2
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+
+
+	[_QWZ] = {
+	{ KC_ESC,  KC_1,    KC_2,    KC_3,    KC_4,     KC_5,     DE_CIRC, DE_UNDO,  KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    DE_SS,   DE_ACUT},
+	{ KC_TAB,  KC_Q,    KC_W,    KC_E,    KC_R,     KC_T,     DE_COPY, DE_PASTE, DE_Z,   KC_U,   KC_I,    KC_O,    KC_P,    DE_UDIA, DE_PLUS},
+	{ KC_CAPS, KC_A,    KC_S,    KC_D,    KC_F,     KC_G,     KC_DEL,  KC_BSPC,  KC_H,   KC_J,   KC_K,    KC_L,    DE_ODIA, DE_ADIA, DE_HASH},
+    { KC_LSFT, DE_Y,    KC_X,    KC_C,    KC_V,     KC_B,     KC_DOWN, KC_UP,    KC_N,   KC_M,   KC_COMM, KC_DOT,  DE_MINS, KC_TRNS, KC_RSFT},
+    { KC_LCTL, DE_LABK, KC_HOME, KC_LALT, KC_ENTER, KC_ENTER, KC_LEFT, KC_RIGHT, KC_SPC, KC_SPC, MO(2),   KC_TRNS, KC_TRNS, KC_TRNS, MO(1) },
+    },
+
+	[_FNC] = {
+	{ RESET,   KC_F1,   KC_F2,   KC_F3,   KC_F4,    KC_F5,    KC_TRNS, KC_TRNS, KC_F6,   KC_F7,   KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12},
+	{ KC_TAB,  DE_AT,   KC_TRNS, DE_EURO, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_TILD },
+	{ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS },
+	{ KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT },
+	{ KC_LCTL, DE_PIPE, KC_HOME, KC_LALT, KC_ENTER, KC_ENTER, KC_LEFT, KC_RIGHT, KC_SPC, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS },
+	},
+
+    [_AGR] = {
+
+    { KC_ESC,  KC_TRNS, DE_SUP2, DE_SUP3, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, DE_LCBR, DE_LBRC, DE_RBRC, DE_RCBR, DE_BSLS, KC_TRNS},
+	{ KC_TAB,  DE_AT,   KC_TRNS, DE_EURO, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, DE_TILD },
+	{ KC_CAPS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS },
+	{ KC_LSFT, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,  KC_TRNS,   KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_RSFT },
+	{ KC_LCTL, DE_PIPE, KC_HOME, KC_LALT, KC_ENTER, KC_ENTER, KC_LEFT, KC_RIGHT, KC_SPC, KC_SPC,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS },
+	},
+
+};
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklb/rules.mk b/keyboards/xiudi/xd75/keymaps/scheiklb/rules.mk
new file mode 100644
index 0000000000..52ea43a828
--- /dev/null
+++ b/keyboards/xiudi/xd75/keymaps/scheiklb/rules.mk
@@ -0,0 +1,17 @@
+# Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration(+1000)
+MOUSEKEY_ENABLE = no        # Mouse keys(+4700)
+EXTRAKEY_ENABLE = yes       # Audio control and System control(+450)
+CONSOLE_ENABLE = no         # Console for debug(+400)
+COMMAND_ENABLE = yes        # Commands for debug and configuration
+NKRO_ENABLE = yes           # Nkey Rollover - if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+MIDI_ENABLE = no            # MIDI support (+2400 to 4200, depending on config)
+AUDIO_ENABLE = no           # Audio output on port C6
+UNICODE_ENABLE = no         # Unicode
+BLUETOOTH_ENABLE = no       # Enable Bluetooth with the Adafruit EZ-Key HID
+RGBLIGHT_ENABLE = no        # Enable WS2812 RGB underlight.
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+TAP_DANCE_ENABLE = no       # Enable Tap Dancing
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklp/config.h b/keyboards/xiudi/xd75/keymaps/scheiklp/config.h
index 68f5a3ee11..b20cb2f4f3 100644
--- a/keyboards/xiudi/xd75/keymaps/scheiklp/config.h
+++ b/keyboards/xiudi/xd75/keymaps/scheiklp/config.h
@@ -1,20 +1,8 @@
-/* Copyright 2017 Benjamin Kesselring
- *
- * 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/>.
- */
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
 
 #pragma once
+
 // place overrides here
 #define AUTO_SHIFT_TIMEOUT 175
 #define NO_AUTO_SHIFT_SPECIAL
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c b/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
index a757c2e49c..594d34ce33 100644
--- a/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
+++ b/keyboards/xiudi/xd75/keymaps/scheiklp/keymap.c
@@ -1,20 +1,9 @@
-/* Copyright 2017 Wunder
- *
- * 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/>.
- */
+// Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
 #include QMK_KEYBOARD_H
 #include "koy_keys_on_quertz_de_latin1.h"
+
 // Layer shorthand
 #define _1 0
 #define _3 1
diff --git a/keyboards/xiudi/xd75/keymaps/scheiklp/rules.mk b/keyboards/xiudi/xd75/keymaps/scheiklp/rules.mk
index 2cbbe08d7a..0b00a6654d 100644
--- a/keyboards/xiudi/xd75/keymaps/scheiklp/rules.mk
+++ b/keyboards/xiudi/xd75/keymaps/scheiklp/rules.mk
@@ -1,4 +1,7 @@
-BOOTMAGIC_ENABLE = no       # Enable Bootmagic Lite
+# Copyright 2021 Paul Maria Scheikl (@ScheiklP)
+# SPDX-License-Identifier: GPL-2.0-or-later
+
+BOOTMAGIC_ENABLE = no
 COMMAND_ENABLE = no
 RGBLIGHT_ENABLE = no
 DYNAMIC_MACRO_ENABLE = yes