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

3 files changed, 60 insertions, 0 deletions

diff --git a/keyboards/peej/tripel/right/readme.md b/keyboards/peej/tripel/right/readme.md
new file mode 100644
index 0000000000..f965a74de2
--- /dev/null
+++ b/keyboards/peej/tripel/right/readme.md
@@ -0,0 +1,21 @@
+# Tripel
+## Sub-100x100mm modula 60% ortholinear 7u PCB
+
+![tripel](https://github.com/peej/tripel-keyboard/raw/master/images/3pcbs.jpg)
+
+15x5 ortholinear PCB for 60% tray mount cases using only prototype sized PCBs.
+
+This revision is for when the Pro-Micro is mounted on the right most PCB.
+
+* Keyboard Maintainer: [Paul James](https://github.com/peej)
+* Hardware Supported: Pro-Micro [PCB](https://github.com/peej/tripel-keyboard)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make peej/tripel/right:default
+
+Flashing example for this keyboard:
+
+    make peej/tripel/right:default:flash
+
+See the [build environment setup](https://docs.qmk.fm/#/getting_started_build_tools) and the [make instructions](https://docs.qmk.fm/#/getting_started_make_guide) for more information. Brand new to QMK? Start with our [Complete Newbs Guide](https://docs.qmk.fm/#/newbs).
diff --git a/keyboards/peej/tripel/right/right.h b/keyboards/peej/tripel/right/right.h
new file mode 100644
index 0000000000..5fa38270c9
--- /dev/null
+++ b/keyboards/peej/tripel/right/right.h
@@ -0,0 +1,38 @@
+/* Copyright 2021 Paul James
+ *
+ * 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
+
+#include "quantum.h"
+
+#define LAYOUT_ortho_7u( \
+    l11, l12, l13, l14, l15, m11, m12, m13, m14, m15, r11, r12, r13, r14, r15, \
+    l21, l22, l23, l24, l25, m21, m22, m23, m24, m25, r21, r22, r23, r24, r25, \
+    l31, l32, l33, l34, l35, m31, m32, m33, m34, m35, r31, r32, r33, r34, r35, \
+    l41, l42, l43, l44, l45, m41, m42, m43, m44, m45, r41, r42, r43, r44, r45, \
+    l51, l52, l53, l54,                m53,                r52, r53, r54, r51  \
+) \
+{ \
+    { m11, m12, m13, m14, m15, m25, m35, m45 }, \
+    { m21, m22, m23, m24, m34, m44, m53, KC_NO }, \
+    { m31, m32, m33, m43, m42, m41, KC_NO, KC_NO }, \
+    { r11, r12, r13, r14, r15, r25, r35, r45 }, \
+    { r21, r22, r23, r24, r34, r44, r53, r54 }, \
+    { r31, r32, r33, r43, r42, r41, r51, r52 }, \
+    { l11, l12, l13, l14, l15, l25, l35, l45 }, \
+    { l21, l22, l23, l24, l34, l44, l53, l54 }, \
+    { l31, l32, l33, l43, l42, l41, l51, l52 } \
+}
diff --git a/keyboards/peej/tripel/right/rules.mk b/keyboards/peej/tripel/right/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/peej/tripel/right/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank