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

19 files changed, 574 insertions, 0 deletions

diff --git a/keyboards/ogurec/config.h b/keyboards/ogurec/config.h
new file mode 100644
index 0000000000..c5605ca645
--- /dev/null
+++ b/keyboards/ogurec/config.h
@@ -0,0 +1,56 @@
+/* Copyright 2021 drhigsby
+ *
+ * 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 "config_common.h"
+
+/* USB Device descriptor parameter */
+#define MANUFACTURER DrHigsby
+#define PRODUCT ogurec
+#define VENDOR_ID 0x0007
+#define PRODUCT_ID 0x0002
+#define DEVICE_VER 0x0001
+
+/* key matrix size */
+#define MATRIX_ROWS 3
+#define MATRIX_COLS 12
+
+/*
+ * Keyboard Matrix Assignments
+ *
+ * Change this to how you wired your keyboard
+ * COLS: AVR pins used for columns, left to right
+ * ROWS: AVR pins used for rows, top to bottom
+ * DIODE_DIRECTION: COL2ROW = COL = Anode (+), ROW = Cathode (-, marked on diode)
+ *                  ROW2COL = ROW = Anode (+), COL = Cathode (-, marked on diode)
+ *
+ */
+
+/* key matrix pins */
+#define MATRIX_ROW_PINS { F6, B6, B2 }
+#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, F4, F5 }
+#define UNUSED_PINS { F7, B1, B3 }
+
+/* COL2ROW or ROW2COL */
+#define DIODE_DIRECTION COL2ROW
+
+/* Debounce reduces chatter (unintended double-presses) - set 0 if debouncing is not needed */
+#define DEBOUNCE 5
+
+/* Mechanical locking support. Use KC_LCAP, KC_LNUM or KC_LSCR instead in keymap */
+#define LOCKING_SUPPORT_ENABLE
+/* Locking resynchronize hack */
+#define LOCKING_RESYNC_ENABLE
diff --git a/keyboards/ogurec/info.json b/keyboards/ogurec/info.json
new file mode 100644
index 0000000000..addd0ee43a
--- /dev/null
+++ b/keyboards/ogurec/info.json
@@ -0,0 +1,88 @@
+{
+    "keyboard_name": "ogurec", 
+    "url": "http://www.keyboard-layout-editor.com/#/gists/f1bda3a87822868599cf6e3c4340f594", 
+    "maintainer": "drhigsby", 
+    "width": 12, 
+    "height": 3, 
+    "layouts": {
+        "LAYOUT_ortho_3x12": {
+            "layout": [
+                {"label":"Q", "x":0, "y":0}, 
+                {"label":"W", "x":1, "y":0}, 
+                {"label":"E", "x":2, "y":0}, 
+                {"label":"R", "x":3, "y":0}, 
+                {"label":"T", "x":4, "y":0}, 
+                {"x":5, "y":0}, 
+                {"x":6, "y":0}, 
+                {"label":"Y", "x":7, "y":0}, 
+                {"label":"U", "x":8, "y":0}, 
+                {"label":"I", "x":9, "y":0}, 
+                {"label":"O", "x":10, "y":0}, 
+                {"label":"P", "x":11, "y":0}, 
+                {"label":"A", "x":0, "y":1}, 
+                {"label":"S", "x":1, "y":1}, 
+                {"label":"D", "x":2, "y":1}, 
+                {"label":"F", "x":3, "y":1}, 
+                {"label":"G", "x":4, "y":1}, 
+                {"x":5, "y":1}, 
+                {"x":6, "y":1}, 
+                {"label":"H", "x":7, "y":1}, 
+                {"label":"J", "x":8, "y":1}, 
+                {"label":"K", "x":9, "y":1}, 
+                {"label":"L", "x":10, "y":1}, 
+                {"label":"\"", "x":11, "y":1}, 
+                {"label":"Z", "x":0, "y":2}, 
+                {"label":"X", "x":1, "y":2}, 
+                {"label":"C", "x":2, "y":2}, 
+                {"label":"V", "x":3, "y":2}, 
+                {"label":"B", "x":4, "y":2}, 
+                {"x":5, "y":2}, 
+                {"x":6, "y":2}, 
+                {"label":"N", "x":7, "y":2}, 
+                {"label":"M", "x":8, "y":2}, 
+                {"label":"<", "x":9, "y":2}, 
+                {"label":">", "x":10, "y":2}, 
+                {"label":"?", "x":11, "y":2}]
+        },
+       
+        "LAYOUT_ortho_3x12_1x2uC": {
+            "layout": [
+                {"label":"Q", "x":0, "y":0}, 
+                {"label":"W", "x":1, "y":0}, 
+                {"label":"E", "x":2, "y":0}, 
+                {"label":"R", "x":3, "y":0}, 
+                {"label":"T", "x":4, "y":0}, 
+                {"x":5, "y":0}, 
+                {"x":6, "y":0}, 
+                {"label":"Y", "x":7, "y":0}, 
+                {"label":"U", "x":8, "y":0}, 
+                {"label":"I", "x":9, "y":0}, 
+                {"label":"O", "x":10, "y":0}, 
+                {"label":"P", "x":11, "y":0}, 
+                {"label":"A", "x":0, "y":1}, 
+                {"label":"S", "x":1, "y":1}, 
+                {"label":"D", "x":2, "y":1}, 
+                {"label":"F", "x":3, "y":1}, 
+                {"label":"G", "x":4, "y":1}, 
+                {"x":5, "y":1}, 
+                {"x":6, "y":1}, 
+                {"label":"H", "x":7, "y":1}, 
+                {"label":"J", "x":8, "y":1}, 
+                {"label":"K", "x":9, "y":1}, 
+                {"label":"L", "x":10, "y":1}, 
+                {"label":"\"", "x":11, "y":1}, 
+                {"label":"Z", "x":0, "y":2}, 
+                {"label":"X", "x":1, "y":2}, 
+                {"label":"C", "x":2, "y":2}, 
+                {"label":"V", "x":3, "y":2}, 
+                {"label":"B", "x":4, "y":2}, 
+                {"x":5, "y":2, "w":2}, 
+                {"label":"N", "x":7, "y":2}, 
+                {"label":"M", "x":8, "y":2}, 
+                {"label":"<", "x":9, "y":2}, 
+                {"label":">", "x":10, "y":2}, 
+                {"label":"?", "x":11, "y":2}]
+        },
+
+    }
+}
diff --git a/keyboards/ogurec/keymaps/dack/config.h b/keyboards/ogurec/keymaps/dack/config.h
new file mode 100644
index 0000000000..af5d55bf6e
--- /dev/null
+++ b/keyboards/ogurec/keymaps/dack/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 drhigsby
+ *
+ * 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
+#define IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_TERM 230
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/ogurec/keymaps/dack/keymap.c b/keyboards/ogurec/keymaps/dack/keymap.c
new file mode 100644
index 0000000000..420ff3d88d
--- /dev/null
+++ b/keyboards/ogurec/keymaps/dack/keymap.c
@@ -0,0 +1,97 @@
+/* Copyright 2021 drhigsby
+ *
+ * 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
+
+enum custom_layers {
+    _BASE,
+    _CLOSE,
+    _FAR,
+    _FUNKY,
+};
+#define CLS_SPC LT(_CLOSE, KC_SPC)
+#define FAR_F LT(_FAR, KC_F)
+#define FNK_D LT(_FUNKY, KC_D)
+#define SFT_Z LSFT_T(KC_Z)
+#define SFT_ENT RSFT_T(KC_ENT)
+#define CTL_X LCTL_T(KC_X)
+#define CTL_DOT RCTL_T(KC_DOT)
+#define WIN_C LWIN_T(KC_C)
+#define WIN_COMM RWIN_T(KC_COMM)
+#define ALT_V LALT_T(KC_V)
+#define ALT_M LALT_T(KC_M)
+#define COPY LCTL(KC_C)
+#define PASTE LCTL(KC_V)
+#define CUT LCTL(KC_X)
+#define UNDO LCTL(KC_Z)
+#define RUS_TGL RALT(KC_LSFT)
+#define LOCK LWIN(KC_L)
+#define vvv KC_TRNS
+
+enum custom_keycodes {
+    TYPEDON = SAFE_RANGE
+};
+
+bool process_record_user(uint16_t keycode, keyrecord_t* record) {
+    if (record->event.pressed) {
+        switch (keycode) {
+        case TYPEDON:
+            SEND_STRING("[typed on an ogurec]");
+            return false;
+        }
+    }
+    return true;
+};
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_ortho_3x12(
+        KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P,
+        KC_A, KC_S, FNK_D, FAR_F, KC_G, KC_GRAVE, KC_SCOLON, KC_H, KC_J, KC_K, KC_L, KC_QUOT,
+        SFT_Z, CTL_X, WIN_C, ALT_V, KC_B, KC_BSPC, CLS_SPC, KC_N, ALT_M, WIN_COMM, CTL_DOT, SFT_ENT
+  ),
+
+    [_CLOSE] = LAYOUT_ortho_3x12(
+        KC_1,     KC_2,    KC_3,    KC_4,    KC_5,    _______, _______, KC_6,    KC_7,       KC_8,     KC_9,    KC_0,
+        KC_EXLM,  KC_AT,   KC_HASH, KC_DLR,  KC_PERC, _______, _______, KC_CIRC, KC_AMPR,    KC_ASTR,  KC_LPRN, KC_RPRN,
+        KC_MINUS, KC_UNDS, KC_EQL,  KC_PLUS, _______, _______, vvv,     _______, KC_SCOLON,  KC_COLON, KC_SLSH, KC_QUES
+  ),
+
+    [_FAR] = LAYOUT_ortho_3x12(
+        KC_ESC,  TYPEDON, KC_BSLS, RUS_TGL,_______,  _______,  _______,  KC_PGUP,   KC_HOME,    KC_UP,    KC_END,    KC_INS,
+        KC_CAPS, KC_TAB,  KC_PIPE, vvv,    LOCK,     _______,  _______,  KC_PGDN,   KC_LEFT,    KC_DOWN,  KC_RIGHT,  KC_DEL,
+        UNDO,    CUT,     COPY,    PASTE,  KC_LBRC,  KC_RBRC,  KC_LCBR,  KC_RCBR,   _______,    _______,  _______,   _______
+  ),
+    [_FUNKY] = LAYOUT_ortho_3x12(
+        KC_F1,    KC_F2,    KC_F3,   KC_F4,    KC_F5,    KC_F6,   KC_F7,    KC_F8,    KC_F9,    KC_F10,   KC_F11,   KC_F12,
+        _______,  _______,  vvv,     _______,  _______,  _______, _______,  _______,  _______,  _______,  _______,  _______,
+        _______,  _______,  _______, _______,  _______,  KC_VOLD, KC_VOLU,  _______,  _______,  _______,  _______,  _______
+  )
+
+};
+
+uint16_t get_tapping_term(uint16_t keycode, keyrecord_t* record) {
+    switch (keycode) {
+    case FAR_F:
+        return TAPPING_TERM - 50;
+    case CLS_SPC:
+        return TAPPING_TERM - 50;
+    case SFT_Z:
+        return TAPPING_TERM - 80;
+    case SFT_ENT:
+        return TAPPING_TERM - 75;
+    default:
+        return TAPPING_TERM;
+    }
+}
diff --git a/keyboards/ogurec/keymaps/dack/readme.md b/keyboards/ogurec/keymaps/dack/readme.md
new file mode 100644
index 0000000000..adffe1797f
--- /dev/null
+++ b/keyboards/ogurec/keymaps/dack/readme.md
@@ -0,0 +1,3 @@
+# Dack's Ogurec Keymap
+
+This is Dack's personal ogurec keymap and it is for left-sided PM placement
diff --git a/keyboards/ogurec/keymaps/default/config.h b/keyboards/ogurec/keymaps/default/config.h
new file mode 100644
index 0000000000..9ff2d89acc
--- /dev/null
+++ b/keyboards/ogurec/keymaps/default/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2021 drhigsby
+ *
+ * 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
+
+#define COMBO_COUNT 7
+#define COMBO_TERM 40
diff --git a/keyboards/ogurec/keymaps/default/keymap.c b/keyboards/ogurec/keymaps/default/keymap.c
new file mode 100644
index 0000000000..691f5c95a1
--- /dev/null
+++ b/keyboards/ogurec/keymaps/default/keymap.c
@@ -0,0 +1,76 @@
+/* Copyright 2021 drhigsby
+ *
+ * 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
+
+enum layers{
+  _BASE,
+  _NUM,
+  _FN
+};
+
+enum combo_events {
+  combo_ESC,
+  combo_BACK,
+  combo_TAB,
+  combo_DELETE,
+  combo_ENTER,
+  combo_LPRN,
+  combo_RPRN,
+};
+
+const uint16_t PROGMEM esc_combo[] = {KC_Q, KC_W, COMBO_END};
+const uint16_t PROGMEM bspc_combo[] = {KC_O, KC_P, COMBO_END};
+const uint16_t PROGMEM tab_combo[] = {KC_A, KC_S, COMBO_END};
+const uint16_t PROGMEM del_combo[] = {KC_I, KC_O, COMBO_END};
+const uint16_t PROGMEM enter_combo[] = {KC_L, KC_SCLN, COMBO_END};
+const uint16_t PROGMEM lprn_combo[] = {KC_X, KC_C, COMBO_END};
+const uint16_t PROGMEM rprn_combo[] = {KC_COMM, KC_DOT, COMBO_END};
+
+
+combo_t key_combos[COMBO_COUNT] = {
+  [combo_ESC] = COMBO(esc_combo, KC_ESC),
+  [combo_BACK] = COMBO(bspc_combo, KC_BSPC),
+  [combo_TAB] = COMBO(tab_combo, KC_TAB),
+  [combo_DELETE] = COMBO(del_combo, KC_DEL),
+  [combo_ENTER] = COMBO(enter_combo, KC_ENT),
+  [combo_LPRN] = COMBO(lprn_combo, KC_LPRN),
+  [combo_RPRN] = COMBO(rprn_combo, KC_RPRN),
+};
+
+#define NUM MO(_NUM)
+#define FN MO(_FN)
+#define xxx KC_TRNS
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_ortho_3x12(
+        KC_Q, KC_W, KC_E, KC_R, KC_T, KC_LBRC, KC_RBRC, KC_Y, KC_U, KC_I, KC_O, KC_P,
+        KC_A, KC_S, KC_D, KC_F, KC_G, FN, KC_QUOT, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
+        LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, NUM, KC_SPC, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH)
+  ),
+
+    [_NUM] = LAYOUT_ortho_3x12(
+        KC_1, KC_2, KC_3, KC_4, KC_5, KC_HOME, KC_PGUP, KC_6, KC_7, KC_8, KC_9, KC_0,
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_END, KC_PGDN, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,
+        KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_LCBR, KC_LT, KC_GT, KC_RCBR, KC_PIPE, KC_BSLS, KC_DQUO, KC_QUOT
+  ),
+
+    [_FN] = LAYOUT_ortho_3x12(
+        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10, KC_F11, KC_F12, 
+        xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx,
+        KC_VOLD, KC_VOLU, KC_MSTP, KC_MPLY, KC_MPRV, KC_MNXT, KC_MUTE, KC_MRWD, KC_MFFD, xxx, xxx, xxx       
+  )
+
+};
diff --git a/keyboards/ogurec/keymaps/default/readme.md b/keyboards/ogurec/keymaps/default/readme.md
new file mode 100644
index 0000000000..3be288eeeb
--- /dev/null
+++ b/keyboards/ogurec/keymaps/default/readme.md
@@ -0,0 +1 @@
+# default ogurec keymap 
diff --git a/keyboards/ogurec/keymaps/default/rules.mk b/keyboards/ogurec/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/ogurec/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/ogurec/left_pm/left_pm.h b/keyboards/ogurec/left_pm/left_pm.h
new file mode 100644
index 0000000000..ecf87a2a49
--- /dev/null
+++ b/keyboards/ogurec/left_pm/left_pm.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 drhigsby
+ *
+ * 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 "ogurec.h"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_ortho_3x12( \
+    k011, k010, k009, k008, k007, k006, k005, k004, k003, k002, k001, k000, \
+    k111, k110, k109, k108, k107, k106, k105, k104, k103, k102, k101, k100,  \
+    k211, k210, k209, k208, k207, k206, k205, k204, k203, k202, k201, k200    \
+) \
+{ \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 },  \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }    \
+}
+
+#define LAYOUT_ortho_3x12_1x2uC( \
+    k011, k010, k009, k008, k007, k006, k005, k004, k003, k002, k001, k000, \
+    k111, k110, k109, k108, k107, k106, k105, k104, k103, k102, k101, k100,  \
+    k211, k210, k209, k208, k207,    k205,    k204, k203, k202, k201, k200    \
+) \
+{ \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 },  \
+    { k200, k201, k202, k203, k204, k205, KC_NO, k207, k208, k209, k210, k211 }   \
+}
diff --git a/keyboards/ogurec/left_pm/readme.md b/keyboards/ogurec/left_pm/readme.md
new file mode 100644
index 0000000000..c9d0cddb3b
--- /dev/null
+++ b/keyboards/ogurec/left_pm/readme.md
@@ -0,0 +1,13 @@
+# ogurec keymap for left-sided PM placement
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ogurec/left_pm:default
+
+Flashing example for this keyboard:
+
+    make ogurec/left_pm:default:flash
+
+To place the keyboard into bootloader mode, solder a reset switch onto the PCB and press it OR short the GND and RST pins on the pro micro. 
+
+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/ogurec/left_pm/rules.mk b/keyboards/ogurec/left_pm/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/ogurec/left_pm/rules.mk
diff --git a/keyboards/ogurec/ogurec.c b/keyboards/ogurec/ogurec.c
new file mode 100644
index 0000000000..6b2efa56b6
--- /dev/null
+++ b/keyboards/ogurec/ogurec.c
@@ -0,0 +1,16 @@
+/* Copyright 2021 drhigsby
+ *
+ * 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 "ogurec.h"
diff --git a/keyboards/ogurec/ogurec.h b/keyboards/ogurec/ogurec.h
new file mode 100644
index 0000000000..53956aa586
--- /dev/null
+++ b/keyboards/ogurec/ogurec.h
@@ -0,0 +1,24 @@
+/* Copyright 2021 drhigsby
+ *
+ * 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"
+
+#if defined(KEYBOARD_ogurec_left_pm)
+#    include "left_pm.h"
+#elif defined(KEYBOARD_ogurec_right_pm)
+#    include "right_pm.h"
+#endif
diff --git a/keyboards/ogurec/readme.md b/keyboards/ogurec/readme.md
new file mode 100644
index 0000000000..3e0ae153fa
--- /dev/null
+++ b/keyboards/ogurec/readme.md
@@ -0,0 +1,27 @@
+# ogurec
+
+![ogurec](https://i.imgur.com/OJ5UnXT.png)
+
+ogurec is a reversible 12u x 3u ortholinear keyboard that offers left-sided and right-sided PM placement.
+
+The default ogurec keymap is for left-sided PM placement.
+
+When flashing ogurec with the PM soldered onto the right side, follow the second example below and use: make ogure/right_pm:default
+
+* Keyboard Maintainer: [H. Bond](https://github.com/drhigsby)
+* Hardware Supported: ogurec (https://github.com/drhigsby/ogurec)
+* Hardware Availability: open source 3DP case available here https://github.com/drhigsby (case creator: https://github.com/dpalka15)
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ogurec:default
+    make ogurec/right_pm:default
+
+To place the keyboard into bootloader mode, solder a reset switch onto the PCB and press it OR short the GND and RST pins on the pro micro. 
+
+Flashing example for this keyboard:
+
+    make ogurec:default:flash
+    make ogurec/right_pm: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/ogurec/right_pm/readme.md b/keyboards/ogurec/right_pm/readme.md
new file mode 100644
index 0000000000..54efcecfe1
--- /dev/null
+++ b/keyboards/ogurec/right_pm/readme.md
@@ -0,0 +1,13 @@
+# ogurec keymap for right-sided PM placement
+
+Make example for this keyboard (after setting up your build environment):
+
+    make ogurec/right_pm:default
+
+Flashing example for this keyboard:
+
+    make ogurec/right_pm:default:flash
+
+To place the keyboard into bootloader mode, solder a reset switch onto the PCB and press it OR short the GND and RST pins on the pro micro. 
+
+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/ogurec/right_pm/right_pm.h b/keyboards/ogurec/right_pm/right_pm.h
new file mode 100644
index 0000000000..e413a835bc
--- /dev/null
+++ b/keyboards/ogurec/right_pm/right_pm.h
@@ -0,0 +1,49 @@
+/* Copyright 2021 drhigsby
+ *
+ * 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 "ogurec.h"
+
+/* This a shortcut to help you visually see your layout.
+ *
+ * The first section contains all of the arguments representing the physical
+ * layout of the board and position of the keys.
+ *
+ * The second converts the arguments into a two-dimensional array which
+ * represents the switch matrix.
+ */
+
+#define LAYOUT_ortho_3x12( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111,  \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211    \
+) \
+{ \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 },  \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211 }    \
+}
+
+#define LAYOUT_ortho_3x12_1x2uC( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111,  \
+    k200, k201, k202, k203, k204,    k205,    k207, k208, k209, k210, k211    \
+) \
+{ \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111 },  \
+    { k200, k201, k202, k203, k204, k205, KC_NO, k207, k208, k209, k210, k211 }   \
+}
diff --git a/keyboards/ogurec/right_pm/rules.mk b/keyboards/ogurec/right_pm/rules.mk
new file mode 100644
index 0000000000..e69de29bb2
--- /dev/null
+++ b/keyboards/ogurec/right_pm/rules.mk
diff --git a/keyboards/ogurec/rules.mk b/keyboards/ogurec/rules.mk
new file mode 100644
index 0000000000..26b1d0da8e
--- /dev/null
+++ b/keyboards/ogurec/rules.mk
@@ -0,0 +1,23 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+#   change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no       # Virtual DIP switch configuration
+MOUSEKEY_ENABLE = no       # Mouse keys
+EXTRAKEY_ENABLE = yes       # Audio control and System control
+CONSOLE_ENABLE = no         # Console for debug
+COMMAND_ENABLE = no         # Commands for debug and configuration
+# Do not enable SLEEP_LED_ENABLE. it uses the same timer as BACKLIGHT_ENABLE
+SLEEP_LED_ENABLE = no       # Breathing sleep LED during USB suspend
+# if this doesn't work, see here: https://github.com/tmk/tmk_keyboard/wiki/FAQ#nkro-doesnt-work
+NKRO_ENABLE = yes           # USB Nkey Rollover
+BACKLIGHT_ENABLE = no       # Enable keyboard backlight functionality
+RGBLIGHT_ENABLE = no        # Enable keyboard RGB underglow
+BLUETOOTH_ENABLE = no       # Enable Bluetooth
+AUDIO_ENABLE = no           # Audio output
+DEFAULT_FOLDER = ogurec/left_pm