From 984481ff8e17173a0faaa12c524d0b502fb438cb Mon Sep 17 00:00:00 2001
From: peepeetee <43021794+peepeetee@users.noreply.github.com>
Date: Tue, 1 Feb 2022 12:36:16 +0800
Subject: [Keyboard] move @drhigsby 's boards into /drhigsby (#16041)
---
keyboards/bkf/bkf.c | 16 ----
keyboards/bkf/bkf.h | 53 ------------
keyboards/bkf/config.h | 60 -------------
keyboards/bkf/info.json | 15 ----
keyboards/bkf/keymaps/default/keymap.c | 62 --------------
keyboards/bkf/keymaps/default/readme.md | 1 -
keyboards/bkf/readme.md | 21 -----
keyboards/bkf/rules.mk | 20 -----
keyboards/drhigsby/bkf/bkf.c | 16 ++++
keyboards/drhigsby/bkf/bkf.h | 53 ++++++++++++
keyboards/drhigsby/bkf/config.h | 60 +++++++++++++
keyboards/drhigsby/bkf/info.json | 15 ++++
keyboards/drhigsby/bkf/keymaps/default/keymap.c | 62 ++++++++++++++
keyboards/drhigsby/bkf/keymaps/default/readme.md | 1 +
keyboards/drhigsby/bkf/readme.md | 21 +++++
keyboards/drhigsby/bkf/rules.mk | 20 +++++
keyboards/drhigsby/dubba175/config.h | 56 +++++++++++++
keyboards/drhigsby/dubba175/dubba175.c | 16 ++++
keyboards/drhigsby/dubba175/dubba175.h | 30 +++++++
keyboards/drhigsby/dubba175/info.json | 10 +++
.../drhigsby/dubba175/keymaps/default/config.h | 19 +++++
.../drhigsby/dubba175/keymaps/default/keymap.c | 82 ++++++++++++++++++
.../drhigsby/dubba175/keymaps/default/readme.md | 1 +
.../drhigsby/dubba175/keymaps/default/rules.mk | 1 +
keyboards/drhigsby/dubba175/readme.md | 15 ++++
keyboards/drhigsby/dubba175/rules.mk | 19 +++++
keyboards/drhigsby/ogurec/config.h | 56 +++++++++++++
keyboards/drhigsby/ogurec/info.json | 86 +++++++++++++++++++
keyboards/drhigsby/ogurec/keymaps/dack/config.h | 19 +++++
keyboards/drhigsby/ogurec/keymaps/dack/keymap.c | 97 ++++++++++++++++++++++
keyboards/drhigsby/ogurec/keymaps/dack/readme.md | 3 +
keyboards/drhigsby/ogurec/keymaps/default/config.h | 19 +++++
keyboards/drhigsby/ogurec/keymaps/default/keymap.c | 76 +++++++++++++++++
.../drhigsby/ogurec/keymaps/default/readme.md | 1 +
keyboards/drhigsby/ogurec/keymaps/default/rules.mk | 1 +
keyboards/drhigsby/ogurec/left_pm/left_pm.h | 49 +++++++++++
keyboards/drhigsby/ogurec/left_pm/readme.md | 13 +++
keyboards/drhigsby/ogurec/left_pm/rules.mk | 0
keyboards/drhigsby/ogurec/ogurec.c | 16 ++++
keyboards/drhigsby/ogurec/ogurec.h | 24 ++++++
keyboards/drhigsby/ogurec/readme.md | 27 ++++++
keyboards/drhigsby/ogurec/right_pm/readme.md | 13 +++
keyboards/drhigsby/ogurec/right_pm/right_pm.h | 49 +++++++++++
keyboards/drhigsby/ogurec/right_pm/rules.mk | 0
keyboards/drhigsby/ogurec/rules.mk | 19 +++++
keyboards/drhigsby/packrat/config.h | 59 +++++++++++++
keyboards/drhigsby/packrat/info.json | 26 ++++++
keyboards/drhigsby/packrat/keymaps/3uc/config.h | 19 +++++
keyboards/drhigsby/packrat/keymaps/3uc/keymap.c | 92 ++++++++++++++++++++
keyboards/drhigsby/packrat/keymaps/3uc/readme.md | 1 +
keyboards/drhigsby/packrat/keymaps/3uc/rules.mk | 1 +
.../drhigsby/packrat/keymaps/default/config.h | 19 +++++
.../drhigsby/packrat/keymaps/default/keymap.c | 81 ++++++++++++++++++
.../drhigsby/packrat/keymaps/default/readme.md | 3 +
.../drhigsby/packrat/keymaps/default/rules.mk | 1 +
keyboards/drhigsby/packrat/packrat.c | 28 +++++++
keyboards/drhigsby/packrat/packrat.h | 79 ++++++++++++++++++
keyboards/drhigsby/packrat/readme.md | 25 ++++++
keyboards/drhigsby/packrat/rules.mk | 20 +++++
keyboards/dubba175/config.h | 56 -------------
keyboards/dubba175/dubba175.c | 16 ----
keyboards/dubba175/dubba175.h | 30 -------
keyboards/dubba175/info.json | 10 ---
keyboards/dubba175/keymaps/default/config.h | 19 -----
keyboards/dubba175/keymaps/default/keymap.c | 82 ------------------
keyboards/dubba175/keymaps/default/readme.md | 1 -
keyboards/dubba175/keymaps/default/rules.mk | 1 -
keyboards/dubba175/readme.md | 15 ----
keyboards/dubba175/rules.mk | 19 -----
keyboards/ogurec/config.h | 56 -------------
keyboards/ogurec/info.json | 86 -------------------
keyboards/ogurec/keymaps/dack/config.h | 19 -----
keyboards/ogurec/keymaps/dack/keymap.c | 97 ----------------------
keyboards/ogurec/keymaps/dack/readme.md | 3 -
keyboards/ogurec/keymaps/default/config.h | 19 -----
keyboards/ogurec/keymaps/default/keymap.c | 76 -----------------
keyboards/ogurec/keymaps/default/readme.md | 1 -
keyboards/ogurec/keymaps/default/rules.mk | 1 -
keyboards/ogurec/left_pm/left_pm.h | 49 -----------
keyboards/ogurec/left_pm/readme.md | 13 ---
keyboards/ogurec/left_pm/rules.mk | 0
keyboards/ogurec/ogurec.c | 16 ----
keyboards/ogurec/ogurec.h | 24 ------
keyboards/ogurec/readme.md | 27 ------
keyboards/ogurec/right_pm/readme.md | 13 ---
keyboards/ogurec/right_pm/right_pm.h | 49 -----------
keyboards/ogurec/right_pm/rules.mk | 0
keyboards/ogurec/rules.mk | 19 -----
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 | 20 -----
102 files changed, 1519 insertions(+), 1519 deletions(-)
delete mode 100644 keyboards/bkf/bkf.c
delete mode 100644 keyboards/bkf/bkf.h
delete mode 100644 keyboards/bkf/config.h
delete mode 100644 keyboards/bkf/info.json
delete mode 100644 keyboards/bkf/keymaps/default/keymap.c
delete mode 100644 keyboards/bkf/keymaps/default/readme.md
delete mode 100644 keyboards/bkf/readme.md
delete mode 100644 keyboards/bkf/rules.mk
create mode 100644 keyboards/drhigsby/bkf/bkf.c
create mode 100644 keyboards/drhigsby/bkf/bkf.h
create mode 100644 keyboards/drhigsby/bkf/config.h
create mode 100644 keyboards/drhigsby/bkf/info.json
create mode 100644 keyboards/drhigsby/bkf/keymaps/default/keymap.c
create mode 100644 keyboards/drhigsby/bkf/keymaps/default/readme.md
create mode 100644 keyboards/drhigsby/bkf/readme.md
create mode 100644 keyboards/drhigsby/bkf/rules.mk
create mode 100644 keyboards/drhigsby/dubba175/config.h
create mode 100644 keyboards/drhigsby/dubba175/dubba175.c
create mode 100644 keyboards/drhigsby/dubba175/dubba175.h
create mode 100644 keyboards/drhigsby/dubba175/info.json
create mode 100644 keyboards/drhigsby/dubba175/keymaps/default/config.h
create mode 100644 keyboards/drhigsby/dubba175/keymaps/default/keymap.c
create mode 100644 keyboards/drhigsby/dubba175/keymaps/default/readme.md
create mode 100644 keyboards/drhigsby/dubba175/keymaps/default/rules.mk
create mode 100644 keyboards/drhigsby/dubba175/readme.md
create mode 100644 keyboards/drhigsby/dubba175/rules.mk
create mode 100644 keyboards/drhigsby/ogurec/config.h
create mode 100644 keyboards/drhigsby/ogurec/info.json
create mode 100644 keyboards/drhigsby/ogurec/keymaps/dack/config.h
create mode 100644 keyboards/drhigsby/ogurec/keymaps/dack/keymap.c
create mode 100644 keyboards/drhigsby/ogurec/keymaps/dack/readme.md
create mode 100644 keyboards/drhigsby/ogurec/keymaps/default/config.h
create mode 100644 keyboards/drhigsby/ogurec/keymaps/default/keymap.c
create mode 100644 keyboards/drhigsby/ogurec/keymaps/default/readme.md
create mode 100644 keyboards/drhigsby/ogurec/keymaps/default/rules.mk
create mode 100644 keyboards/drhigsby/ogurec/left_pm/left_pm.h
create mode 100644 keyboards/drhigsby/ogurec/left_pm/readme.md
create mode 100644 keyboards/drhigsby/ogurec/left_pm/rules.mk
create mode 100644 keyboards/drhigsby/ogurec/ogurec.c
create mode 100644 keyboards/drhigsby/ogurec/ogurec.h
create mode 100644 keyboards/drhigsby/ogurec/readme.md
create mode 100644 keyboards/drhigsby/ogurec/right_pm/readme.md
create mode 100644 keyboards/drhigsby/ogurec/right_pm/right_pm.h
create mode 100644 keyboards/drhigsby/ogurec/right_pm/rules.mk
create mode 100644 keyboards/drhigsby/ogurec/rules.mk
create mode 100644 keyboards/drhigsby/packrat/config.h
create mode 100644 keyboards/drhigsby/packrat/info.json
create mode 100644 keyboards/drhigsby/packrat/keymaps/3uc/config.h
create mode 100644 keyboards/drhigsby/packrat/keymaps/3uc/keymap.c
create mode 100644 keyboards/drhigsby/packrat/keymaps/3uc/readme.md
create mode 100644 keyboards/drhigsby/packrat/keymaps/3uc/rules.mk
create mode 100644 keyboards/drhigsby/packrat/keymaps/default/config.h
create mode 100644 keyboards/drhigsby/packrat/keymaps/default/keymap.c
create mode 100644 keyboards/drhigsby/packrat/keymaps/default/readme.md
create mode 100644 keyboards/drhigsby/packrat/keymaps/default/rules.mk
create mode 100644 keyboards/drhigsby/packrat/packrat.c
create mode 100644 keyboards/drhigsby/packrat/packrat.h
create mode 100644 keyboards/drhigsby/packrat/readme.md
create mode 100644 keyboards/drhigsby/packrat/rules.mk
delete mode 100644 keyboards/dubba175/config.h
delete mode 100644 keyboards/dubba175/dubba175.c
delete mode 100644 keyboards/dubba175/dubba175.h
delete mode 100644 keyboards/dubba175/info.json
delete mode 100644 keyboards/dubba175/keymaps/default/config.h
delete mode 100644 keyboards/dubba175/keymaps/default/keymap.c
delete mode 100644 keyboards/dubba175/keymaps/default/readme.md
delete mode 100644 keyboards/dubba175/keymaps/default/rules.mk
delete mode 100644 keyboards/dubba175/readme.md
delete mode 100644 keyboards/dubba175/rules.mk
delete mode 100644 keyboards/ogurec/config.h
delete mode 100644 keyboards/ogurec/info.json
delete mode 100644 keyboards/ogurec/keymaps/dack/config.h
delete mode 100644 keyboards/ogurec/keymaps/dack/keymap.c
delete mode 100644 keyboards/ogurec/keymaps/dack/readme.md
delete mode 100644 keyboards/ogurec/keymaps/default/config.h
delete mode 100644 keyboards/ogurec/keymaps/default/keymap.c
delete mode 100644 keyboards/ogurec/keymaps/default/readme.md
delete mode 100644 keyboards/ogurec/keymaps/default/rules.mk
delete mode 100644 keyboards/ogurec/left_pm/left_pm.h
delete mode 100644 keyboards/ogurec/left_pm/readme.md
delete mode 100644 keyboards/ogurec/left_pm/rules.mk
delete mode 100644 keyboards/ogurec/ogurec.c
delete mode 100644 keyboards/ogurec/ogurec.h
delete mode 100644 keyboards/ogurec/readme.md
delete mode 100644 keyboards/ogurec/right_pm/readme.md
delete mode 100644 keyboards/ogurec/right_pm/right_pm.h
delete mode 100644 keyboards/ogurec/right_pm/rules.mk
delete mode 100644 keyboards/ogurec/rules.mk
delete mode 100644 keyboards/packrat/config.h
delete mode 100644 keyboards/packrat/info.json
delete mode 100644 keyboards/packrat/keymaps/3uc/config.h
delete mode 100644 keyboards/packrat/keymaps/3uc/keymap.c
delete mode 100644 keyboards/packrat/keymaps/3uc/readme.md
delete mode 100644 keyboards/packrat/keymaps/3uc/rules.mk
delete mode 100644 keyboards/packrat/keymaps/default/config.h
delete mode 100644 keyboards/packrat/keymaps/default/keymap.c
delete mode 100644 keyboards/packrat/keymaps/default/readme.md
delete mode 100644 keyboards/packrat/keymaps/default/rules.mk
delete mode 100644 keyboards/packrat/packrat.c
delete mode 100644 keyboards/packrat/packrat.h
delete mode 100644 keyboards/packrat/readme.md
delete mode 100644 keyboards/packrat/rules.mk
(limited to 'keyboards')
diff --git a/keyboards/bkf/bkf.c b/keyboards/bkf/bkf.c
deleted file mode 100644
index 6df3ed56f6..0000000000
--- a/keyboards/bkf/bkf.c
+++ /dev/null
@@ -1,16 +0,0 @@
-/* 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 .
- */
-#include "bkf.h"
diff --git a/keyboards/bkf/bkf.h b/keyboards/bkf/bkf.h
deleted file mode 100644
index 3ea53e2de5..0000000000
--- a/keyboards/bkf/bkf.h
+++ /dev/null
@@ -1,53 +0,0 @@
-/* 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 .
- */
-#pragma once
-
-#include "quantum.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 zzzz KC_NO
-
-#define LAYOUT_625uC( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k311, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
- k300, k301, k302, k306, k308, k309, k310 \
-) { \
- { 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 }, \
- { k300, k301, k302, zzzz, zzzz, zzzz, k306, zzzz, k308, k309, k310, k311 } \
-}
-
-#define LAYOUT_2x3uC( \
- k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k311, \
- k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
- k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
- k300, k301, k302, k304, k306, k308, k309, k310 \
-) { \
- { 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 }, \
- { k300, k301, k302, zzzz, k304, zzzz, k306, zzzz, k308, k309, k310, k311 } \
-}
diff --git a/keyboards/bkf/config.h b/keyboards/bkf/config.h
deleted file mode 100644
index af1b2be747..0000000000
--- a/keyboards/bkf/config.h
+++ /dev/null
@@ -1,60 +0,0 @@
-/* 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 .
- */
-#pragma once
-
-#include "config_common.h"
-
-/* USB Device descriptor parameter */
-#define MANUFACTURER DrHigsby
-#define PRODUCT BKF - Base Kit Forty
-#define VENDOR_ID 0x0007
-#define PRODUCT_ID 0x0003
-#define DEVICE_VER 0x0001
-
-/* key matrix size */
-#define MATRIX_ROWS 4
-#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, F7, B1, B3 }
-#define MATRIX_COL_PINS { B6, B2, D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
-#define UNUSED_PINS
-
-/* Define encoder pads */
-#define ENCODERS_PAD_A { F4 }
-#define ENCODERS_PAD_B { F5 }
-
-/* 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/bkf/info.json b/keyboards/bkf/info.json
deleted file mode 100644
index c7b109d651..0000000000
--- a/keyboards/bkf/info.json
+++ /dev/null
@@ -1,15 +0,0 @@
-{
- "keyboard_name": "BKF - Base Kit Forty",
- "url": "http://www.keyboard-layout-editor.com/#/gists/8a9ebae3a5f3f601bb928f7265db0e2e",
- "maintainer": "drhigsby",
- "layouts": {
- "LAYOUT_625uC": {
- "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"{", "x":11.5, "y":0}, {"label":"}", "x":12.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"S", "x":2.75, "y":1}, {"label":"D", "x":3.75, "y":1}, {"label":"F", "x":4.75, "y":1}, {"label":"G", "x":5.75, "y":1}, {"label":"H", "x":6.75, "y":1}, {"label":"J", "x":7.75, "y":1}, {"label":"K", "x":8.75, "y":1}, {"label":"L", "x":9.75, "y":1}, {"label":":", "x":10.75, "y":1}, {"label":"Control", "x":11.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":2.25}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"N", "x":7.25, "y":2}, {"label":"M", "x":8.25, "y":2}, {"label":"<", "x":9.25, "y":2}, {"label":">", "x":10.25, "y":2}, {"label":"?", "x":11.25, "y":2}, {"label":"Shift", "x":12.25, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"label":"", "x":3.75, "y":3, "w":6.25}, {"label":"Alt", "x":10, "y":3, "w":1.25}, {"label":"Win", "x":11.25, "y":3}, {"label":"Menu", "x":12.25, "y":3, "w":1.25}]
- },
-
- "LAYOUT_2x3uC": {
- "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"{", "x":11.5, "y":0}, {"label":"}", "x":12.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"S", "x":2.75, "y":1}, {"label":"D", "x":3.75, "y":1}, {"label":"F", "x":4.75, "y":1}, {"label":"G", "x":5.75, "y":1}, {"label":"H", "x":6.75, "y":1}, {"label":"J", "x":7.75, "y":1}, {"label":"K", "x":8.75, "y":1}, {"label":"L", "x":9.75, "y":1}, {"label":":", "x":10.75, "y":1}, {"label":"Control", "x":11.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":2.25}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"N", "x":7.25, "y":2}, {"label":"M", "x":8.25, "y":2}, {"label":"<", "x":9.25, "y":2}, {"label":">", "x":10.25, "y":2}, {"label":"?", "x":11.25, "y":2}, {"label":"Shift", "x":12.25, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"label":"", "x":3.75, "y":3, "w":3}, {"label":"", "x":6.75, "y":3, "w":3}, {"label":"Alt", "x":9.75, "y":3, "w":1.25}, {"label":"Win", "x":11, "y":3, "w":1.25}, {"label":"Menu", "x":12.25, "y":3, "w":1.25}]
- }
-
- }
-}
diff --git a/keyboards/bkf/keymaps/default/keymap.c b/keyboards/bkf/keymaps/default/keymap.c
deleted file mode 100644
index cb047a6816..0000000000
--- a/keyboards/bkf/keymaps/default/keymap.c
+++ /dev/null
@@ -1,62 +0,0 @@
-/* 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 .
- */
-#include QMK_KEYBOARD_H
-
-enum layers{
- _BASE,
- _NUM,
- _FN
-};
-
-#define NUM MO(_NUM)
-#define FN MO(_FN)
-#define xxx KC_TRNS
-
-const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
- [_BASE] = LAYOUT_625uC(
- KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_DEL,
- KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
- KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
- KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, NUM, FN, KC_QUOT
- ),
-
-
- [_NUM] = LAYOUT_625uC(
- KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC,
- KC_CAPS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL, KC_PIPE,
- xxx, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_HOME, KC_END, xxx, xxx, xxx, xxx, xxx,
- xxx, xxx, xxx, xxx, xxx, xxx, xxx
- ),
-
- [_FN] = LAYOUT_625uC(
- xxx, 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,
- xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx,
- xxx, xxx, xxx, xxx, xxx, xxx, xxx
- )
-
-};
-
-bool encoder_update_user(uint8_t index, bool clockwise) {
- if (index == 0) {
- if (clockwise) {
- tap_code(KC_VOLU);
- } else {
- tap_code(KC_VOLD);
- }
- }
- return true;
-}
diff --git a/keyboards/bkf/keymaps/default/readme.md b/keyboards/bkf/keymaps/default/readme.md
deleted file mode 100644
index ea52e61583..0000000000
--- a/keyboards/bkf/keymaps/default/readme.md
+++ /dev/null
@@ -1 +0,0 @@
-# Default BKF - Base Kit Forty Keymap
diff --git a/keyboards/bkf/readme.md b/keyboards/bkf/readme.md
deleted file mode 100644
index d55f9637ee..0000000000
--- a/keyboards/bkf/readme.md
+++ /dev/null
@@ -1,21 +0,0 @@
-# BKF - Base Kit Forty
-
-
-
-BKF, Base Kit Forty, is a 40% style keyboard that is fully compatbile with a standard base kit of keycaps with 3 different spacebar configurations. It supports both standard R3 1.75u as well as stepped R3 1.75u on the left side. The key in the top right corner also sports rotary encoder support.
-
-* Keyboard Maintainer: [H. Bond](https://github.com/drhigsby)
-* Hardware Supported: BKF (https://github.com/drhigsby/bkf)
-* Hardware Availability: open-source stacked acrylic case design available at maintainer's github / make your own
-
-Make example for this keyboard (after setting up your build environment):
-
- make bkf:default
-
-To place this keyboard into bootloader mode, press the reset button on the PCB or short the RST and GND pins on the pro micro.
-
-Flashing example for this keyboard:
-
- make bkf: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/bkf/rules.mk b/keyboards/bkf/rules.mk
deleted file mode 100644
index 9861cf0ad6..0000000000
--- a/keyboards/bkf/rules.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# MCU name
-MCU = atmega32u4
-
-# Bootloader selection
-BOOTLOADER = caterina
-
-# Build Options
-# change yes to no to disable
-#
-BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
-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
-NKRO_ENABLE = yes # Enable N-Key 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
diff --git a/keyboards/drhigsby/bkf/bkf.c b/keyboards/drhigsby/bkf/bkf.c
new file mode 100644
index 0000000000..6df3ed56f6
--- /dev/null
+++ b/keyboards/drhigsby/bkf/bkf.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 .
+ */
+#include "bkf.h"
diff --git a/keyboards/drhigsby/bkf/bkf.h b/keyboards/drhigsby/bkf/bkf.h
new file mode 100644
index 0000000000..3ea53e2de5
--- /dev/null
+++ b/keyboards/drhigsby/bkf/bkf.h
@@ -0,0 +1,53 @@
+/* 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 .
+ */
+#pragma once
+
+#include "quantum.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 zzzz KC_NO
+
+#define LAYOUT_625uC( \
+ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k311, \
+ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
+ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
+ k300, k301, k302, k306, k308, k309, k310 \
+) { \
+ { 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 }, \
+ { k300, k301, k302, zzzz, zzzz, zzzz, k306, zzzz, k308, k309, k310, k311 } \
+}
+
+#define LAYOUT_2x3uC( \
+ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, k010, k011, k311, \
+ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, k110, k111, \
+ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, k210, k211, \
+ k300, k301, k302, k304, k306, k308, k309, k310 \
+) { \
+ { 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 }, \
+ { k300, k301, k302, zzzz, k304, zzzz, k306, zzzz, k308, k309, k310, k311 } \
+}
diff --git a/keyboards/drhigsby/bkf/config.h b/keyboards/drhigsby/bkf/config.h
new file mode 100644
index 0000000000..af1b2be747
--- /dev/null
+++ b/keyboards/drhigsby/bkf/config.h
@@ -0,0 +1,60 @@
+/* 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 .
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define MANUFACTURER DrHigsby
+#define PRODUCT BKF - Base Kit Forty
+#define VENDOR_ID 0x0007
+#define PRODUCT_ID 0x0003
+#define DEVICE_VER 0x0001
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#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, F7, B1, B3 }
+#define MATRIX_COL_PINS { B6, B2, D3, D2, D1, D0, D4, C6, D7, E6, B4, B5 }
+#define UNUSED_PINS
+
+/* Define encoder pads */
+#define ENCODERS_PAD_A { F4 }
+#define ENCODERS_PAD_B { F5 }
+
+/* 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/drhigsby/bkf/info.json b/keyboards/drhigsby/bkf/info.json
new file mode 100644
index 0000000000..c7b109d651
--- /dev/null
+++ b/keyboards/drhigsby/bkf/info.json
@@ -0,0 +1,15 @@
+{
+ "keyboard_name": "BKF - Base Kit Forty",
+ "url": "http://www.keyboard-layout-editor.com/#/gists/8a9ebae3a5f3f601bb928f7265db0e2e",
+ "maintainer": "drhigsby",
+ "layouts": {
+ "LAYOUT_625uC": {
+ "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"{", "x":11.5, "y":0}, {"label":"}", "x":12.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"S", "x":2.75, "y":1}, {"label":"D", "x":3.75, "y":1}, {"label":"F", "x":4.75, "y":1}, {"label":"G", "x":5.75, "y":1}, {"label":"H", "x":6.75, "y":1}, {"label":"J", "x":7.75, "y":1}, {"label":"K", "x":8.75, "y":1}, {"label":"L", "x":9.75, "y":1}, {"label":":", "x":10.75, "y":1}, {"label":"Control", "x":11.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":2.25}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"N", "x":7.25, "y":2}, {"label":"M", "x":8.25, "y":2}, {"label":"<", "x":9.25, "y":2}, {"label":">", "x":10.25, "y":2}, {"label":"?", "x":11.25, "y":2}, {"label":"Shift", "x":12.25, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"label":"", "x":3.75, "y":3, "w":6.25}, {"label":"Alt", "x":10, "y":3, "w":1.25}, {"label":"Win", "x":11.25, "y":3}, {"label":"Menu", "x":12.25, "y":3, "w":1.25}]
+ },
+
+ "LAYOUT_2x3uC": {
+ "layout": [{"label":"Tab", "x":0, "y":0, "w":1.5}, {"label":"Q", "x":1.5, "y":0}, {"label":"W", "x":2.5, "y":0}, {"label":"E", "x":3.5, "y":0}, {"label":"R", "x":4.5, "y":0}, {"label":"T", "x":5.5, "y":0}, {"label":"Y", "x":6.5, "y":0}, {"label":"U", "x":7.5, "y":0}, {"label":"I", "x":8.5, "y":0}, {"label":"O", "x":9.5, "y":0}, {"label":"P", "x":10.5, "y":0}, {"label":"{", "x":11.5, "y":0}, {"label":"}", "x":12.5, "y":0}, {"label":"Caps Lock", "x":0, "y":1, "w":1.75}, {"label":"A", "x":1.75, "y":1}, {"label":"S", "x":2.75, "y":1}, {"label":"D", "x":3.75, "y":1}, {"label":"F", "x":4.75, "y":1}, {"label":"G", "x":5.75, "y":1}, {"label":"H", "x":6.75, "y":1}, {"label":"J", "x":7.75, "y":1}, {"label":"K", "x":8.75, "y":1}, {"label":"L", "x":9.75, "y":1}, {"label":":", "x":10.75, "y":1}, {"label":"Control", "x":11.75, "y":1, "w":1.75}, {"label":"Shift", "x":0, "y":2, "w":2.25}, {"label":"Z", "x":2.25, "y":2}, {"label":"X", "x":3.25, "y":2}, {"label":"C", "x":4.25, "y":2}, {"label":"V", "x":5.25, "y":2}, {"label":"B", "x":6.25, "y":2}, {"label":"N", "x":7.25, "y":2}, {"label":"M", "x":8.25, "y":2}, {"label":"<", "x":9.25, "y":2}, {"label":">", "x":10.25, "y":2}, {"label":"?", "x":11.25, "y":2}, {"label":"Shift", "x":12.25, "y":2, "w":1.25}, {"label":"Ctrl", "x":0, "y":3, "w":1.25}, {"label":"Win", "x":1.25, "y":3, "w":1.25}, {"label":"Alt", "x":2.5, "y":3, "w":1.25}, {"label":"", "x":3.75, "y":3, "w":3}, {"label":"", "x":6.75, "y":3, "w":3}, {"label":"Alt", "x":9.75, "y":3, "w":1.25}, {"label":"Win", "x":11, "y":3, "w":1.25}, {"label":"Menu", "x":12.25, "y":3, "w":1.25}]
+ }
+
+ }
+}
diff --git a/keyboards/drhigsby/bkf/keymaps/default/keymap.c b/keyboards/drhigsby/bkf/keymaps/default/keymap.c
new file mode 100644
index 0000000000..cb047a6816
--- /dev/null
+++ b/keyboards/drhigsby/bkf/keymaps/default/keymap.c
@@ -0,0 +1,62 @@
+/* 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 .
+ */
+#include QMK_KEYBOARD_H
+
+enum layers{
+ _BASE,
+ _NUM,
+ _FN
+};
+
+#define NUM MO(_NUM)
+#define FN MO(_FN)
+#define xxx KC_TRNS
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+ [_BASE] = LAYOUT_625uC(
+ KC_GESC, KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P, KC_BSPC, KC_DEL,
+ KC_TAB, KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN, KC_ENT,
+ KC_LSPO, KC_Z, KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, KC_SLSH, KC_RSPC,
+ KC_LCTL, KC_LGUI, KC_LALT, KC_SPC, NUM, FN, KC_QUOT
+ ),
+
+
+ [_NUM] = LAYOUT_625uC(
+ KC_GRV, KC_1, KC_2, KC_3, KC_4, KC_5, KC_6, KC_7, KC_8, KC_9, KC_0, KC_LBRC, KC_RBRC,
+ KC_CAPS, KC_EXLM, KC_AT, KC_HASH, KC_DLR, KC_PERC, KC_CIRC, KC_AMPR, KC_ASTR, KC_MINS, KC_EQL, KC_PIPE,
+ xxx, KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_HOME, KC_END, xxx, xxx, xxx, xxx, xxx,
+ xxx, xxx, xxx, xxx, xxx, xxx, xxx
+ ),
+
+ [_FN] = LAYOUT_625uC(
+ xxx, 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,
+ xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx, xxx,
+ xxx, xxx, xxx, xxx, xxx, xxx, xxx
+ )
+
+};
+
+bool encoder_update_user(uint8_t index, bool clockwise) {
+ if (index == 0) {
+ if (clockwise) {
+ tap_code(KC_VOLU);
+ } else {
+ tap_code(KC_VOLD);
+ }
+ }
+ return true;
+}
diff --git a/keyboards/drhigsby/bkf/keymaps/default/readme.md b/keyboards/drhigsby/bkf/keymaps/default/readme.md
new file mode 100644
index 0000000000..ea52e61583
--- /dev/null
+++ b/keyboards/drhigsby/bkf/keymaps/default/readme.md
@@ -0,0 +1 @@
+# Default BKF - Base Kit Forty Keymap
diff --git a/keyboards/drhigsby/bkf/readme.md b/keyboards/drhigsby/bkf/readme.md
new file mode 100644
index 0000000000..18742920a4
--- /dev/null
+++ b/keyboards/drhigsby/bkf/readme.md
@@ -0,0 +1,21 @@
+# BKF - Base Kit Forty
+
+
+
+BKF, Base Kit Forty, is a 40% style keyboard that is fully compatbile with a standard base kit of keycaps with 3 different spacebar configurations. It supports both standard R3 1.75u as well as stepped R3 1.75u on the left side. The key in the top right corner also sports rotary encoder support.
+
+* Keyboard Maintainer: [H. Bond](https://github.com/drhigsby)
+* Hardware Supported: BKF (https://github.com/drhigsby/bkf)
+* Hardware Availability: open-source stacked acrylic case design available at maintainer's github / make your own
+
+Make example for this keyboard (after setting up your build environment):
+
+ make drhigsby/bkf:default
+
+To place this keyboard into bootloader mode, press the reset button on the PCB or short the RST and GND pins on the pro micro.
+
+Flashing example for this keyboard:
+
+ make drhigsby/bkf: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/drhigsby/bkf/rules.mk b/keyboards/drhigsby/bkf/rules.mk
new file mode 100644
index 0000000000..9861cf0ad6
--- /dev/null
+++ b/keyboards/drhigsby/bkf/rules.mk
@@ -0,0 +1,20 @@
+# MCU name
+MCU = atmega32u4
+
+# Bootloader selection
+BOOTLOADER = caterina
+
+# Build Options
+# change yes to no to disable
+#
+BOOTMAGIC_ENABLE = no # Enable Bootmagic Lite
+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
+NKRO_ENABLE = yes # Enable N-Key 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
diff --git a/keyboards/drhigsby/dubba175/config.h b/keyboards/drhigsby/dubba175/config.h
new file mode 100644
index 0000000000..2eab0e2693
--- /dev/null
+++ b/keyboards/drhigsby/dubba175/config.h
@@ -0,0 +1,56 @@
+/* Copyright 2020 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 .
+ */
+#pragma once
+
+#include "config_common.h"
+
+/* USB Device descriptor parameter */
+#define MANUFACTURER DrHigsby
+#define PRODUCT Dubba175
+#define VENDOR_ID 0x0420
+#define PRODUCT_ID 0x0420
+#define DEVICE_VER 0x0420
+
+/* key matrix size */
+#define MATRIX_ROWS 4
+#define MATRIX_COLS 10
+
+/*
+ * 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 { B1, B3, B2, B5 }
+#define MATRIX_COL_PINS { D3, D2, D1, D0, D4, C6, D7, E6, B4, B6 }
+#define UNUSED_PINS
+
+/* 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
\ No newline at end of file
diff --git a/keyboards/drhigsby/dubba175/dubba175.c b/keyboards/drhigsby/dubba175/dubba175.c
new file mode 100644
index 0000000000..066e772fa2
--- /dev/null
+++ b/keyboards/drhigsby/dubba175/dubba175.c
@@ -0,0 +1,16 @@
+/* Copyright 2020 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 .
+ */
+#include "dubba175.h"
\ No newline at end of file
diff --git a/keyboards/drhigsby/dubba175/dubba175.h b/keyboards/drhigsby/dubba175/dubba175.h
new file mode 100644
index 0000000000..0413b158d2
--- /dev/null
+++ b/keyboards/drhigsby/dubba175/dubba175.h
@@ -0,0 +1,30 @@
+/* Copyright 2020 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 .
+ */
+#pragma once
+
+#include "quantum.h"
+
+#define LAYOUT( \
+ k000, k001, k002, k003, k004, k005, k006, k007, k008, k009, \
+ k100, k101, k102, k103, k104, k105, k106, k107, k108, k109, \
+ k200, k201, k202, k203, k204, k205, k206, k207, k208, k209, \
+ k302, k303, k304, k305, k306, k307 \
+) { \
+ { k000, k001, k002, k003, k004, k005, k006, k007, k008, k009 }, \
+ { k100, k101, k102, k103, k104, k105, k106, k107, k108, k109 }, \
+ { k200, k201, k202, k203, k204, k205, k206, k207, k208, k209 }, \
+ { KC_NO, KC_NO, k302, k303, k304, k305, k306, k307, KC_NO, KC_NO } \
+}
diff --git a/keyboards/drhigsby/dubba175/info.json b/keyboards/drhigsby/dubba175/info.json
new file mode 100644
index 0000000000..e2830ff4c2
--- /dev/null
+++ b/keyboards/drhigsby/dubba175/info.json
@@ -0,0 +1,10 @@
+{
+ "keyboard_name": "dubba175",
+ "url": "http://www.keyboard-layout-editor.com/#/gists/3185de74dfb973bf6d42e785994cfd4e",
+ "maintainer": "drhigsby",
+ "layouts": {
+ "LAYOUT": {
+ "layout": [{"label":"", "x":0, "y":0}, {"label":"", "x":1, "y":0}, {"label":"", "x":2, "y":0}, {"label":"", "x":3, "y":0}, {"label":"", "x":4, "y":0}, {"label":"", "x":5, "y":0}, {"label":"", "x":6, "y":0}, {"label":"", "x":7, "y":0}, {"label":"", "x":8, "y":0}, {"label":"", "x":9, "y":0}, {"label":"", "x":0, "y":1}, {"label":"", "x":1, "y":1}, {"label":"", "x":2, "y":1}, {"label":"", "x":3, "y":1}, {"label":"", "x":4, "y":1}, {"label":"", "x":5, "y":1}, {"label":"", "x":6, "y":1}, {"label":"", "x":7, "y":1}, {"label":"", "x":8, "y":1}, {"label":"", "x":9, "y":1}, {"label":"", "x":0, "y":2}, {"label":"", "x":1, "y":2}, {"label":"", "x":2, "y":2}, {"label":"", "x":3, "y":2}, {"label":"", "x":4, "y":2}, {"label":"", "x":5, "y":2}, {"label":"", "x":6, "y":2}, {"label":"<", "x":7, "y":2}, {"label":">", "x":8, "y":2}, {"label":"", "x":9, "y":2}, {"label":"", "x":1.25, "y":3}, {"label":"", "x":2.25, "y":3}, {"label":"", "x":3.25, "y":3, "w":1.75}, {"x":5, "y":3, "w":1.75}, {"label":"", "x":6.75, "y":3}, {"label":"", "x":7.75, "y":3}]
+ }
+ }
+}
diff --git a/keyboards/drhigsby/dubba175/keymaps/default/config.h b/keyboards/drhigsby/dubba175/keymaps/default/config.h
new file mode 100644
index 0000000000..7a4761b1ae
--- /dev/null
+++ b/keyboards/drhigsby/dubba175/keymaps/default/config.h
@@ -0,0 +1,19 @@
+/* Copyright 2020 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 .
+ */
+#pragma once
+
+#define COMBO_COUNT 8
+#define COMBO_TERM 40
diff --git a/keyboards/drhigsby/dubba175/keymaps/default/keymap.c b/keyboards/drhigsby/dubba175/keymaps/default/keymap.c
new file mode 100644
index 0000000000..37bae5b435
--- /dev/null
+++ b/keyboards/drhigsby/dubba175/keymaps/default/keymap.c
@@ -0,0 +1,82 @@
+/* Copyright 2020 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 .
+ */
+#include QMK_KEYBOARD_H
+
+enum layers{
+ _BASE,
+ _NUM,
+ _FN
+};
+
+enum combo_events {
+ combo_ESC,
+ combo_BACK,
+ combo_TAB,
+ combo_DELETE,
+ combo_ENTER,
+ combo_QUOT,
+ 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 quot_combo[] = {KC_K, KC_L, 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_QUOT] = COMBO(quot_combo, KC_QUOT),
+ [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(
+ KC_Q, KC_W, KC_E, KC_R, KC_T, KC_Y, KC_U, KC_I, KC_O, KC_P,
+ KC_A, KC_S, KC_D, KC_F, KC_G, KC_H, KC_J, KC_K, KC_L, KC_SCLN,
+ LSFT_T(KC_Z), KC_X, KC_C, KC_V, KC_B, KC_N, KC_M, KC_COMM, KC_DOT, RSFT_T(KC_SLSH),
+ KC_LALT, KC_LCTL, NUM, KC_SPC, KC_RGUI, FN
+ ),
+
+ [_NUM] = LAYOUT(
+ 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_MINS, KC_EQL,
+ KC_LEFT, KC_DOWN, KC_UP, KC_RGHT, KC_HOME, KC_END, KC_PIPE, KC_BSLS, KC_DQUO, KC_QUOT,
+ xxx, xxx, xxx, xxx, KC_PGUP, KC_PGDN
+ ),
+
+ [_FN] = LAYOUT(
+ KC_F1, KC_F2, KC_F3, KC_F4, KC_F5, KC_F6, KC_F7, KC_F8, KC_F9, KC_F10,
+ 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
+ )
+
+};
diff --git a/keyboards/drhigsby/dubba175/keymaps/default/readme.md b/keyboards/drhigsby/dubba175/keymaps/default/readme.md
new file mode 100644
index 0000000000..8e5c2c528b
--- /dev/null
+++ b/keyboards/drhigsby/dubba175/keymaps/default/readme.md
@@ -0,0 +1 @@
+# Default Dubba175 Keymap
diff --git a/keyboards/drhigsby/dubba175/keymaps/default/rules.mk b/keyboards/drhigsby/dubba175/keymaps/default/rules.mk
new file mode 100644
index 0000000000..ab1e438182
--- /dev/null
+++ b/keyboards/drhigsby/dubba175/keymaps/default/rules.mk
@@ -0,0 +1 @@
+COMBO_ENABLE = yes
diff --git a/keyboards/drhigsby/dubba175/readme.md b/keyboards/drhigsby/dubba175/readme.md
new file mode 100644
index 0000000000..a07da251ab
--- /dev/null
+++ b/keyboards/drhigsby/dubba175/readme.md
@@ -0,0 +1,15 @@
+# Dubba175
+
+
+
+Dubba175 is a 10u wide ortholinear keyboard featuring 2x 1.75u spacebars as the bottom row layout option.
+
+* Keyboard Maintainer: [H. Bond](https://github.com/drhigsby)
+* Hardware Supported: Dubba175 (https://github.com/drhigsby/dubba175)
+* Hardware Availability: P3DStore.com offers a stacked acrlyic case / make your own
+
+Make example for this keyboard (after setting up your build environment):
+
+ make drhigsby/dubba175: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).
diff --git a/keyboards/drhigsby/dubba175/rules.mk b/keyboards/drhigsby/dubba175/rules.mk
new file mode 100644
index 0000000000..a51132838a
--- /dev/null
+++ b/keyboards/drhigsby/dubba175/rules.mk
@@ -0,0 +1,19 @@
+# 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
+NKRO_ENABLE = yes # Enable N-Key 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
diff --git a/keyboards/drhigsby/ogurec/config.h b/keyboards/drhigsby/ogurec/config.h
new file mode 100644
index 0000000000..c5605ca645
--- /dev/null
+++ b/keyboards/drhigsby/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 .
+ */
+#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/drhigsby/ogurec/info.json b/keyboards/drhigsby/ogurec/info.json
new file mode 100644
index 0000000000..1cb6823f95
--- /dev/null
+++ b/keyboards/drhigsby/ogurec/info.json
@@ -0,0 +1,86 @@
+{
+ "keyboard_name": "ogurec",
+ "url": "http://www.keyboard-layout-editor.com/#/gists/f1bda3a87822868599cf6e3c4340f594",
+ "maintainer": "drhigsby",
+ "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/drhigsby/ogurec/keymaps/dack/config.h b/keyboards/drhigsby/ogurec/keymaps/dack/config.h
new file mode 100644
index 0000000000..af5d55bf6e
--- /dev/null
+++ b/keyboards/drhigsby/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 .
+ */
+#pragma once
+#define IGNORE_MOD_TAP_INTERRUPT
+#define TAPPING_TERM 230
+#define TAPPING_TERM_PER_KEY
diff --git a/keyboards/drhigsby/ogurec/keymaps/dack/keymap.c b/keyboards/drhigsby/ogurec/keymaps/dack/keymap.c
new file mode 100644
index 0000000000..420ff3d88d
--- /dev/null
+++ b/keyboards/drhigsby/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 .
+ */
+#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, _______, _______, _______, _______, _______, _______, _______, _______, _______,
+ _______, _______