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

7 files changed, 901 insertions, 0 deletions

diff --git a/keyboards/hineybush/ibis/config.h b/keyboards/hineybush/ibis/config.h
new file mode 100644
index 0000000000..e8601cd54b
--- /dev/null
+++ b/keyboards/hineybush/ibis/config.h
@@ -0,0 +1,20 @@
+// Copyright 2022 Josh Hinnebusch (@hineybush)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#pragma once
+
+/*
+ * Feature disable options
+ *  These options are also useful to firmware size reduction.
+ */
+
+/* disable debug print */
+//#define NO_DEBUG
+
+/* disable print */
+//#define NO_PRINT
+
+/* disable action features */
+//#define NO_ACTION_LAYER
+//#define NO_ACTION_TAPPING
+//#define NO_ACTION_ONESHOT
diff --git a/keyboards/hineybush/ibis/info.json b/keyboards/hineybush/ibis/info.json
new file mode 100644
index 0000000000..69960e13ab
--- /dev/null
+++ b/keyboards/hineybush/ibis/info.json
@@ -0,0 +1,782 @@
+{
+    "manufacturer": "Hiney LLC",
+    "keyboard_name": "ibis",
+    "maintainer": "hineybush",
+    "bootloader": "atmel-dfu",
+    "diode_direction": "COL2ROW",
+    "features": {
+        "bootmagic": true,
+        "command": false,
+        "console": false,
+        "extrakey": true,
+        "mousekey": true,
+        "nkro": true
+    },
+    "matrix_pins": {
+        "cols": [
+            "F0",
+            "F1",
+            "F4",
+            "F5",
+            "F6",
+            "F7",
+            "B6",
+            "B5",
+            "D6",
+            "D4"
+        ],
+        "rows": [
+            "B0",
+            "B1",
+            "B2",
+            "B3",
+            "C7",
+            "C6",
+            "B4",
+            "D7",
+            "D5",
+            "D3"
+        ]
+    },
+    "processor": "atmega32u4",
+    "url": "",
+    "usb": {
+        "device_version": "1.0.0",
+        "pid": "0xEAA9",
+        "vid": "0x04D8"
+    },
+    "indicators": {
+      "num_lock": "B7",
+      "caps_lock": "D2"
+    },
+    "layouts": {
+        "LAYOUT_all": {
+            "layout": [
+                {
+                    "matrix": [
+                        0,
+                        0
+                    ],
+                    "x": 2.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        0
+                    ],
+                    "x": 3.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        0,
+                        1
+                    ],
+                    "x": 4.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        1
+                    ],
+                    "x": 5.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        0,
+                        2
+                    ],
+                    "x": 6.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        2
+                    ],
+                    "x": 7.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        0,
+                        3
+                    ],
+                    "x": 8.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        3
+                    ],
+                    "x": 9.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        0,
+                        4
+                    ],
+                    "x": 10.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        4
+                    ],
+                    "x": 11.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        0,
+                        5
+                    ],
+                    "x": 12.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        5
+                    ],
+                    "x": 13.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        0,
+                        6
+                    ],
+                    "x": 14.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        6
+                    ],
+                    "x": 15.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        7
+                    ],
+                    "x": 16.5,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        7
+                    ],
+                    "x": 17.75,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        0,
+                        8
+                    ],
+                    "x": 19,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        8
+                    ],
+                    "x": 20,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        0,
+                        9
+                    ],
+                    "x": 21,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        1,
+                        9
+                    ],
+                    "x": 22,
+                    "y": 1.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        0
+                    ],
+                    "x": 2.5,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "matrix": [
+                        3,
+                        0
+                    ],
+                    "x": 4,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        1
+                    ],
+                    "x": 5,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        1
+                    ],
+                    "x": 6,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        2
+                    ],
+                    "x": 7,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        2
+                    ],
+                    "x": 8,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        3
+                    ],
+                    "x": 9,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        3
+                    ],
+                    "x": 10,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        4
+                    ],
+                    "x": 11,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        4
+                    ],
+                    "x": 12,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        5
+                    ],
+                    "x": 13,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        5
+                    ],
+                    "x": 14,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        6
+                    ],
+                    "x": 15,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        6
+                    ],
+                    "x": 16,
+                    "y": 2.25,
+                    "w": 1.5
+                },
+                {
+                    "matrix": [
+                        5,
+                        7
+                    ],
+                    "x": 17.75,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        8
+                    ],
+                    "x": 19,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        8
+                    ],
+                    "x": 20,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        2,
+                        9
+                    ],
+                    "x": 21,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        3,
+                        9
+                    ],
+                    "x": 22,
+                    "y": 2.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        0
+                    ],
+                    "x": 2.5,
+                    "y": 3.25,
+                    "w": 1.75
+                },
+                {
+                    "matrix": [
+                        5,
+                        0
+                    ],
+                    "x": 4.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        1
+                    ],
+                    "x": 5.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        1
+                    ],
+                    "x": 6.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        2
+                    ],
+                    "x": 7.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        2
+                    ],
+                    "x": 8.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        3
+                    ],
+                    "x": 9.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        3
+                    ],
+                    "x": 10.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        4
+                    ],
+                    "x": 11.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        4
+                    ],
+                    "x": 12.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        5
+                    ],
+                    "x": 13.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        5
+                    ],
+                    "x": 14.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        6
+                    ],
+                    "x": 15.25,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        6
+                    ],
+                    "x": 15.25,
+                    "y": 3.25,
+                    "w": 2.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        8
+                    ],
+                    "x": 19,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        8
+                    ],
+                    "x": 20,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        4,
+                        9
+                    ],
+                    "x": 21,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        5,
+                        9
+                    ],
+                    "x": 22,
+                    "y": 3.25
+                },
+                {
+                    "matrix": [
+                        6,
+                        0
+                    ],
+                    "x": 2.5,
+                    "y": 4.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [
+                        7,
+                        0
+                    ],
+                    "x": 3.75,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        6,
+                        1
+                    ],
+                    "x": 4.75,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        7,
+                        1
+                    ],
+                    "x": 5.75,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        6,
+                        2
+                    ],
+                    "x": 6.75,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        7,
+                        2
+                    ],
+                    "x": 7.75,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        6,
+                        3
+                    ],
+                    "x": 8.75,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        7,
+                        3
+                    ],
+                    "x": 9.75,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        6,
+                        4
+                    ],
+                    "x": 10.75,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        7,
+                        4
+                    ],
+                    "x": 11.75,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        6,
+                        5
+                    ],
+                    "x": 12.75,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        7,
+                        5
+                    ],
+                    "x": 13.75,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        6,
+                        6
+                    ],
+                    "x": 14.75,
+                    "y": 4.25,
+                    "w": 1.75
+                },
+                {
+                    "matrix": [
+                        7,
+                        6
+                    ],
+                    "x": 16.5,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        7,
+                        7
+                    ],
+                    "x": 17.75,
+                    "y": 4.5
+                },
+                {
+                    "matrix": [
+                        6,
+                        8
+                    ],
+                    "x": 19,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        7,
+                        8
+                    ],
+                    "x": 20,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        6,
+                        9
+                    ],
+                    "x": 21,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        7,
+                        9
+                    ],
+                    "x": 22,
+                    "y": 4.25
+                },
+                {
+                    "matrix": [
+                        8,
+                        0
+                    ],
+                    "x": 2.5,
+                    "y": 5.25,
+                    "w": 1.5
+                },
+                {
+                    "matrix": [
+                        9,
+                        0
+                    ],
+                    "x": 4,
+                    "y": 5.25
+                },
+                {
+                    "matrix": [
+                        8,
+                        1
+                    ],
+                    "x": 5,
+                    "y": 5.25,
+                    "w": 1.5
+                },
+                {
+                    "matrix": [
+                        8,
+                        3
+                    ],
+                    "x": 6.5,
+                    "y": 5.25,
+                    "w": 6.25
+                },
+                {
+                    "matrix": [
+                        8,
+                        5
+                    ],
+                    "x": 12.75,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [
+                        9,
+                        5
+                    ],
+                    "x": 14,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [
+                        8,
+                        6
+                    ],
+                    "x": 15.25,
+                    "y": 5.25,
+                    "w": 1.25
+                },
+                {
+                    "matrix": [
+                        9,
+                        6
+                    ],
+                    "x": 16.75,
+                    "y": 5.5
+                },
+                {
+                    "matrix": [
+                        9,
+                        7
+                    ],
+                    "x": 17.75,
+                    "y": 5.5
+                },
+                {
+                    "matrix": [
+                        8,
+                        8
+                    ],
+                    "x": 18.75,
+                    "y": 5.5
+                },
+                {
+                    "matrix": [
+                        9,
+                        8
+                    ],
+                    "x": 20,
+                    "y": 5.25
+                },
+                {
+                    "matrix": [
+                        8,
+                        9
+                    ],
+                    "x": 21,
+                    "y": 5.25
+                },
+                {
+                    "matrix": [
+                        9,
+                        9
+                    ],
+                    "x": 22,
+                    "y": 5.25
+                }
+            ]
+        }
+    }
+}
diff --git a/keyboards/hineybush/ibis/keymaps/default/keymap.c b/keyboards/hineybush/ibis/keymaps/default/keymap.c
new file mode 100644
index 0000000000..46f0d0221e
--- /dev/null
+++ b/keyboards/hineybush/ibis/keymaps/default/keymap.c
@@ -0,0 +1,28 @@
+// Copyright 2022 Josh Hinnebusch (@hineybush)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17,   k37,     k08, k18, k09, k19, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,        k57,     k28, k38, k29, k39, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,                 k48, k58, k49, k59, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,        k77,     k68, k78, k69, k79, \
+    k80, k90, k81,                k83,                k85, k95, k86,        k96, k97, k88,     k98, k89, k99  \ */
+
+    [0] = LAYOUT_all(
+    KC_ESC,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,    KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+    KC_TAB,   KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+    KC_CAPS,  KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT, KC_NUHS, KC_ENT,                          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_LSFT,  KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH, KC_LSFT, KC_TRNS,            KC_UP,       KC_P1,   KC_P2,   KC_P3,   KC_TRNS,
+    KC_LCTL,  KC_LGUI, KC_LALT,                KC_SPC,                         KC_LALT, MO(1),    KC_RGUI,                   KC_LEFT, KC_DOWN, KC_RGHT,     KC_P0,   KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_all(
+    KC_GRV,   KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,    KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, RESET ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,             KC_PGDN,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,             KC_VOLU,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_LCTL,  KC_LGUI, KC_LALT,                KC_MPLY,                        KC_LALT, KC_TRNS,  KC_RGUI,                      KC_MPRV, KC_VOLD, KC_MNXT,      KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/hineybush/ibis/keymaps/via/keymap.c b/keyboards/hineybush/ibis/keymaps/via/keymap.c
new file mode 100644
index 0000000000..d406afb052
--- /dev/null
+++ b/keyboards/hineybush/ibis/keymaps/via/keymap.c
@@ -0,0 +1,42 @@
+// Copyright 2022 Josh Hinnebusch (@hineybush)
+// SPDX-License-Identifier: GPL-2.0-or-later
+
+#include QMK_KEYBOARD_H
+
+const uint16_t PROGMEM keymaps[][MATRIX_ROWS][MATRIX_COLS] = {
+    /*
+    k00, k10, k01, k11, k02, k12, k03, k13, k04, k14, k05, k15, k06, k16, k17,   k37,     k08, k18, k09, k19, \
+    k20, k30, k21, k31, k22, k32, k23, k33, k24, k34, k25, k35, k26, k36,        k57,     k28, k38, k29, k39, \
+    k40, k50, k41, k51, k42, k52, k43, k53, k44, k54, k45, k55, k46, k56,                 k48, k58, k49, k59, \
+    k60, k70, k61, k71, k62, k72, k63, k73, k64, k74, k65, k75, k66, k76,        k77,     k68, k78, k69, k79, \
+    k80, k90, k81,                k83,                k85, k95, k86,        k96, k97, k88,     k98, k89, k99  \ */
+
+    [0] = LAYOUT_all(
+    KC_ESC,   KC_1,    KC_2,   KC_3,   KC_4,   KC_5,   KC_6,   KC_7,   KC_8,   KC_9,    KC_0,     KC_MINS, KC_EQL,  KC_GRV, KC_BSPC,    KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+    KC_TAB,   KC_Q,    KC_W,   KC_E,   KC_R,   KC_T,   KC_Y,   KC_U,   KC_I,   KC_O,    KC_P,     KC_LBRC, KC_RBRC, KC_BSLS,            KC_PGDN,     KC_P7,   KC_P8,   KC_P9,   KC_PMNS,
+    KC_CAPS,  KC_A,    KC_S,   KC_D,   KC_F,   KC_G,   KC_H,   KC_J,   KC_K,   KC_L,    KC_SCLN,  KC_QUOT, KC_NUHS, KC_ENT,                          KC_P4,   KC_P5,   KC_P6,   KC_PPLS,
+    KC_LSFT,  KC_NUBS, KC_Z,   KC_X,   KC_C,   KC_V,   KC_B,   KC_N,   KC_M,   KC_COMM, KC_DOT,   KC_SLSH, KC_LSFT, KC_TRNS,            KC_UP,       KC_P1,   KC_P2,   KC_P3,   KC_TRNS,
+    KC_LCTL,  KC_LGUI, KC_LALT,                KC_SPC,                         KC_LALT, MO(1),    KC_RGUI,                   KC_LEFT, KC_DOWN, KC_RGHT,       KC_P0,   KC_PDOT, KC_PENT
+    ),
+    [1] = LAYOUT_all(
+    KC_GRV,   KC_F1,   KC_F2,  KC_F3,  KC_F4,  KC_F5,  KC_F6,  KC_F7,  KC_F8,  KC_F9,   KC_F10,   KC_F11,  KC_F12,  KC_TRNS, KC_TRNS,    KC_PGUP,     KC_NLCK, KC_PSLS, KC_PAST, KC_PAUS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, RESET ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,             KC_PGDN,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,             KC_VOLU,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,                KC_MPLY,                        KC_LALT, KC_TRNS,  KC_RGUI,                      KC_MPRV, KC_VOLD, KC_MNXT,      KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [2] = LAYOUT_all(
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, RESET ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,     KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, RESET ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,                KC_TRNS,                        KC_TRNS, KC_TRNS,  KC_TRNS,                      KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS
+    ),
+    [3] = LAYOUT_all(
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, RESET ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS, KC_TRNS,    KC_TRNS,     KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS, RESET ,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,             KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,                          KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS,KC_TRNS, KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,            KC_TRNS,     KC_TRNS,  KC_TRNS, KC_TRNS, KC_TRNS,
+    KC_TRNS,  KC_TRNS, KC_TRNS,                KC_TRNS,                        KC_TRNS, KC_TRNS,  KC_TRNS,                      KC_TRNS,KC_TRNS,KC_TRNS,        KC_TRNS, KC_TRNS, KC_TRNS
+    )
+};
diff --git a/keyboards/hineybush/ibis/keymaps/via/rules.mk b/keyboards/hineybush/ibis/keymaps/via/rules.mk
new file mode 100644
index 0000000000..1e5b99807c
--- /dev/null
+++ b/keyboards/hineybush/ibis/keymaps/via/rules.mk
@@ -0,0 +1 @@
+VIA_ENABLE = yes
diff --git a/keyboards/hineybush/ibis/readme.md b/keyboards/hineybush/ibis/readme.md
new file mode 100644
index 0000000000..0c345e7c81
--- /dev/null
+++ b/keyboards/hineybush/ibis/readme.md
@@ -0,0 +1,27 @@
+# hineybush/ibis
+
+![hineybush/ibis](https://i.imgur.com/TaCryDrh.png)
+
+Duck Blackbird-layout PCB for the ibis keyboard.
+
+* Keyboard Maintainer: [Josh Hinnebusch](https://github.com/hineybush)
+* Hardware Supported: ibis
+* Hardware Availability: hiney.cc
+
+Make example for this keyboard (after setting up your build environment):
+
+    make hineybush/ibis:default
+
+Flashing example for this keyboard:
+
+    make hineybush/ibis: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).
+
+## 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/hineybush/ibis/rules.mk b/keyboards/hineybush/ibis/rules.mk
new file mode 100644
index 0000000000..6e7633bfe0
--- /dev/null
+++ b/keyboards/hineybush/ibis/rules.mk
@@ -0,0 +1 @@
+# This file intentionally left blank