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

3 files changed, 86 insertions, 0 deletions

diff --git a/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/config.h b/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/config.h
new file mode 100644
index 0000000000..7c0768a5ea
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/config.h
@@ -0,0 +1,29 @@
+/*
+Copyright 2022 Yoga Benggolo
+
+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
+
+#undef SOFT_SERIAL_PIN
+#define SOFT_SERIAL_PIN D2  // Pin D2 is labeled with RX on the PCB
+
+// Refers to AVR Pins, not Arduino Pins
+#undef MATRIX_COL_PINS
+#undef MATRIX_ROW_PINS
+#define MATRIX_COL_PINS { D0, D4, C6, D7, E6, B4, B5 }
+#define MATRIX_ROW_PINS { F5, F6, F7, B1, B3, B2, B6 }
+
diff --git a/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c b/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c
new file mode 100644
index 0000000000..0e8436788e
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/keymap.c
@@ -0,0 +1,38 @@
+// Copyright 2022 Yoga Benggolo
+// SPDX-License-Identifier: GPL-2.0-or-later
+#include QMK_KEYBOARD_H
+
+enum custom_layer {
+	_QWERTZ,
+	_RAISE,
+};
+
+#define RAISE MO(_RAISE)
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+	[_QWERTZ] = LAYOUT_6x7(
+		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_HOME,
+		KC_GRV , 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_END ,
+		XXXXXXX, 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,
+		RAISE  , 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_NUHS,
+		KC_LCTL, KC_NUBS, KC_Z   , KC_X   , KC_C   , KC_V   , KC_B   ,              KC_N   , KC_M   , KC_COMM, KC_DOT , KC_SLSH, KC_RSFT, KC_MPLY,
+		                           KC_LEFT, KC_RGHT,                                                  KC_UP  , KC_DOWN,
+		                                             KC_SPC , KC_LSFT,              KC_RALT, KC_ENT ,
+
+		                                             KC_LGUI, KC_LALT,              KC_BSPC, KC_DEL ,
+		                                             KC_PGDN, KC_PGUP,              KC_TAB , KC_INS
+		),
+
+	[_RAISE] = LAYOUT_6x7(
+		QK_BOOT, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
+		_______, _______, _______, _______, _______, _______, _______,              _______, _______, _______, _______, _______, _______, _______,
+		                           KC_MPRV, KC_MNXT,                                                  KC_VOLU, KC_VOLD,
+	                                                 _______, _______,              _______, _______,
+
+													 _______, _______,              _______, _______,
+													 _______, _______,              _______, _______
+		)
+};
diff --git a/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/readme.md b/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/readme.md
new file mode 100644
index 0000000000..735c3d8f3a
--- /dev/null
+++ b/keyboards/handwired/dactyl_manuform/6x7/keymaps/iso-de/readme.md
@@ -0,0 +1,19 @@
+# 6x7 Dactyl Manuform ISO-DE
+
+Hardware build log: [andi4000/dactyl-keyboard](https://github.com/andi4000/dactyl-keyboard)
+
+Please note the wiring differences with the default keymap in `config.h`.
+
+
+## Layout
+
+![Dactyl Manuform 6x7 ISO-DE](https://i.imgur.com/LUlCGVd.png)
+
+
+## Flashing
+
+To build firmware and flash afterwards:
+
+    qmk flash -kb handwired/dactyl_manuform/6x7 -km iso-de
+
+Reset the keyboard when prompted to enter bootloader.