From 596511a959269097d640cf59fa0ad6ddb376b674 Mon Sep 17 00:00:00 2001
From: drhigsby <71532157+drhigsby@users.noreply.github.com>
Date: Tue, 16 Nov 2021 18:58:32 -0800
Subject: [PATCH] [Keyboard] Packrat (#14574)

Co-authored-by: Drashna Jaelre <drashna@live.com>
Co-authored-by: Ryan <fauxpark@gmail.com>
---
 keyboards/packrat/config.h                  | 59 +++++++++++++
 keyboards/packrat/info.json                 | 26 ++++++
 keyboards/packrat/keymaps/3uc/config.h      | 19 +++++
 keyboards/packrat/keymaps/3uc/keymap.c      | 92 +++++++++++++++++++++
 keyboards/packrat/keymaps/3uc/readme.md     |  1 +
 keyboards/packrat/keymaps/3uc/rules.mk      |  1 +
 keyboards/packrat/keymaps/default/config.h  | 19 +++++
 keyboards/packrat/keymaps/default/keymap.c  | 81 ++++++++++++++++++
 keyboards/packrat/keymaps/default/readme.md |  3 +
 keyboards/packrat/keymaps/default/rules.mk  |  1 +
 keyboards/packrat/packrat.c                 | 28 +++++++
 keyboards/packrat/packrat.h                 | 79 ++++++++++++++++++
 keyboards/packrat/readme.md                 | 25 ++++++
 keyboards/packrat/rules.mk                  | 23 ++++++
 14 files changed, 457 insertions(+)
 create mode 100644 keyboards/packrat/config.h
 create mode 100644 keyboards/packrat/info.json
 create mode 100644 keyboards/packrat/keymaps/3uc/config.h
 create mode 100644 keyboards/packrat/keymaps/3uc/keymap.c
 create mode 100644 keyboards/packrat/keymaps/3uc/readme.md
 create mode 100644 keyboards/packrat/keymaps/3uc/rules.mk
 create mode 100644 keyboards/packrat/keymaps/default/config.h
 create mode 100644 keyboards/packrat/keymaps/default/keymap.c
 create mode 100644 keyboards/packrat/keymaps/default/readme.md
 create mode 100644 keyboards/packrat/keymaps/default/rules.mk
 create mode 100644 keyboards/packrat/packrat.c
 create mode 100644 keyboards/packrat/packrat.h
 create mode 100644 keyboards/packrat/readme.md
 create mode 100644 keyboards/packrat/rules.mk

diff --git a/keyboards/packrat/config.h b/keyboards/packrat/config.h
new file mode 100644
index 0000000000..c69ecdafcb
--- /dev/null
+++ b/keyboards/packrat/config.h
@@ -0,0 +1,59 @@
+/* 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 Packrat
+#define VENDOR_ID 0x0007
+#define PRODUCT_ID 0x0004
+#define DEVICE_VER 0x0001
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 11
+
+/*
+ * 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 { F7, B1, B6, B2 }
+#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B5, B3 }
+#define UNUSED_PINS { F6 }
+
+/* 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
+
+#define ENCODERS_PAD_A { F5 }
+#define ENCODERS_PAD_B { F4 }
diff --git a/keyboards/packrat/info.json b/keyboards/packrat/info.json
new file mode 100644
index 0000000000..e4e3d869f1
--- /dev/null
+++ b/keyboards/packrat/info.json
@@ -0,0 +1,26 @@
+{
+  "keyboard_name": "packrat",
+  "url": "http://www.keyboard-layout-editor.com/#/gists/43d838a3b2e0344d75dd67abfc508038",
+  "maintainer": "drhigsby",
+  "layouts": {
+       "LAYOUT_3uc": {
+            "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}, {"label":"KNOB!", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "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}, {"label":"Any", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "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}, {"label":"Any", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Ctrl", "x":0.5, "y":3, "w":1.25}, {"label":"Alt", "x":1.75, "y":3, "w":1.25}, {"label":"Raise", "x":3, "y":3}, {"label":"", "x":4, "y":3, "w":3}, {"label":"Lower", "x":7, "y":3}, {"label":"Win", "x":8, "y":3, "w":1.25}, {"label":"Fn", "x":9.25, "y":3, "w":1.25}]
+        },
+
+       "LAYOUT_2x2uc": {
+            "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}, {"label":"KNOB!", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "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}, {"label":"Any", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "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}, {"label":"Any", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Ctrl", "x":0.5, "y":3, "w":1.25}, {"label":"Alt", "x":1.75, "y":3, "w":1.25}, {"label":"", "x":3, "y":3, "w":2}, {"label":"Any", "x":5, "y":3}, {"label":"", "x":6, "y":3, "w":2}, {"label":"Win", "x":8, "y":3, "w":1.25}, {"label":"Fn", "x":9.25, "y":3, "w":1.25}]
+        },
+    
+       "LAYOUT_7uc": {
+            "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}, {"label":"KNOB!", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "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}, {"label":"Any", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "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}, {"label":"Any", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Ctrl", "x":0.5, "y":3, "w":1.5}, {"label":"", "x":2, "y":3, "w":7}, {"label":"Alt", "x":9, "y":3, "w":1.5}]
+        },
+
+        "LAYOUT_2x3uc": {
+            "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}, {"label":"KNOB!", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "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}, {"label":"Any", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "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}, {"label":"Any", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Ctrl", "x":0.5, "y":3}, {"label":"Alt", "x":1.5, "y":3}, {"label":"", "x":2.5, "y":3, "w":3}, {"label":"", "x":5.5, "y":3, "w":3}, {"label":"Win", "x":8.5, "y":3}, {"label":"Fn", "x":9.5, "y":3}]
+        },
+
+        "LAYOUT_6uc": {
+            "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}, {"label":"KNOB!", "x":5, "y":0}, {"label":"Y", "x":6, "y":0}, {"label":"U", "x":7, "y":0}, {"label":"I", "x":8, "y":0}, {"label":"O", "x":9, "y":0}, {"label":"P", "x":10, "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}, {"label":"Any", "x":5, "y":1}, {"label":"H", "x":6, "y":1}, {"label":"J", "x":7, "y":1}, {"label":"K", "x":8, "y":1}, {"label":"L", "x":9, "y":1}, {"label":":", "x":10, "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}, {"label":"Any", "x":5, "y":2}, {"label":"N", "x":6, "y":2}, {"label":"M", "x":7, "y":2}, {"label":"<", "x":8, "y":2}, {"label":">", "x":9, "y":2}, {"label":"?", "x":10, "y":2}, {"label":"Ctrl", "x":0.5, "y":3}, {"label":"Alt", "x":1.5, "y":3}, {"label":"", "x":2.5, "y":3, "w":6}, {"label":"Win", "x":8.5, "y":3}, {"label":"Fn", "x":9.5, "y":3}]
+        }
+    }
+}
diff --git a/keyboards/packrat/keymaps/3uc/config.h b/keyboards/packrat/keymaps/3uc/config.h
new file mode 100644
index 0000000000..9ff2d89acc
--- /dev/null
+++ b/keyboards/packrat/keymaps/3uc/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/packrat/keymaps/3uc/keymap.c b/keyboards/packrat/keymaps/3uc/keymap.c
new file mode 100644
index 0000000000..f037a47acb
--- /dev/null
+++ b/keyboards/packrat/keymaps/3uc/keymap.c
@@ -0,0 +1,92 @@
+/* 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,
+  _CODE,
+  _MATH,
+  _FUNC
+};
+
+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 BASE TO(_BASE)
+#define CODE MO(_CODE)
+#define MATH TG(_MATH)
+#define FUNC MO(_FUNC)
+#define xxx KC_TRNS
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_3uc(
+        KC_Q, KC_W, KC_E, KC_R, KC_T,               MATH,          KC_Y, KC_U, KC_I, KC_O, KC_P,
+        KC_A, KC_S, KC_D, KC_F, KC_G,               KC_HOME,       KC_H, KC_J, KC_K, KC_L, KC_SCLN,
+        LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B,       KC_END,        KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+              KC_LALT, KC_LCTL, CODE,               KC_SPC,        CODE, KC_RGUI, FUNC
+  ),
+
+    [_CODE] = LAYOUT_3uc(
+        KC_1, KC_2, KC_3, KC_4, KC_5,               xxx,           KC_6, KC_7, KC_8, KC_9, KC_0,
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,   KC_PGUP,       KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,
+        KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, xxx,      KC_PGDN,       xxx, KC_PIPE, KC_BSLS, KC_DQUO, KC_QUOT,
+                      xxx, xxx, xxx,                xxx,           xxx, KC_PGUP, KC_PGDN
+  ),
+
+    [_MATH] = LAYOUT_3uc(
+        xxx, xxx, xxx, xxx, xxx,                    BASE,           xxx, KC_P7, KC_P8, KC_P9, KC_PPLS,
+        xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, KC_P4, KC_P5, KC_P6, KC_PCMM,
+        xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, KC_P1, KC_P2, KC_P3, KC_PEQL,
+                  xxx, xxx, xxx,                    xxx,           KC_P0, KC_PDOT, KC_PENT  
+
+  ),
+
+    [_FUNC] = LAYOUT_3uc(
+        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,          xxx,           KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+        xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, xxx, xxx, KC_F11, KC_F12,
+        xxx, xxx, xxx, xxx, xxx,                    xxx,           xxx, xxx, xxx, xxx, xxx,
+                  xxx, xxx, xxx,                    xxx,           xxx, xxx, xxx       
+  )
+
+};
+
diff --git a/keyboards/packrat/keymaps/3uc/readme.md b/keyboards/packrat/keymaps/3uc/readme.md
new file mode 100644
index 0000000000..603f82a812
--- /dev/null
+++ b/keyboards/packrat/keymaps/3uc/readme.md
@@ -0,0 +1 @@
+# Centered 3uC Packrat Keymap
diff --git a/keyboards/packrat/keymaps/3uc/rules.mk b/keyboards/packrat/keymaps/3uc/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/packrat/keymaps/3uc/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/packrat/keymaps/default/config.h b/keyboards/packrat/keymaps/default/config.h
new file mode 100644
index 0000000000..9ff2d89acc
--- /dev/null
+++ b/keyboards/packrat/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/packrat/keymaps/default/keymap.c b/keyboards/packrat/keymaps/default/keymap.c
new file mode 100644
index 0000000000..74df6a73e6
--- /dev/null
+++ b/keyboards/packrat/keymaps/default/keymap.c
@@ -0,0 +1,81 @@
+/* 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,
+  _CODE,
+  _FUNC
+};
+
+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 CODE MO(_CODE)
+#define FUNC MO(_FUNC)
+#define xxx KC_TRNS
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    [_BASE] = LAYOUT_2x3uc(
+        KC_Q, KC_W, KC_E, KC_R, KC_T,                KC_DEL,        KC_Y, KC_U, KC_I, KC_O, KC_P,
+        KC_A, KC_S, KC_D, KC_F, KC_G,                KC_HOME,       KC_H, KC_J, KC_K, KC_L, KC_SCLN,
+        LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B,        KC_END,        KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+               KC_LCTL, KC_LALT, CODE,                               KC_SPC, KC_RGUI, FUNC
+  ),
+
+    [_CODE] = LAYOUT_2x3uc(
+        KC_1, KC_2, KC_3, KC_4, KC_5,                KC_GRV,        KC_6, KC_7, KC_8, KC_9, KC_0,
+        KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC,    KC_CAPS,       KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL,
+        KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, xxx,       xxx, xxx,      KC_PIPE, KC_BSLS, KC_DQUO, KC_QUOT,
+                     xxx, xxx, xxx,                                 xxx, KC_PGUP, KC_PGDN
+  ),
+
+    [_FUNC] = LAYOUT_2x3uc(
+        KC_F1, KC_F2, KC_F3, KC_F4, KC_F5,           xxx,           KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+        xxx, xxx, xxx, xxx, xxx,                     xxx,           xxx, xxx, xxx, KC_F11, KC_F12,
+        xxx, xxx, xxx, xxx, xxx,                     xxx,           xxx, xxx, xxx, xxx, xxx,
+        xxx, xxx, xxx,                                              xxx, xxx, xxx       
+  )
+
+};
+
diff --git a/keyboards/packrat/keymaps/default/readme.md b/keyboards/packrat/keymaps/default/readme.md
new file mode 100644
index 0000000000..3e6ed27b57
--- /dev/null
+++ b/keyboards/packrat/keymaps/default/readme.md
@@ -0,0 +1,3 @@
+# Default Packrat Keymap
+
+The default Packrat Keymap uses the 2x3uC layout. 
diff --git a/keyboards/packrat/keymaps/default/rules.mk b/keyboards/packrat/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/packrat/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/packrat/packrat.c b/keyboards/packrat/packrat.c
new file mode 100644
index 0000000000..0f4a479956
--- /dev/null
+++ b/keyboards/packrat/packrat.c
@@ -0,0 +1,28 @@
+/* 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 "packrat.h"
+
+bool encoder_update_kb(uint8_t index, bool clockwise) {
+    if (!encoder_update_user(index, clockwise)) { return false; }
+    if (index == 0) {
+        if (clockwise) {
+            tap_code_delay(KC_VOLU, 10);
+        } else {
+            tap_code_delay(KC_VOLD, 10);
+        }
+    }
+    return true;
+}
diff --git a/keyboards/packrat/packrat.h b/keyboards/packrat/packrat.h
new file mode 100644
index 0000000000..91d0af7b7a
--- /dev/null
+++ b/keyboards/packrat/packrat.h
@@ -0,0 +1,79 @@
+/* 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"
+
+#define LAYOUT_3uc( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110,  \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210,   \
+          k301, k302, k303,       k305,       k307, k308, k309           \
+) { \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110 },  \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210 },   \
+    { KC_NO, k301, k302, k303, KC_NO, k305, KC_NO, k307, k308, k309 }        \
+}
+
+#define LAYOUT_2x2uc( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110,  \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210,   \
+          k301, k302, k303,       k305,       k307, k308, k309           \
+) { \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110 },  \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210 },   \
+    { KC_NO, k301, k302, k303, KC_NO, k305, KC_NO, k307, k308, k309 }        \
+}
+
+#define LAYOUT_7uc( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110,  \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210,   \
+          k301,                   k305,                   k309           \
+) { \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110 },  \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210 },   \
+    { KC_NO, k301, KC_NO, KC_NO, KC_NO, k305, KC_NO, KC_NO, KC_NO, k309 }    \
+}
+
+#define LAYOUT_2x3uc( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110,  \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210,   \
+          k301, k302, k303,                   k307, k308, k309           \
+) { \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110 },  \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210 },   \
+    { KC_NO, k301, k302, k303, KC_NO, KC_NO, KC_NO, k307, k308, k309 }        \
+}
+
+#define LAYOUT_6uc( \
+    k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, \
+    k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110,  \
+    k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210,   \
+          k301, k302,             k305,             k308, k309           \
+) { \
+    { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010 }, \
+    { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110 },  \
+    { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210 },   \
+    { KC_NO, k301, k302, KC_NO, KC_NO, k305, KC_NO, KC_NO, k308, k309 }        \
+}
diff --git a/keyboards/packrat/readme.md b/keyboards/packrat/readme.md
new file mode 100644
index 0000000000..a53377f870
--- /dev/null
+++ b/keyboards/packrat/readme.md
@@ -0,0 +1,25 @@
+# Packrat
+
+![Packrat](https://i.imgur.com/t6vWYIbh.jpeg)
+
+Full Gallery: https://imgur.com/gallery/fZklCG6
+
+Packrat is an 11u wide ortholinear keyboard featuring multiple bottom row options and top-centered rotary encoder support.
+
+* Keyboard Maintainer: [H. Bond](https://github.com/drhigsby)
+* Hardware Supported: Packrat (https://github.com/drhigsby/packrat)
+* Hardware Availability: cases available at TBD / make your own
+
+Make example for this keyboard (after setting up your build environment):
+
+    make packrat:default
+
+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).
+
+## Bootloader
+
+Enter the bootloader in 3 ways:
+
+* **Bootmagic reset**: Hold down the key at (0,0) in the matrix (usually the top left key or Escape) and plug in the keyboard
+* **Physical reset button**: Briefly press the button on the back of the PCB - some may have pads you must short instead
+* **Keycode in layout**: Press the key mapped to `RESET` if it is available
diff --git a/keyboards/packrat/rules.mk b/keyboards/packrat/rules.mk
new file mode 100644
index 0000000000..d43cd106b6
--- /dev/null
+++ b/keyboards/packrat/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       # Enable Bootmagic Lite
+MOUSEKEY_ENABLE = yes       # 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
+AUDIO_ENABLE = no           # Audio output
+LTO_ENABLE = no             # Use link time optimization
+ENCODER_ENABLE = yes