From 9712781556cfea6fcee90096e519c321d602367b Mon Sep 17 00:00:00 2001
From: MaxMalRichtig <max@mal-richtig.de>
Date: Sun, 2 Dec 2018 23:33:00 +0100
Subject: [PATCH] First candidate of keymap - untested

---
 config.h |  3 ++-
 keymap.c | 47 ++++++++++++++++++++++++-----------------------
 2 files changed, 26 insertions(+), 24 deletions(-)

diff --git a/config.h b/config.h
index 102e8c6..9bbb53d 100644
--- a/config.h
+++ b/config.h
@@ -1,7 +1,7 @@
 #ifndef CONFIG_KEYMAP_H
 #define CONFIG_KEYMAP_H
 
-/* LAYOUT_all
+/* LAYOUT_all_iso
  * ┌───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┬───┐
  * │00 │01 │02 │03 │04 │05 │06 │07 │08 │09 │0a │0b │0c │0d │0e │
  * ├───┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴─┬─┴───┤
@@ -14,6 +14,7 @@
  * │40  │41  │43  │44      │46  │48        │4a │4b │4c │4d │4e │
  * └────┴────┴────┴────────┴────┴──────────┴───┴───┴───┴───┴───┘
 */
+
 #define MY_LAYOUT_all_iso( \
     k00, k01, k02, k03, k04, k05, k06, k07, k08, k09, k0a, k0b, k0c, k0d, k0e, \
     k10,      k12, k13, k14, k15, k16, k17, k18, k19, k1a, k1b, k1c, k1d, k2d, \
diff --git a/keymap.c b/keymap.c
index 05f2564..b6efa03 100644
--- a/keymap.c
+++ b/keymap.c
@@ -1,4 +1,5 @@
 #include QMK_KEYBOARD_H
+//#include "dz60.h"
 
 #include "keymap_german.h"
 
@@ -7,35 +8,35 @@
 #define XXXXX KC_NO
 
 // Layer definition
-#define _BS 0
-#define _SY 1
-#define _CN 2
+#define _BASE 0
+#define _FUNC 1
+#define _CONF 2
 
 const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
 
 // Base layer - ANSI QWERTY
-[_BS] = MY_LAYOUT_all_iso(
-	KC_GESC, KC_1,    KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, DE_SS, DE_ACUT, XXXXX, XXXXX,
-	KC_TAB,  KC_Q,    KC_W, KC_E, KC_R, KC_T, DE_Z, KC_U, KC_I, KC_O, KC_P, DE_UE, DE_PLUS,       KC_ENT,
-	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, DE_LESS, DE_Y, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSFT, KC_UP, KC_DEL,
-	KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, MO(_SY), KC_SPC, KC_RALT, MO(_CN), KC_LEFT, KC_DOWN, KC_RIGHT),
-
-// Utility layer - RGB and multimedia control
-[_SY] = MY_LAYOUT_all_iso(
-	_____, 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_M_K, RGB_M_R, _____, _____, KC_PSCR, _____, KC_PAUS, _____, _____, _____, _____,
-	_____, RGB_HUI, RGB_HUD, _____, _____, _____, _____, KC_INS, KC_HOME, KC_PGUP, _____, _____, _____,
-	_____, _____, RGB_SAI, RGB_SAD, _____, _____, _____, _____, _____, KC_END, KC_PGDN, _____, KC_MPLY, KC_VOLU, KC_MUTE,
-	_____, RGB_VAI, RGB_VAD, _____, _____, _____, _____, _____, KC_MPRV, KC_VOLD, KC_MNXT),
+[_BASE] = MY_LAYOUT_all_iso(
+	KC_GESC, KC_1,    KC_2,    KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,    KC_9,    KC_0,    DE_SS,   DE_ACUT, LCTL(KC_C),LCTL(KC_V),
+	KC_TAB,  KC_Q,    KC_W,    KC_E,   KC_R,   KC_T,   DE_Z,   KC_U,   KC_I,    KC_O,    KC_P,    DE_UE,   DE_PLUS,            KC_ENT,
+	KC_LCTL, KC_A,    KC_S,    KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,    KC_L,    DE_OE,   DE_AE,   DE_HASH,
+	KC_LSFT, DE_LESS, DE_Y,    KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,    DE_COMM, DE_DOT,  DE_MINS, KC_RSFT, KC_UP,   OSL(_FUNC),
+	MO(_CONF),KC_LGUI,KC_LALT,         KC_SPC,         DE_ALGR,        KC_BSPC,          KC_DEL,  KC_PSCR, KC_LEFT, KC_DOWN, KC_RIGHT),
 
 // Setup layer - Reset an additional "b" button
-[_CN] = MY_LAYOUT_all_iso(
-	RESET, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____,
-	KC_B, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, RESET,
-	_____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____,
-	_____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____,
-	_____, _____, _____, _____, _____, _____, _____, _____, _____, _____, _____),
+[_FUNC] = MY_LAYOUT_all_iso(
+	_____,   KC_F1,   KC_F2,   KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,   KC_F9,   KC_F10,  KC_F11,  KC_F12,  LCTL(KC_X),_____,
+	_____,   _____,   _____,   _____,  _____,  _____,  _____,  _____,  _____,   _____,   _____,   _____,   _____,           _____,
+	_____,   _____,   _____,   _____,  _____,  _____,  _____,  _____,  _____,   _____,   _____,   _____,   _____,
+	_____,   _____,   _____,   _____,  _____,  _____,  _____,  _____,  _____,   _____,   _____,   _____,   _____,   _____,  _____,
+	_____,   _____,   _____,           _____,          _____,          _____,            _____,   _____,   _____,   _____,  _____),
+
+// Utility layer - RGB and multimedia control
+[_CONF] = MY_LAYOUT_all_iso(
+	_____,   _____,   _____,   _____,  _____,  _____,  _____,  _____,  _____,   _____,   _____,   _____,   _____,   XXXXX,  XXXXX,
+	_____,   XXXXX,   KC_VOLU, XXXXX,  XXXXX,  XXXXX,  XXXXX,  RGB_TOG,RGB_MOD, RGB_M_K, RGB_M_R, XXXXX,   XXXXX,           _____,
+	_____,   KC_MUTE, KC_VOLD, KC_MPLY,XXXXX,  XXXXX,  XXXXX,  RGB_HUI,RGB_HUD, RGB_SAI, RGB_SAD, XXXXX,   XXXXX,
+	_____,   XXXXX,   XXXXX,   XXXXX,  XXXXX,  XXXXX,  XXXXX,  RGB_VAI,RGB_VAD, XXXXX,   XXXXX,   XXXXX,   XXXXX,   KC_PGUP,  XXXXX,
+	_____,   _____,   _____,           _____,          _____,          _____,            _____,   _____,   KC_HOME, KC_PGDN,  KC_END),
 
 };