Merge branch 'master' into taamas

3 files changed, 104 insertions, 0 deletions

diff --git a/keyboards/orthodox/keymaps/pdl/config.h b/keyboards/orthodox/keymaps/pdl/config.h
new file mode 100644
index 0000000000..5fd46b41c6
--- /dev/null
+++ b/keyboards/orthodox/keymaps/pdl/config.h
@@ -0,0 +1,35 @@
+/*
+This is the c configuration file for the keymap
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2017 Art Ortenburger
+Copyright 2018 Daniel Perrett
+
+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
+
+
+/* Use I2C or Serial, not both */
+
+#define USE_SERIAL
+// #define USE_I2C
+
+/* Select hand configuration */
+
+// #define MASTER_LEFT
+// #define MASTER_RIGHT
+#define EE_HANDS
diff --git a/keyboards/orthodox/keymaps/pdl/keymap.c b/keyboards/orthodox/keymaps/pdl/keymap.c
new file mode 100644
index 0000000000..42b9e7e485
--- /dev/null
+++ b/keyboards/orthodox/keymaps/pdl/keymap.c
@@ -0,0 +1,68 @@
+/*
+This is the keymap for the keyboard
+
+Copyright 2012 Jun Wako <wakojun@gmail.com>
+Copyright 2015 Jack Humbert
+Copyright 2017 Art Ortenburger
+
+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
+#include "pdl.h"
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_QWERTY] = LAYOUT_wrapper(
+        KC_TAB,  _________________QWERTY_L1_________________,                                                                _________________QWERTY_R1_________________, KC_BSPC,
+        MY_SESC, _________________QWERTY_L2_________________,          KC_LALT, KC_LGUI,          FUNCTN, MY_AMNU,           _________________QWERTY_R2_________________, MY_SQUO,
+        MY_CBSL, _________________QWERTY_L3_________________, NAVIGN,  KC_SPC,  NUMBRS,           NUMBRS, MY_SSPC, NAVIGN,   _________________QWERTY_R3_________________, MY_CENT
+    ),
+
+    [_PROXIM] = LAYOUT_wrapper(
+        MY_SESC, _________________PROXIM_L1_________________,                                                                _________________PROXIM_R1_________________, KC_BSPC,
+        KC_TAB,  _________________PROXIM_L2_________________,          KC_LALT, KC_LGUI,          FUNCTN, MY_AMNU,           _________________PROXIM_R2_________________, MY_SSCL,
+        MY_CBSL, _________________PROXIM_L3_________________, NAVIGN,  KC_SPC,  NUMBRS,           NUMBRS, MY_SSPC, NAVIGN,   _________________PROXIM_R3_________________, MY_CENT
+    ),
+
+    [_NAVIGN] = LAYOUT_wrapper(
+        _______, _________________NAVIGN_L1_________________,                                                                _______, _______, _______, _______, _______, _______,
+        _______, _________________NAVIGN_L2_________________,          _______, _______,          _______, _______,          _______, _______, _______, _______, _______, _______,
+        _______, _________________NAVIGN_L3_________________, _______, _______, _______,          _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    [_PUNCTN] = LAYOUT_wrapper(
+        _______, _______, _______, _______, _______, _______,                                                                _________________PUNCTN_R1_________________, _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______,          _______, _______,          _________________PUNCTN_R2_________________, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _________________PUNCTN_R3_________________, _______
+    ),
+
+    [_NUMBRS] = LAYOUT_wrapper(
+        _______, _________________NUMBRS_L1_________________,                                                                _______, _______, _______, _______, _______, _______,
+        _______, _________________NUMBRS_L2_________________,           _______, _______,         _______, _______,          _______, _______, _______, _______, _______, _______,
+        _______, _________________NUMBRS_L3_________________,  _______, _______, _______,         _______, _______, _______, _______, _______, _______, _______, _______, _______
+    ),
+
+    [_CODING] = LAYOUT_wrapper(
+        _______, _______, _______, _______, _______, _______,                                                                _________________CODING_R1_________________, _______,
+        _______, _______, _______, _______, _______, _______,          _______, _______,          _______, _______,          _________________CODING_R2_________________, _______,
+        _______, _______, _______, _______, _______, _______, _______, _______, _______,          _______, _______, _______, _________________CODING_R3_________________, _______
+    ),
+
+    [_FUNCTN] = LAYOUT_wrapper(
+        _______, _________________FUNCTN_L1_________________,                                                                _________________FUNCTN_L1_________________, MY_CAD,
+        _______, _________________FUNCTN_L2_________________,           _______, _______,         _______, _______,          _________________FUNCTN_L2_________________, KC_PSCR,
+        _______, _________________FUNCTN_L3_________________,  _______, _______, _______,         _______, _______, _______, _________________FUNCTN_L3_________________, _______
+    )
+};
+
diff --git a/keyboards/orthodox/keymaps/pdl/rules.mk b/keyboards/orthodox/keymaps/pdl/rules.mk
new file mode 100644
index 0000000000..ae71cbf491
--- /dev/null
+++ b/keyboards/orthodox/keymaps/pdl/rules.mk
@@ -0,0 +1 @@
+USER_NAME = pdl